diff --git a/public_html/asset/svg/fiche.svg b/public_html/asset/svg/fiche.svg
index 9b07e59..35119b2 100644
--- a/public_html/asset/svg/fiche.svg
+++ b/public_html/asset/svg/fiche.svg
@@ -7,25 +7,19 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- height="32px"
+ enable-background="new 0 0 30 30"
+ height="30px"
+ id="Layer_1"
version="1.1"
- viewBox="0 0 32 32"
- width="32px"
- id="svg11"
+ viewBox="0 0 30 30"
+ width="30px"
+ xml:space="preserve"
sodipodi:docname="fiche.svg"
- inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-
-
-
- image/svg+xml
-
-
-
-
- image/svg+xml
-
-
-
-
-
-
-
-
-
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="Layer_1" />
\ No newline at end of file
diff --git a/public_html/asset/svg/manage.svg b/public_html/asset/svg/manage.svg
deleted file mode 100644
index 84d9d52..0000000
--- a/public_html/asset/svg/manage.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
\ No newline at end of file
diff --git a/public_html/asset/svg/settings.svg b/public_html/asset/svg/settings.svg
new file mode 100644
index 0000000..9b8c370
--- /dev/null
+++ b/public_html/asset/svg/settings.svg
@@ -0,0 +1,42 @@
+
+
\ No newline at end of file
diff --git a/public_html/asset/svg/teacher.svg b/public_html/asset/svg/teacher.svg
new file mode 100644
index 0000000..710d8f4
--- /dev/null
+++ b/public_html/asset/svg/teacher.svg
@@ -0,0 +1,42 @@
+
+
\ No newline at end of file
diff --git a/public_html/asset/svg/ue.svg b/public_html/asset/svg/ue.svg
new file mode 100644
index 0000000..17600fd
--- /dev/null
+++ b/public_html/asset/svg/ue.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
diff --git a/webpack/data/common.js b/webpack/data/common.js
index a83c0af..be6eb9d 100644
--- a/webpack/data/common.js
+++ b/webpack/data/common.js
@@ -32,14 +32,22 @@ gstore.add('menu_item', {
label: 'Accueil',
url: 'home',
icon: 'home'
- }, manage: {
- label: 'Administration',
- url: 'manage',
- icon: 'manage'
+ }, teacher: {
+ label: 'Enseignants',
+ url: 'teacher',
+ icon: 'teacher'
+ }, ue: {
+ label: 'Gestion UE',
+ url: 'ue',
+ icon: 'ue'
}, fiche: {
label: 'Fiches',
url: 'fiche',
icon: 'fiche'
+ }, settings: {
+ label: 'Administration',
+ url: 'settings',
+ icon: 'settings'
}
});
diff --git a/webpack/scss/constants.scss b/webpack/scss/constants.scss
index 9cdc397..3e272f3 100644
--- a/webpack/scss/constants.scss
+++ b/webpack/scss/constants.scss
@@ -1,3 +1,6 @@
+// BACKGROUND COLOR
+$bg-color: #eee;
+
/* COULEUR DES ERREURS */
$error-color: #cc5857;
@@ -18,5 +21,10 @@ $rd-form-neutral-color: '2193e6';
$rd-form-search-color: '5630ed';
$rd-form-invalid-color: 'd52918';
+// Menu
+$menu-bg: #303030;
+$menu-width: 3em;
+$menu-outer-width: #{$menu-width + 1em};
+
$c404-bubble-width: 40vh;
\ No newline at end of file
diff --git a/webpack/scss/container.scss b/webpack/scss/container.scss
index e69de29..61885e0 100644
--- a/webpack/scss/container.scss
+++ b/webpack/scss/container.scss
@@ -0,0 +1,15 @@
+@import 'constants';
+
+
+#CONTAINER{
+
+ display: block;
+ position: absolute;
+ top: 0;
+ left: $menu-outer-width;
+ height: 100%;
+ width: calc( 100% - #{$menu-outer-width} );
+
+ background-color: $bg-color;
+
+}
\ No newline at end of file
diff --git a/webpack/scss/layout.scss b/webpack/scss/layout.scss
index b264c63..11fae28 100644
--- a/webpack/scss/layout.scss
+++ b/webpack/scss/layout.scss
@@ -13,7 +13,7 @@ body{
width: 100%;
height: 100%;
- background: #eeeeee;
+ background: $bg-color;
font-size: 16px;
font-family: 'Open Sans';
@@ -31,7 +31,7 @@ body{
width: 100%;
height: 100%;
- background: #eee;
+ background: $bg-color;
&.login{
diff --git a/webpack/scss/menu.scss b/webpack/scss/menu.scss
index 4ec3cba..935d6c0 100644
--- a/webpack/scss/menu.scss
+++ b/webpack/scss/menu.scss
@@ -1,6 +1,4 @@
-$menu-bg: #303030;
-$menu-width: 3em;
-$menu-outer-width: #{$menu-width + 1em};
+@import 'constants';
@keyframes menu-label{
@@ -33,15 +31,17 @@ $menu-outer-width: #{$menu-width + 1em};
.item{
display: block;
position: relative;
- width: $menu-width;
- height: $menu-width;
+ width: $menu-width;
+ height: $menu-width;
+
+ margin-top: .5em;
border-radius: 3px / 3px;
box-shadow: inset 0 0 0 transparent;
background: $menu-bg center center no-repeat;
- background-size: 50%;
+ background-size: auto 50%;
border: 1px solid lighten($menu-bg, 5%);
@@ -52,11 +52,13 @@ $menu-outer-width: #{$menu-width + 1em};
z-index: 1;
/* (1) Set icons */
- &[data-icon='home']{ background-image: url('/asset/svg/home.svg@7992a3'); }
- &[data-icon='manage']{ background-image: url('/asset/svg/manage.svg@7992a3'); }
- &[data-icon='fiche']{ background-image: url('/asset/svg/fiche.svg@7992a3'); }
- &[data-icon='login']{ background-image: url('/asset/svg/login.svg@7992a3'); }
- &[data-icon='logout']{ background-image: url('/asset/svg/logout.svg@7992a3'); }
+ &[data-icon='home']{ background-image: url('/asset/svg/home.svg@7992a3'); }
+ &[data-icon='teacher']{ background-image: url('/asset/svg/teacher.svg@7992a3'); }
+ &[data-icon='ue']{ background-image: url('/asset/svg/ue.svg@7992a3'); }
+ &[data-icon='settings']{ background-image: url('/asset/svg/settings.svg@7992a3'); }
+ &[data-icon='fiche']{ background-image: url('/asset/svg/fiche.svg@7992a3'); }
+ &[data-icon='login']{ background-image: url('/asset/svg/login.svg@7992a3'); }
+ &[data-icon='logout']{ background-image: url('/asset/svg/logout.svg@7992a3'); }
/* (2) On hover */
&:hover, &.active{
@@ -67,11 +69,13 @@ $menu-outer-width: #{$menu-width + 1em};
color: #4a71dd;
- &[data-icon='home']:hover, &[data-icon='home'].active{ background-image: url('/asset/svg/home.svg@10d197'); }
- &[data-icon='manage']:hover, &[data-icon='manage'].active{ background-image: url('/asset/svg/manage.svg@da5645'); }
- &[data-icon='fiche']:hover, &[data-icon='fiche'].active{ background-image: url('/asset/svg/fiche.svg@4a71dd'); }
- &[data-icon='login']:hover, &[data-icon='login'].active{ background-image: url('/asset/svg/login.svg@dab245'); }
- &[data-icon='logout']:hover, &[data-icon='logout'].active{ background-image: url('/asset/svg/logout.svg@dab245'); }
+ &[data-icon='home']:hover, &[data-icon='home'].active{ background-image: url('/asset/svg/home.svg@10d197'); }
+ &[data-icon='teacher']:hover, &[data-icon='teacher'].active{ background-image: url('/asset/svg/teacher.svg@edb910'); }
+ &[data-icon='ue']:hover, &[data-icon='ue'].active{ background-image: url('/asset/svg/ue.svg@1fc9ef'); }
+ &[data-icon='settings']:hover, &[data-icon='settings'].active{ background-image: url('/asset/svg/settings.svg@b7b7b7'); }
+ &[data-icon='fiche']:hover, &[data-icon='fiche'].active{ background-image: url('/asset/svg/fiche.svg@ea4C3a'); }
+ &[data-icon='login']:hover, &[data-icon='login'].active{ background-image: url('/asset/svg/login.svg@dab245'); }
+ &[data-icon='logout']:hover, &[data-icon='logout'].active{ background-image: url('/asset/svg/logout.svg@dab245'); }
/* (3) Label */
&:after{
@@ -94,6 +98,10 @@ $menu-outer-width: #{$menu-width + 1em};
transform: translateX(-100%) translateY(-50%);
+ // 1 line only
+ white-space: nowrap;
+ overflow: hidden;
+
z-index: -1;
}