diff --git a/public_html/css/header.css b/public_html/css/header.css
index 6008c7c..2633f49 100644
--- a/public_html/css/header.css
+++ b/public_html/css/header.css
@@ -4,16 +4,15 @@
position: absolute;
top: 0;
left: 0;
- width: calc( 20em - 3em - 2px );
- height: calc( 100% - 2*1.7em );
+ width: calc( 15em - 3em );
+ height: calc( 100% - 2*1em );
- padding: 1.7em 0;
+ padding: 1em 0;
padding-left: 3em;
- border-right: 2px solid #294496;
background: url('/image/header-icon.svg') center left 2em no-repeat;
background-size: 1.7em;
- background-color: #2a469c;
+ background-color: rgba(0,0,0,.7);
color: #fff;
}
@@ -27,6 +26,10 @@
font-size: 1.2em;
letter-spacing: 2px;
+ background: -webkit-linear-gradient(top left, #474dff, #00E288);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+
overflow: hidden;
}
@@ -40,19 +43,19 @@
display: block;
position: absolute;
top: 0;
- left: 20em;
- width: calc( 100% - 20em - 12em - 2em - 5em );
- height: calc( 100% - 2*1.7em );
+ left: 15em;
+ width: calc( 100% - 15em - 12em - 2em - 5em );
+ height: calc( 100% - 2*1.2em );
- padding: 1.7em 0;
+ padding: 1.2em 0;
padding-left: 5em;
- background: url('/image/header/info/info.svg') center left 2em no-repeat;
+ background: url('/image/header/info/info.svg@2299e3') center left 2em no-repeat;
background-size: 1.6em;
}
-#header-info.info{ background-image: url('/image/header/info/info.svg'); }
-#header-info.warning{ background-image: url('/image/header/info/warning.svg'); }
-#header-info.error{ background-image: url('/image/header/info/error.svg'); }
+#header-info.info{ background-image: url('/image/header/info/info.svg@2299e3'); }
+#header-info.warning{ background-image: url('/image/header/info/warning.svg@ed5e17'); }
+#header-info.error{ background-image: url('/image/header/info/error.svg@d7373a'); }
/****************************/
@@ -84,7 +87,7 @@
width: 2em;
height: 2em;
- background: url('/image/header/notif/bell.svg') center center no-repeat;
+ background: url('/image/header/notif/bell.svg@aaaaaa') center center no-repeat;
background-size: 50%;
background-color: transparent;
@@ -92,16 +95,23 @@
cursor: pointer;
- transition: background-color .2s ease-in-out;
+ transition: background .2s ease-in-out;
}
+#header-notif .hnotif.message{ background-image: url('/image/header/notif/message.svg@aaaaaa'); }
+#header-notif .hnotif.search{ background-image: url('/image/header/notif/search.svg@aaaaaa'); }
+#header-notif .hnotif.menu{ background-image: url('/image/header/notif/menu.svg@aaaaaa'); }
+/* HOVER */
#header-notif .hnotif:hover{
- background-color: #294496;
+ background-color: #ddd;
+ background-image: url('/image/header/notif/bell.svg@ee9a31');
}
-#header-notif .hnotif.message{ background-image: url('/image/header/notif/message.svg'); }
-#header-notif .hnotif.search{ background-image: url('/image/header/notif/search.svg'); }
-#header-notif .hnotif.menu{ background-image: url('/image/header/notif/menu.svg'); }
+#header-notif .hnotif.message:hover{ background-image: url('/image/header/notif/message.svg@23c795'); }
+#header-notif .hnotif.search:hover{ background-image: url('/image/header/notif/search.svg@ae51da'); }
+#header-notif .hnotif.menu:hover{ background-image: url('/image/header/notif/menu.svg@4a8ad8'); }
+
+
/* Counter element */
#header-notif .hnotif[data-count]:before{
diff --git a/public_html/css/layout.css b/public_html/css/layout.css
index 6f1b270..033fae9 100644
--- a/public_html/css/layout.css
+++ b/public_html/css/layout.css
@@ -27,7 +27,7 @@ body{
width: 100%;
height: 100%;
- background-color: #fff;
+ background-color: #eee;
overflow: hidden;
}
@@ -39,14 +39,15 @@ body{
top: 0;
left: 0;
width: 100%;
- height: calc( 4.5em - 1px );
+ height: calc( 3.5em - 1px );
- background: #3756b2;
+ background: #fff;
+ /* background: -webkit-linear-gradient(top right, #2428ff, #00E288); */
color: #fff;
font-family: inherit;
- border-bottom: 1px solid #2a469c;
+ border-bottom: 1px solid #ddd;
overflow: hidden;
}
@@ -55,14 +56,14 @@ body{
#MENU{
display: flex;
position: absolute;
- top: 4.5em;
+ top: 3.5em;
left: 0;
- width: calc( 20em - 2px );
+ width: calc( 15em - 1px );
height: calc( 100% - 5em );
background-color: #fff;
- border-right: 2px solid #eee;
+ border-right: 1px solid #ddd;
flex-direction: column;
justify-content: flex-start;
diff --git a/public_html/css/menu.css b/public_html/css/menu.css
index ccae55e..6ac3fbf 100644
--- a/public_html/css/menu.css
+++ b/public_html/css/menu.css
@@ -19,11 +19,12 @@
top: 0;
left: 0;
width: calc( 100% - 3em );
- height: calc( 100% - 1.5em );
+ height: calc( 100% - 1.4em );
- background-color: #fff;
+ background: #fff url('/image/menu/dashboard.svg') center left 1em no-repeat;
+ background-size: 1.2em auto;
- padding-top: 1.5em;
+ padding-top: 1.4em;
padding-left: 3em;
color: #888;
diff --git a/public_html/image/header/info/error.svg b/public_html/image/header/info/error.svg
index 753883a..8f088c7 100644
--- a/public_html/image/header/info/error.svg
+++ b/public_html/image/header/info/error.svg
@@ -21,7 +21,7 @@
image/svg+xml
-
+
@@ -42,7 +42,7 @@
showgrid="false"
inkscape:zoom="14.024285"
inkscape:cx="5.7725748"
- inkscape:cy="4.573557"
+ inkscape:cy="10.277948"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
@@ -57,7 +57,7 @@
+ inkscape:current-layer="svg4175" />
-
-
-
-
-
+
diff --git a/public_html/image/header/info/warning.svg b/public_html/image/header/info/warning.svg
index 0ea8c81..8a003ab 100644
--- a/public_html/image/header/info/warning.svg
+++ b/public_html/image/header/info/warning.svg
@@ -22,7 +22,7 @@
image/svg+xml
-
+
@@ -40,30 +40,21 @@
id="namedview4207"
showgrid="false"
inkscape:zoom="10.518213"
- inkscape:cx="-9.6618773"
+ inkscape:cx="-25.586636"
inkscape:cy="6.3550537"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
- inkscape:current-layer="Icons new Arranged Names"
+ inkscape:current-layer="svg4198"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
-
-
-
-
-
+
diff --git a/public_html/image/header/notif/bell.svg b/public_html/image/header/notif/bell.svg
index 13d181e..73bfd25 100644
--- a/public_html/image/header/notif/bell.svg
+++ b/public_html/image/header/notif/bell.svg
@@ -33,14 +33,14 @@
id="namedview4201"
showgrid="false"
inkscape:zoom="6.7169026"
- inkscape:cx="70.865997"
+ inkscape:cx="68.781703"
inkscape:cy="70.865997"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="Livello_1" />
\ No newline at end of file
+ id="g5841">
\ No newline at end of file
diff --git a/public_html/image/header/notif/menu.svg b/public_html/image/header/notif/menu.svg
index 4701211..09b1876 100644
--- a/public_html/image/header/notif/menu.svg
+++ b/public_html/image/header/notif/menu.svg
@@ -34,16 +34,16 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
+ inkscape:window-width="1920"
+ inkscape:window-height="1056"
id="namedview4219"
showgrid="false"
- inkscape:zoom="14.75"
- inkscape:cx="8"
- inkscape:cy="8"
+ inkscape:zoom="3.6875"
+ inkscape:cx="-10.285784"
+ inkscape:cy="17.130472"
inkscape:window-x="0"
inkscape:window-y="24"
- inkscape:window-maximized="0"
+ inkscape:window-maximized="1"
inkscape:current-layer="svg4207" />
@@ -51,24 +51,10 @@
id="desc4211" />
-
-
-
-
-
-
-
+
diff --git a/public_html/image/header/notif/message.svg b/public_html/image/header/notif/message.svg
index 1c87d15..df837ae 100644
--- a/public_html/image/header/notif/message.svg
+++ b/public_html/image/header/notif/message.svg
@@ -28,19 +28,19 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
+ inkscape:window-width="1920"
+ inkscape:window-height="1056"
id="namedview4226"
showgrid="false"
inkscape:zoom="9.8333333"
- inkscape:cx="12"
+ inkscape:cx="-22.067797"
inkscape:cy="12"
inkscape:window-x="0"
inkscape:window-y="24"
- inkscape:window-maximized="0"
+ inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
\ No newline at end of file
+ d="M 11.984,13 C 10.031,13 -0.031,4.891 -0.031,4.891 l 0,-0.891 c 0,-1.104 0.896,-2 2.002,-2 L 21.997,2 C 23.104,2 24,2.896 24,4 l -0.016,1 c 0,0 -9.953,8 -12,8 z m 0,2.75 c 2.141,0 12,-7.75 12,-7.75 L 24,20 c 0,1.104 -0.896,2 -2.003,2 L 1.971,22 C 0.866,22 -0.031,21.104 -0.031,20 L -0.015,8 c -0.001,0 10.046,7.75 11.999,7.75 z"
+ id="fill-edit"
+ style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd"
+ class="fill-edit"
+ inkscape:connector-curvature="0" />
\ No newline at end of file
diff --git a/public_html/image/header/notif/search.svg b/public_html/image/header/notif/search.svg
index 89c085d..718f562 100644
--- a/public_html/image/header/notif/search.svg
+++ b/public_html/image/header/notif/search.svg
@@ -32,13 +32,15 @@
inkscape:window-height="1056"
id="namedview4235"
showgrid="false"
- inkscape:zoom="0.4609375"
- inkscape:cx="256"
- inkscape:cy="516.33898"
+ inkscape:zoom="1.3037281"
+ inkscape:cx="-124.44228"
+ inkscape:cy="283.03834"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
\ No newline at end of file
+ d="m 445,386.7 -84.8,-85.9 c 13.8,-24.1 21,-50.9 21,-77.9 C 381.2,135.3 310,64 222.6,64 135.2,64 64,135.3 64,222.9 c 0,87.6 71.2,158.9 158.6,158.9 27.9,0 55.5,-7.7 80.1,-22.4 l 84.4,85.6 c 1.9,1.9 4.6,3.1 7.3,3.1 2.7,0 5.4,-1.1 7.3,-3.1 L 445,401.2 c 4,-4.1 4,-10.5 0,-14.5 z M 222.6,125.9 c 53.4,0 96.8,43.5 96.8,97 0,53.5 -43.4,97 -96.8,97 -53.4,0 -96.8,-43.5 -96.8,-97 0,-53.5 43.4,-97 96.8,-97 z"
+ id="fill-edit"
+ style="fill:#ffffff"
+ class="fill-edit"
+ inkscape:connector-curvature="0" />
\ No newline at end of file
diff --git a/public_html/image/menu/dashboard.svg b/public_html/image/menu/dashboard.svg
index ecbb277..862cfa9 100644
--- a/public_html/image/menu/dashboard.svg
+++ b/public_html/image/menu/dashboard.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/public_html/image/menu/messages.svg b/public_html/image/menu/messages.svg
index e576ad6..6f7dcfc 100644
--- a/public_html/image/menu/messages.svg
+++ b/public_html/image/menu/messages.svg
@@ -1 +1,43 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/public_html/image/menu/profile.svg b/public_html/image/menu/profile.svg
index 90bf628..58065f9 100644
--- a/public_html/image/menu/profile.svg
+++ b/public_html/image/menu/profile.svg
@@ -1 +1,45 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/view/vue-config.js b/view/vue-config.js
index dd89b35..250d68b 100644
--- a/view/vue-config.js
+++ b/view/vue-config.js
@@ -1,13 +1,22 @@
import {GlobalStore} from './lib/gstore-es6'
window.gstore = new GlobalStore();
+
+// Header
window.gstore.add('header_title', 'ndli1718');
-window.gstore.add('notif', {
+window.gstore.add('info', {
active: false,
type: 'warning',
message: 'Warning! blabla'
});
-window.gstore.add('menu_item_active', 'dashboard');
+window.gstore.add('notif', [
+ { class: 'bell', count: 4 },
+ { class: 'message', count: 23 },
+ { class: 'search', count: '' },
+ { class: 'menu', count: '' }
+])
+
+// Menu
window.gstore.add('menu_item', {
dashboard: {
label: 'Dashboard',
@@ -19,4 +28,5 @@ window.gstore.add('menu_item', {
label: 'Boîte de réception',
icon: 'messages'
}
-});
\ No newline at end of file
+});
+window.gstore.add('menu_item_active', 'dashboard');
\ No newline at end of file
diff --git a/view/vue/header.vue b/view/vue/header.vue
index 5b6a7e5..600803d 100644
--- a/view/vue/header.vue
+++ b/view/vue/header.vue
@@ -8,14 +8,11 @@
-
+
@@ -26,6 +23,11 @@
\ No newline at end of file
diff --git a/view/vue/menu.vue b/view/vue/menu.vue
index 0f2c23b..0b48780 100644
--- a/view/vue/menu.vue
+++ b/view/vue/menu.vue
@@ -4,7 +4,7 @@