From fc063a644e70e74337e09672d98801efb3cd1560 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Wed, 21 Oct 2015 19:13:56 +0200 Subject: [PATCH] =?UTF-8?q?commit=204=C2=A0@dev=5Fflat=20->=20cr=C3=A9?= =?UTF-8?q?=C3=A9=3D>=20[fond]=20+=20[layout]=20+=20[menu]=20+=20[sous-par?= =?UTF-8?q?ties]=20+=20[searchbar]=20+=20[username]=20+=20[notif]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/container.css | 20 ++++++ css/header.css | 65 ++++++++++++++++--- css/layout.css | 20 ++++-- css/menu.css | 34 +++++----- groups.php | 70 +++++++++++---------- index.php | 68 ++++++++++---------- js/actionScript.js | 56 ++++++++++++----- src/{ => menu}/menu_icon/auth.svg | 8 +-- src/{ => menu}/menu_icon/auth@hover.svg | 6 +- src/{ => menu}/menu_icon/groups.svg | 8 +-- src/{ => menu}/menu_icon/groups@hover.svg | 8 +-- src/{ => menu}/menu_icon/home.svg | 18 +++--- src/{ => menu}/menu_icon/home@hover.svg | 12 ++-- src/{ => menu}/menu_icon/marks.svg | 16 ++--- src/{ => menu}/menu_icon/marks@hover.svg | 15 ++--- src/{ => menu}/menu_icon/modules.svg | 8 +-- src/{ => menu}/menu_icon/modules@hover.svg | 10 +-- src/{ => menu}/menu_icon/settings.svg | 8 +-- src/{ => menu}/menu_icon/settings@hover.svg | 10 +-- src/{ => menu}/menu_icon/ue.svg | 14 ++--- src/{ => menu}/menu_icon/ue@hover.svg | 14 ++--- test.php | 3 - 22 files changed, 302 insertions(+), 189 deletions(-) rename src/{ => menu}/menu_icon/auth.svg (88%) rename src/{ => menu}/menu_icon/auth@hover.svg (90%) rename src/{ => menu}/menu_icon/groups.svg (91%) rename src/{ => menu}/menu_icon/groups@hover.svg (91%) rename src/{ => menu}/menu_icon/home.svg (94%) rename src/{ => menu}/menu_icon/home@hover.svg (95%) rename src/{ => menu}/menu_icon/marks.svg (90%) rename src/{ => menu}/menu_icon/marks@hover.svg (90%) rename src/{ => menu}/menu_icon/modules.svg (94%) rename src/{ => menu}/menu_icon/modules@hover.svg (94%) rename src/{ => menu}/menu_icon/settings.svg (94%) rename src/{ => menu}/menu_icon/settings@hover.svg (92%) rename src/{ => menu}/menu_icon/ue.svg (85%) rename src/{ => menu}/menu_icon/ue@hover.svg (85%) delete mode 100644 test.php diff --git a/css/container.css b/css/container.css index e69de29..2b84c3d 100755 --- a/css/container.css +++ b/css/container.css @@ -0,0 +1,20 @@ +#CONTAINER div{ + /* position */ + display: block; + position: absolute; + top: 0; + left: 0; + width: 100%; + min-height: 100%; + padding: 2em; + + /* background */ + background-color: #ecf0f1; + + /* Z */ + z-index: 7; +} + + + +#CONTAINER div.active{ z-index: 8; } \ No newline at end of file diff --git a/css/header.css b/css/header.css index 80100a4..4b78f81 100755 --- a/css/header.css +++ b/css/header.css @@ -77,8 +77,8 @@ display: block; width: 5em; /* pour faire un carré */ - background: transparent url(../src/header/icon.svg) center center no-repeat; - background-size: 80% 80%; + background: transparent url(../src/menu/menu_icon/home@hover.svg) center center no-repeat; + background-size: 40%; } @@ -109,15 +109,66 @@ line-height: 2.5em; /* animation */ - transition: all 0s, background-size .2s ease-in-out; - -moz-transition: all 0s, background-size .2s ease-in-out; - -webkit-transition: all 0s, background-size .2s ease-in-out; - -ms-transition: all 0s, background-size .2s ease-in-out; - -o-transition: all 0s, background-size .2s ease-in-out; + transition: background-position 0s, all .2s ease-in-out; + -moz-transition: background-position 0s, all .2s ease-in-out; + -webkit-transition: all 0s; + -ms-transition: background-position 0s, all .2s ease-in-out; + -o-transition: background-position 0s, all .2s ease-in-out; } #HEADER .searchbar:focus{ background-image: url(../src/header/search@hover.svg); color: #223343; +} + + + + + + + + +/******** SUBHEADER ********/ +#SUBHEADER nav{ + /* position */ + display: flex; + position: absolute; + top: calc( 100% - 2em ); + left: 0; + width: 100%; + height: 2em; + + /* flex */ + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-start; + + /* foreground */ + font-size: .9em; + font-weight: bold; + text-transform: uppercase; +} + +#SUBHEADER nav > span{ + /* position */ + margin-left: 3em; + + /* border */ + border-bottom: 3px solid #fff; + + /* animation */ + transition: all .1s ease-in-out; + -moz-transition: all .1s ease-in-out; + -webkit-transition: all .1s ease-in-out; + -ms-transition: all .1s ease-in-out; + -o-transition: all .1s ease-in-out; + + /* extra */ + cursor: pointer; +} + +#SUBHEADER nav > span:hover, +#SUBHEADER nav > span.active{ + border-bottom-color: #2cab5f; } \ No newline at end of file diff --git a/css/layout.css b/css/layout.css index 271b521..33f7734 100755 --- a/css/layout.css +++ b/css/layout.css @@ -41,13 +41,15 @@ body{ /* background */ background: #ecf0f1; background: url(../src/wallpaper.jpg) top left no-repeat; + background: url(http://7-themes.com/data_images/out/4/6780645-colorful-blur-wallpaper.jpg) top left no-repeat; background-size: cover; + background-attachment: fixed; /* overflow */ overflow-x: hidden; /* empêche la barre horizontale de scroll [précaution] */ /* foreground */ - font: 16px 'Open Sans', 'Helvetica Neue', 'Arial', 'sans-serif'; + font: 16px 'Ubuntu', 'Open Sans', 'Helvetica Neue', 'Arial', 'sans-serif'; } @@ -56,11 +58,18 @@ body{ /* position */ display: block; position: absolute; - width: calc( 100% - 2*100px ); - min-height: calc( 100% - 2*100px ); - margin: 100px; + width: calc( 100% - 2*50px ); + min-height: calc( 100% - 2*50px ); + margin: 50px; + /* border */ box-shadow: 0 0 5px #777; + + /* background */ + background-color: #ecf0f1; + + /* scroll */ + overflow: hidden; } #MENU{ @@ -127,6 +136,9 @@ body{ width: calc( 100% - 14em ); height: 10em; + /* border */ + border-bottom: 1px solid #d2d3d5; + /* background */ background-color: #fff; diff --git a/css/menu.css b/css/menu.css index 5b8a815..426a2f2 100755 --- a/css/menu.css +++ b/css/menu.css @@ -71,11 +71,11 @@ background-size: 1.7em; /* animation */ - transition: all 0s, background-size .2s ease-in-out; - -moz-transition: all 0s, background-size .2s ease-in-out; - -webkit-transition: all 0s, background-size .2s ease-in-out; - -ms-transition: all 0s, background-size .2s ease-in-out; - -o-transition: all 0s, background-size .2s ease-in-out; + transition: background-position 0s, all .2s ease-in-out; + -moz-transition: background-position 0s, all .2s ease-in-out; + -webkit-transition: all 0s; + -ms-transition: background-position 0s, all .2s ease-in-out; + -o-transition: background-position 0s, all .2s ease-in-out; } @@ -89,24 +89,24 @@ /* gestion des différentes icônes */ -#MENU a:nth-child(2){ background-image: url(../src/menu_icon/home.svg); } -#MENU a:nth-child(3){ background-image: url(../src/menu_icon/groups.svg); } -#MENU a:nth-child(4){ background-image: url(../src/menu_icon/ue.svg); } -#MENU a:nth-child(5){ background-image: url(../src/menu_icon/modules.svg); } -#MENU a:nth-child(6){ background-image: url(../src/menu_icon/marks.svg); } -#MENU a:nth-child(7){ background-image: url(../src/menu_icon/settings.svg); } +#MENU a:nth-child(2){ background-image: url(../src/menu/menu_icon/home.svg); } +#MENU a:nth-child(3){ background-image: url(../src/menu/menu_icon/groups.svg); } +#MENU a:nth-child(4){ background-image: url(../src/menu/menu_icon/ue.svg); } +#MENU a:nth-child(5){ background-image: url(../src/menu/menu_icon/modules.svg); } +#MENU a:nth-child(6){ background-image: url(../src/menu/menu_icon/marks.svg); } +#MENU a:nth-child(7){ background-image: url(../src/menu/menu_icon/settings.svg); } /* gestion de l'activation des différentes icônes */ #MENU a:nth-child(2):hover, -#MENU a:nth-child(2).active{ background-image: url(../src/menu_icon/home@hover.svg); } +#MENU a:nth-child(2).active{ background-image: url(../src/menu/menu_icon/home@hover.svg); } #MENU a:nth-child(3):hover, -#MENU a:nth-child(3).active{ background-image: url(../src/menu_icon/groups@hover.svg); } +#MENU a:nth-child(3).active{ background-image: url(../src/menu/menu_icon/groups@hover.svg); } #MENU a:nth-child(4):hover, -#MENU a:nth-child(4).active{ background-image: url(../src/menu_icon/ue@hover.svg); } +#MENU a:nth-child(4).active{ background-image: url(../src/menu/menu_icon/ue@hover.svg); } #MENU a:nth-child(5):hover, -#MENU a:nth-child(5).active{ background-image: url(../src/menu_icon/modules@hover.svg); } +#MENU a:nth-child(5).active{ background-image: url(../src/menu/menu_icon/modules@hover.svg); } #MENU a:nth-child(6):hover, -#MENU a:nth-child(6).active{ background-image: url(../src/menu_icon/marks@hover.svg); } +#MENU a:nth-child(6).active{ background-image: url(../src/menu/menu_icon/marks@hover.svg); } #MENU a:nth-child(7):hover, -#MENU a:nth-child(7).active{ background-image: url(../src/menu_icon/settings@hover.svg); } +#MENU a:nth-child(7).active{ background-image: url(../src/menu/menu_icon/settings@hover.svg); } diff --git a/groups.php b/groups.php index 05e096e..a8dfc59 100755 --- a/groups.php +++ b/groups.php @@ -23,6 +23,14 @@ if( !(isset($_SESSION['username']) && is_string($_SESSION['username']) && strlen $_SESSION['username'] = null; + +/* VARIABLES DES NOTIFICATIONS */ +$memberNotifNum = 10; +$messageNotifNum = 0; +$notifNotifNum = 5; + + + ?> @@ -42,7 +50,7 @@ if( !(isset($_SESSION['username']) && is_string($_SESSION['username']) && strlen - + @@ -57,7 +65,7 @@ if( !(isset($_SESSION['username']) && is_string($_SESSION['username']) && strlen