Various styling adjustments. WIP #525 @0.5

diff --git a/framework/application/views/scripts/admin/index.phtml b/framework/application/views/scripts/admin/index.phtml
index a7506d99d52baff5f3cf2bcf835c83541c9f4347..99f13dabe59eb687bd92c7e4a469769382ad6bf7 100644 (file)
--- a/framework/application/views/scripts/admin/index.phtml
+++ b/framework/application/views/scripts/admin/index.phtml
@@ -2,6 +2,7 @@
 \r
 echo '<div id="adminlogin" class="adminlogin cubeit-content content-wrapper">';\r
 $this->headLink()->appendStylesheet('/CubeIT/less/admin/common.less', 'all');\r
+$this->headLink()->appendStylesheet('/less/010-admin.less', 'all');\r
 echo '<div id="message"></div>';\r
 echo $this->form;\r
 echo '</div>';
\ No newline at end of file

diff --git a/framework/application/views/scripts/templates/fonctionnalites.phtml b/framework/application/views/scripts/templates/fonctionnalites.phtml
index 920ec609f01def92c1126e6327cdd3e340aaecbd..e38739125c54a0f12db026d12e78bd5717697d62 100644 (file)
--- a/framework/application/views/scripts/templates/fonctionnalites.phtml
+++ b/framework/application/views/scripts/templates/fonctionnalites.phtml
@@ -1,3 +1,4 @@
 <?php\r
 \r
-echo $this->introBlock($this->intro, '');
\ No newline at end of file
+echo $this->introBlock($this->intro, '');\r
+echo $this->contactFooter();
\ No newline at end of file

diff --git a/less/002-common.less b/less/002-common.less
index 21ca84f553a50f7b8724d7e0600e6ddc9cf487c9..6c5cb27223dabf96a1ce3837e24fb41db6933fac 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -42,10 +42,6 @@ a {
        width: 100%;\r
        padding-top: 4%;\r
        padding-bottom: 5%;\r
-\r
-       &:first-of-type {\r
-               padding-top: 152px; // Minimum clearance and top for fixed menu\r
-       }\r
 }\r
 \r
 .no-shrink {\r

diff --git a/less/010-admin.less b/less/010-admin.less
index fb82d6283ecca7534acb5bb911ff2ed4539555ba..25a4c861e35b967367a929f9a99391b61a6b2ee7 100644 (file)
--- a/less/010-admin.less
+++ b/less/010-admin.less
@@ -15,3 +15,8 @@
                }\r
        }\r
 }\r
+\r
+\r
+#adminlogin {\r
+       padding-top: 150px;\r
+}
\ No newline at end of file

diff --git a/less/102-intro.less b/less/102-intro.less
index 5ed71e238faa4982384b31a150dcb665117fd1ba..8f430e0c504d829bd201f02d8f0edbaaee97781c 100644 (file)
--- a/less/102-intro.less
+++ b/less/102-intro.less
@@ -5,6 +5,7 @@
 \r
        .content-wrapper {\r
                background-size: 1680px auto;\r
+               padding-top: 152px; // Minimum clearance and top for fixed menu\r
        }\r
 \r
        blockquote {\r