klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fontawesome' into 'master'

Browse Source 
Few changes in design

See merge request ae/Sith!119
This commit is contained in:
Skia 2017-10-06 15:30:30 +02:00
commit fae2a572b1
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/static/core/style.scss
View File

@ -91,8 +91,8 @@ header {
width: 90%; width: 90%;
margin: 0px auto; margin: 0px auto;
display: flex; display: flex;
box-shadow: black 1px 1px 5px; box-shadow: grey 1px 1px 5px;
border: solid 1px $black-color; border: solid 1px grey;
border-top: none; border-top: none;
background-color: $primary-neutral-dark-color; background-color: $primary-neutral-dark-color;
@ -178,7 +178,7 @@ header {
width: 22em; width: 22em;
overflow: auto; overflow: auto;
list-style-type: none; list-style-type: none;
box-shadow: black 1px 1px 5px; box-shadow: grey 1px 1px 5px;
background: white; background: white;
text-align: left; text-align: left;
font-size: 80%; font-size: 80%;
@ -239,7 +239,7 @@ header {
min-width: 10%; min-width: 10%;
max-width: 46%; max-width: 46%;
min-height: 20px; min-height: 20px;
box-shadow: black 1px 1px 5px; box-shadow: grey 1px 1px 5px;
&:before { &:before {
float: left; float: left;
margin: 0.2em; margin: 0.2em;
@ -250,27 +250,33 @@ header {
} }
} }
#info_box { #info_box {
border: solid 1px $black-color; border: solid 1px grey;
background: $white-color; background: $white-color;
&:before { &:before {
content: url('img/info.png'); font-family: FontAwesome;
font-size: 4em;
content: "\f05a";
color: darkblue;
} }
} }
#alert_box { #alert_box {
border: solid 1px $black-color; border: solid 1px grey;
background: $second-color; background: $second-color;
&:before { &:before {
content: url('img/warning.png'); font-family: FontAwesome;
font-size: 4em;
content: "\f06a";
color: $white-color;
} }
} }
} }
#page { #page {
box-shadow: black 1px 1px 5px; box-shadow: grey 1px 1px 5px;
width: 90%; width: 90%;
margin: 0em auto; margin: 0em auto;
border: solid 1px $black-color; border: solid 1px grey;
/*---------------------------------NAV---------------------------------*/ /*---------------------------------NAV---------------------------------*/
nav { nav {
@ -363,7 +369,7 @@ header {
margin: 0em 0em 0.5em 0em; margin: 0em 0em 0.5em 0em;
text-transform: uppercase; text-transform: uppercase;
font-size: 1.1em; font-size: 1.1em;
border: solid 1px black; border: solid 1px grey;
&:not(:first-of-type) { &:not(:first-of-type) {
margin: 2em 0em 1em 0em; margin: 2em 0em 1em 0em;
} }
@ -377,7 +383,7 @@ header {
background: white; background: white;
box-shadow: grey 2px 2px 2px; box-shadow: grey 2px 2px 2px;
font-size: 70%; font-size: 70%;
border: solid 1px $black-color; border: solid 1px grey;
margin-bottom: 1em; margin-bottom: 1em;
#agenda_title,#birthdays_title { #agenda_title,#birthdays_title {
margin: 0em; margin: 0em;
@ -386,7 +392,7 @@ header {
font-size: 150%; font-size: 150%;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
border-bottom: solid 1px $black-color; border-bottom: solid 1px grey;
background: $second-color; background: $second-color;
} }
#agenda_content { #agenda_content {
@ -434,7 +440,7 @@ header {
/* EVENTS TODAY AND NEXT FEW DAYS */ /* EVENTS TODAY AND NEXT FEW DAYS */
.news_events_group { .news_events_group {
border: solid 1px black; border: solid 1px grey;
box-shadow: grey 2px 2px 2px; box-shadow: grey 2px 2px 2px;
margin-left: 1em; margin-left: 1em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
@ -459,7 +465,7 @@ header {
.news_events_group_items { .news_events_group_items {
display: table-cell; display: table-cell;
width: 100%; width: 100%;
border-left: solid 1px black; border-left: solid 1px grey;
.news_event:nth-of-type(odd) { .news_event:nth-of-type(odd) {
background: white; background: white;
} }
@ -1099,8 +1105,8 @@ footer {
color: $white-color; color: $white-color;
display: flex; display: flex;
background-color: $primary-neutral-dark-color; background-color: $primary-neutral-dark-color;
box-shadow: black 1px 1px 5px; box-shadow: grey 1px 1px 5px;
border: solid 1px $black-color; border: solid 1px grey;
a { a {
padding: 0.8em; padding: 0.8em;
flex: 1; flex: 1;