]> _ Git - fluidbook-v3.git/commitdiff
wip #480 @0.5
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 22 Jun 2016 18:03:39 +0000 (18:03 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 22 Jun 2016 18:03:39 +0000 (18:03 +0000)
14 files changed:
framework/application/views/scripts/common/header.phtml
framework/application/views/scripts/templates/agences.phtml [new file with mode: 0644]
framework/application/views/scripts/templates/contact.phtml [new file with mode: 0644]
framework/application/views/scripts/templates/exemples.phtml [new file with mode: 0644]
framework/application/views/scripts/templates/faq.phtml [new file with mode: 0644]
framework/application/views/scripts/templates/fonctionnalites.phtml [new file with mode: 0644]
framework/application/views/scripts/templates/home.phtml
framework/application/views/scripts/templates/texte.phtml [new file with mode: 0644]
js/101-header.js
js/210-home.js [new file with mode: 0644]
less/002-common.less
less/010-admin.less
less/101-header.less
less/210-home.less [new file with mode: 0644]

index e3c8dc5a7cb01ee6bcb7a9beb9e9c9bc79d8bc9d..6257adb2a03480cfc6df83b97a81c034d9fbe4b1 100644 (file)
@@ -9,7 +9,7 @@ if (!is_null($homepage)) {
        $home = $homepage->getHref();\r
 }\r
 ?>\r
-<header>\r
+<header class="light">\r
        <div id="header" class="content">\r
                <?php\r
                echo $this->headerLogo();\r
diff --git a/framework/application/views/scripts/templates/agences.phtml b/framework/application/views/scripts/templates/agences.phtml
new file mode 100644 (file)
index 0000000..c9e8dad
--- /dev/null
@@ -0,0 +1,7 @@
+<?php\r
+/**\r
+ * Created by IntelliJ IDEA.\r
+ * User: Vincent\r
+ * Date: 22/06/2016\r
+ * Time: 19:27\r
+ */
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/contact.phtml b/framework/application/views/scripts/templates/contact.phtml
new file mode 100644 (file)
index 0000000..596ff1d
--- /dev/null
@@ -0,0 +1,7 @@
+<?php\r
+/**\r
+ * Created by IntelliJ IDEA.\r
+ * User: Vincent\r
+ * Date: 22/06/2016\r
+ * Time: 19:26\r
+ */
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/exemples.phtml b/framework/application/views/scripts/templates/exemples.phtml
new file mode 100644 (file)
index 0000000..596ff1d
--- /dev/null
@@ -0,0 +1,7 @@
+<?php\r
+/**\r
+ * Created by IntelliJ IDEA.\r
+ * User: Vincent\r
+ * Date: 22/06/2016\r
+ * Time: 19:26\r
+ */
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/faq.phtml b/framework/application/views/scripts/templates/faq.phtml
new file mode 100644 (file)
index 0000000..c9e8dad
--- /dev/null
@@ -0,0 +1,7 @@
+<?php\r
+/**\r
+ * Created by IntelliJ IDEA.\r
+ * User: Vincent\r
+ * Date: 22/06/2016\r
+ * Time: 19:27\r
+ */
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/fonctionnalites.phtml b/framework/application/views/scripts/templates/fonctionnalites.phtml
new file mode 100644 (file)
index 0000000..596ff1d
--- /dev/null
@@ -0,0 +1,7 @@
+<?php\r
+/**\r
+ * Created by IntelliJ IDEA.\r
+ * User: Vincent\r
+ * Date: 22/06/2016\r
+ * Time: 19:26\r
+ */
\ No newline at end of file
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c9d48bf70d1a4754589155dcd56e46820b118026 100644 (file)
@@ -0,0 +1,2 @@
+<?php\r
+$this->headScript()->addScriptAndStyle('210-home');
\ No newline at end of file
diff --git a/framework/application/views/scripts/templates/texte.phtml b/framework/application/views/scripts/templates/texte.phtml
new file mode 100644 (file)
index 0000000..981ae3a
--- /dev/null
@@ -0,0 +1,7 @@
+<?php\r
+/**\r
+ * Created by IntelliJ IDEA.\r
+ * User: Vincent\r
+ * Date: 22/06/2016\r
+ * Time: 19:25\r
+ */
\ No newline at end of file
index 4c5b0c03a9cd841c3d1bb9218c69efb6589f0982..038b1c5b1eff72567bed7c4b5072dd5dc3b5fe59 100644 (file)
@@ -1,7 +1,7 @@
 registerLoader(load_header, true);\r
 \r
 function load_header() {\r
-    $(window).on('cubeitresize', resizeHeader());\r
+    $(window).on('cubeitresize', resizeHeader);\r
     resizeHeader();\r
 \r
 }\r
@@ -9,10 +9,7 @@ function load_header() {
 function resizeHeader() {\r
     var ww = $(window).width();\r
     var wh = $(window).height();\r
-\r
     var nav = $("header nav#menu");\r
-    var menuLeft = (ww - $(nav).outerWidth()) / 2;\r
-    $(nav).data('centeroffset', menuLeft).css('left',menuLeft);\r
-\r
-\r
+    var menuLeft = ($("#header").outerWidth() - $(nav).outerWidth()) / 2;\r
+    $(nav).data('centeroffset', menuLeft).css('left', menuLeft);\r
 }\r
diff --git a/js/210-home.js b/js/210-home.js
new file mode 100644 (file)
index 0000000..11aeabb
--- /dev/null
@@ -0,0 +1,3 @@
+/**\r
+ * Created by Vincent on 22/06/2016.\r
+ */\r
index 8a03dcb5dac54a6356a3c73901da03a63c4292a9..6dc9ed0ba72e5f0e36a3eba8408421af691aed55 100644 (file)
@@ -10,4 +10,10 @@ body {
 \r
 main{\r
        background-color: #fff;\r
+       padding-top: 180px;\r
+}\r
+\r
+.cubeit-content{\r
+       width: 90%;\r
+       margin:0 auto;\r
 }
\ No newline at end of file
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e288793b31674c8eb85b890a91e59cf655f5a467 100644 (file)
@@ -0,0 +1,20 @@
+@import "000-imports";\r
+#adminBar{\r
+       position: fixed;\r
+       top:0px;\r
+       left:0px;\r
+       background-color:@color-footer-bg-secondary;\r
+       height:25px;\r
+       width: 100%;\r
+       padding:5px 5%;\r
+       .bar {\r
+               color: #5c6268;\r
+               a.right{\r
+                       color:#c00;\r
+               }\r
+       }\r
+}\r
+\r
+header {\r
+       top:25px !important;\r
+}
\ No newline at end of file
index 657f9e4fc7fbfe24066191f5642945be4df70a58..f72c9a10b2b5b43dd48de3f054692e0b8cc36d27 100644 (file)
@@ -11,7 +11,6 @@ header {
        color: @color-header-grey;\r
        padding: 0 5%;\r
        vertical-align: bottom;\r
-       border: 1px solid #f00;\r
 \r
        #header {\r
                height: 90px;\r
@@ -39,7 +38,7 @@ header {
 \r
        nav#menu {\r
                position: relative;\r
-               top: 54px;\r
+               top: 57px;\r
 \r
                display: inline-block;\r
                text-align: center;\r
@@ -52,6 +51,7 @@ header {
                        line-height: 9px;\r
                        border: 1px solid transparent;\r
                        padding-bottom: 13px;\r
+                       display: inline-block;\r
                }\r
 \r
                li.active a, a:hover {\r
@@ -69,28 +69,16 @@ header {
                }\r
                a {\r
                        display: inline-block;\r
-                       border: 1px solid @color-header-grey;\r
                        padding: 13px 29px 14px;\r
                        line-height: 9px;\r
                        border-radius: 19px;\r
+                       border: 1px solid transparent;\r
                        &.quoteLink {\r
                                .background-button(@color-green);\r
                                color: #fff;\r
                        }\r
-                       &.agencies{\r
-                               .border-button(@color-header-grey,#c2c4c7);\r
-                       }\r
-               }\r
-       }\r
-\r
-       &.light {\r
-               color: #fff;\r
-               nav #menu {\r
-                       li.active a, a:hover {\r
-                               border-bottom-color: #fff;\r
-                       }\r
-                       a {\r
-                               color: #fff;\r
+                       &.agencies {\r
+                               .border-button(@color-header-grey, #c2c4c7);\r
                        }\r
                }\r
        }\r
@@ -118,4 +106,31 @@ header {
                        opacity: 0;\r
                }\r
        }\r
+\r
+       &.light {\r
+               color: #fff;\r
+               nav#menu {\r
+                       li.active a, a:hover {\r
+                               border-bottom-color: #fff;\r
+                       }\r
+                       a {\r
+                               color: #fff;\r
+                       }\r
+               }\r
+               nav#contactnav {\r
+                       a {\r
+                               &.agencies {\r
+                                       .border-button(#fff, #fff);\r
+                               }\r
+                       }\r
+               }\r
+               .logo {\r
+                       .text-dark {\r
+                               opacity: 0;\r
+                       }\r
+                       .text-white {\r
+                               opacity: 1;\r
+                       }\r
+               }\r
+       }\r
 }
\ No newline at end of file
diff --git a/less/210-home.less b/less/210-home.less
new file mode 100644 (file)
index 0000000..faee775
--- /dev/null
@@ -0,0 +1,4 @@
+main {\r
+       height: 3000px;\r
+       background-image: linear-gradient(to bottom, rgba(30, 87, 153, 1) 0%, rgba(125, 185, 232, 1) 100%);;\r
+}
\ No newline at end of file