css no finished

This commit is contained in:
Qwann 2018-10-04 21:10:30 +02:00
parent 601ba4d116
commit 7ebee733c5
15 changed files with 163 additions and 464 deletions

View file

@ -1,3 +1,4 @@
// main: global.scss
#filter_form { #filter_form {
.form-group { .form-group {
.col-md-3, .col-md-9 { .col-md-3, .col-md-9 {
@ -7,7 +8,7 @@
padding-left: 15px; padding-left: 15px;
list-style: none; list-style: none;
height: auto; height: auto;
a.selected { a.selected {
text-decoration: underline; text-decoration: underline;
color: darken($main_soft_color, 40%); color: darken($main_soft_color, 40%);

View file

@ -1,3 +1,4 @@
// main: global.scss
@mixin active { @mixin active {
&:active, &:active,
&.active { &.active {

View file

@ -1,15 +1,14 @@
/* BANNER */ // main: global.scss
.strong-banner { .strong-banner {
padding-top : 20px; padding-top : 20px;
padding-bottom : 10px ; padding-bottom : 10px ;
background-color : $main_bold_color; background-color : $header-background;
color: $second_bold_color; color: $header-color;
} }
.navbar-inverse { .navbar-inverse {
background-color : $main_bold_color; background-color : $header-background;
background-color : transparent ; background-color : transparent ;
border-style : none ; border-style : none ;
.navbar-nav { .navbar-nav {
@ -17,7 +16,7 @@
& > .open > a:focus, & > .open > a:focus,
& > .open > a:hover { & > .open > a:hover {
color: #fff; color: #fff;
background-color: $main_soft_color; background-color: $header-second-backgroud;
} }
} }
} }
@ -27,7 +26,7 @@
padding : 0px ; padding : 0px ;
/* only < 768px*/ /* only < 768px*/
background-color : $main_soft_color; background-color : $header-second-backgroud;
padding-left: 25px; padding-left: 25px;
margin-left: -15px; margin-left: -15px;
margin-right: -15px; margin-right: -15px;
@ -84,7 +83,7 @@
color: $second_bold_color; color: $second_bold_color;
background: transparent; background: transparent;
@media (min-width: 768px) { @media (min-width: 768px) {
color: $second_white_color; color: $second_white_color;
} }
} }
} }

View file

@ -1,3 +1,4 @@
// main: global.scss
.message-info { .message-info {
color : #31708f; color : #31708f;
background-color: #d9edf7; background-color: #d9edf7;

View file

@ -1,3 +1,4 @@
// main: global.scss
.tree { .tree {
font-size:large; font-size:large;
ul, li { ul, li {
@ -35,6 +36,3 @@
} }
} }

View file

@ -0,0 +1,79 @@
// main: global.scss
$main_c7: #375362;
$main_c6: #4F778C;
$main_c5: #5D8CA6;
$main_c3: #BDD2DE;
$main_c1: #F0FAFF;
$neutral_c2 : #F2EDDC;
$neutral_c1: #FFFBEF;
$activity_c8: #4FADB8;
$activity_c7: #5ED1DC;
$activity_c3: #CAE4E7;
$event_c8: #3488A6;
$event_c7: #3999BA;
$event_c3: #AAD5E2;
$todo_c8: #F19F5D;
$todo_c7: #FF9C4D;
$todo_c3: #FFDEBC;
$equipment_c8: #E75571;
$equipment_c7: #FF5C79;
$equipment_c3: #FECAD6;
$staff_c8: #3BAD89;
$staff_c7: #42C2A2;
$staff_c3: #A9E1D7;
/* LEGACY COLORS*/
$main_bold_color: #FF6969;
$main_soft_color: #FF9191;
$main_white_color: #FFEBEB;
$second_bold_color: #FFB363;
$second_soft_color: #FFC282;
$second_white_color: #FFF5EB;
$third_bold_color: #48B0C7;
$third_soft_color: #8FD4E3;
$third_white_color: #DCEAED;
/* COLORS */
/* Header */
$header-background: $main_c7;
$header-second-backgroud: $main_c5;
$header-color: white;
$underline-brand: $equipment_c7;
/* Général */
$html-background: $neutral_c1;
$content-background: $neutral_c1;
$content-border: $main_c7;
$aside-background: $main_c7;
$aside-inverted-background: $main_c5;
$title_border: $main_c7;
/* Le reste */
$btn-font-color: white;
$btn-bg-base: $main_bold_color;
$btn-bg-special: $main_soft_color;
$btn-border: $main_bold_color;
$yes_color: #55C487;
$no_color: #E36268;
$dunno_color: #5599C4;
/* Titres */
$h1_background: $main_c6;
$h2_background: $main_c3;
$h3_background: $main_c1;
/* FONTS */
$font_brand:'Lily Script One', cursive;
$font_nav:'Work Sans', cursive;
$font_bold:'Capriola', sans-serif;
$font_normal:'Saira Semi Condensed', sans-serif;

View file

@ -1,389 +0,0 @@
@charset "UTF-8";
/*NE PAS MODIFIER LE FICHIER .CSS, MAIS PLUTÔT LE
FICHIER .SCSS */
/* COLORS */
/* FONTS */
.message-info {
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1; }
.message-success {
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6; }
.message-warning {
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc; }
.message-error {
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1; }
.alert {
margin-bottom: 0; }
/* BANNER */
.strong-banner {
padding-top: 20px;
padding-bottom: 10px;
background-color: #FF6969;
color: #FFB363; }
.navbar-inverse {
background-color: #FF6969;
background-color: transparent;
border-style: none; }
.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:focus, .navbar-inverse .navbar-nav > .open > a:hover {
color: #fff;
background-color: #FF9191; }
.navbar-collapse {
border-top: 0px solid transparent;
padding: 0px;
/* only < 768px*/
background-color: #FF9191;
padding-left: 25px;
margin-left: -15px;
margin-right: -15px; }
@media (min-width: 768px) {
.navbar-collapse {
background-color: transparent;
padding-left: 0px;
margin-left: 0px;
margin-right: 0px; } }
.navbar-nav {
width: 100%; }
@media (min-width: 768px) {
.navbar-nav {
float: right;
width: auto; } }
.navbar-inverse {
/* BRAND */
/* ICONE */
/* LINKS */ }
.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus {
color: white;
font-family: "Lily Script One", cursive;
font-size: xx-large;
border-bottom: 5px solid #FFC282; }
.navbar-inverse .navbar-toggle, .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
background-color: #FFB363;
border-color: #FFB363; }
.navbar-inverse .navbar-toggle .icon-bar {
background-color: #FFF5EB; }
.navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
font-family: "Work Sans", cursive;
font-size: large;
color: #FFB363;
background: transparent; }
@media (min-width: 768px) {
.navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
color: #FFF5EB; } }
.btn-primary {
/**
* This mixins allows defining color-related properties of buttons.
*
* It sets the following properties:
* color: $color, except for disabled-like buttons.
* border-color: $border.
* background-color: Depending on button state:
* - Default, disabled:
* $background-base
* - Hovered, focused, actived, responsible of an opened dropdown:
* (one is sufficent)
* $background-special
*
* ## Bootstrap compatibility
*
* This mixin can be used to replace colors behaviors of Bootstrap buttons.
* Indeed, this mixin aims to replace each definition done by the
* 'button-variant' Bootstrap mixin.
*
*/
color: white;
background-color: #FF6969;
border-color: #FF6969;
/**
* This mixin applies content if the button is in at least one of the
* following states:
*
* - hovered,
* - focused,
* - actived,
* - is responsible of an opened dropdown.
*
* Where possible, state is checked from class attribute and
* :pseudo-classes.
*
* ## Bootstrap compatibility
*
* If content defines 'color', 'background-color' and 'border', it is safe
* to use this mixin with Bootstrap buttons as it will overrides all
* Bootstrap color defaults of the previous cases.
* To be precise, this covers all special important-like cases of the
* Bootstrap mixin 'button-variant' (except the 'disabled' case).
*
*/ }
.btn-primary:focus, .btn-primary.focus, .btn-primary:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969; }
.btn-primary:active, .btn-primary.active {
color: white;
background-color: #FF9191;
border-color: #FF6969; }
.btn-primary:active:focus, .btn-primary:active.focus, .btn-primary:active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .btn-primary.active:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969; }
.open > .btn-primary.dropdown-toggle {
color: white;
background-color: #FF9191;
border-color: #FF6969; }
.open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus, .open > .btn-primary.dropdown-toggle:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969; }
.btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary.disabled:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary:hover {
background-color: #FF6969;
border-color: #FF6969; }
.btn-primary .badge {
color: #FF6969;
background-color: white; }
form#filter_form .form-group {
padding-right: 20px; }
form#filter_form ul.form-control {
background-color: transparent;
border: none;
box-shadow: none; }
.tree {
font-size: large; }
.tree ul, .tree li {
position: relative; }
.tree ul {
list-style: none;
padding-left: 32px; }
.tree li::before,
.tree li::after {
content: "";
position: absolute;
left: -12px; }
.tree li::before {
border-top: 3px solid #FFC282;
top: 9px;
width: 8px;
height: 0; }
.tree li::after {
border-left: 3px solid #FFC282;
height: 100%;
width: 0px;
top: 2px; }
.tree ul > li:last-child::after {
height: 8px; }
#filter_form .form-group .col-md-3, #filter_form .form-group .col-md-9 {
float: none; }
#filter_form .form-group ul.form-control {
padding-left: 15px;
list-style: none;
height: auto; }
#filter_form .form-group ul.form-control a.selected {
text-decoration: underline;
color: #c40000; }
/* MISE EN FORME GÉNÉRALE */
html {
height: 100%;
background-color: #DCEAED; }
body {
font-family: "Saira Semi Condensed", sans-serif;
font-size: medium; }
#principal {
background-color: #DCEAED; }
/*MAIN*/
main {
background-color: white;
margin-top: 0px;
padding: 15px; }
main a {
color: #FF6969; }
main a:hover, main a:active, main a:focus {
color: #FF6969; }
main h1 {
border-bottom: 7px solid #FFB363;
padding-bottom: 5px;
font-family: "Capriola", sans-serif;
font-weight: 600; }
main h2 {
border-bottom: 2px solid #FF6969;
color: #FF6969;
padding-bottom: 5px;
font-family: "Capriola", sans-serif;
font-weight: 600; }
/*ASIDE*/
aside {
background-color: #FFC282;
color: white;
margin-top: 0px;
padding: 0px !important; }
aside a {
color: #FF9191; }
aside a:hover, aside a:active, aside a:focus {
color: #FF9191; }
aside code {
color: white;
background-color: #FFB363; }
aside .heading {
padding: 8px 15px;
font-size: 32px;
line-height: 1.3;
text-align: center; }
aside .heading.inverted {
background-color: #FFF5EB;
color: black; }
aside .heading.small {
font-size: 25px; }
aside .heading.small .sub {
font-size: 0.7em;
font-weight: normal; }
aside .heading .sub {
font-size: 0.7em;
font-weight: normal; }
aside .heading.separator {
border-bottom-color: #FF9191;
border-bottom-style: solid; }
aside .text {
padding: 15px; }
aside .text.inverted {
background-color: #FFF5EB;
color: black; }
@media (min-width: 768px) {
main {
margin-top: 20px; }
aside {
margin-top: 20px; } }
hr {
border-top: 1px solid #FFB363; }
span.vsep {
padding-left: 5px;
padding-right: 5px; }
div.tag-list {
margin-top: 20px; }
code {
font-size: small; }
.module-list {
display: flex;
align-items: stretch;
flex-wrap: wrap; }
a.module {
background-color: #FFB363;
color: #FFF5EB;
padding: 20px 40px;
margin: 5px;
border-bottom-color: #FF9191;
border-bottom-style: solid;
font-size: large;
display: block; }
a.module:hover, a.module:active, a.module:focus {
color: #FFF5EB;
background-color: #FFC282;
text-decoration: none; }
.collapsible {
background-color: #777;
color: white;
cursor: pointer;
padding: 18px;
width: 100%;
border: none;
text-align: left;
outline: none;
font-size: 15px; }
.collapsible:after {
content: '\002B';
color: white;
font-weight: bold;
float: right;
margin-left: 5px; }
.collapsible:hover {
background-color: #555; }
.collapsible h3 {
margin-top: 0px;
margin-bottom: 0px;
display: inline-block; }
.active {
background-color: #555; }
.active:after {
content: "\2212"; }
.content {
padding: 8px 18px;
display: none;
background-color: #f1f1f1; }
.content.fluid {
padding: 0px 0px;
background-color: transparent; }
.content h4 {
font-size: x-large;
font-weight: bold;
display: inline-block;
margin: 0px 0px; }
.planning .activity {
padding: 8px 18px;
padding-top: 8px;
padding-bottom: 12px;
border-left: none;
border-right: 6px solid #FF9191; }
.planning .activity.inverted {
border-left: 6px solid #FF9191;
border-right: none; }
.planning .activity .activity-title {
font-size: large; }
.glyphicon.yes {
color: #55C487 !important; }
.glyphicon.no {
color: #E36268 !important; }
.glyphicon.dunno {
color: #5599C4 !important; }
.sending-request {
position: relative; }
.sending-request:after {
content: "Chargement...";
position: absolute;
width: 100%;
height: 100%;
background: #fff;
opacity: 0.8;
color: #777;
text-align: center;
box-sizing: border-box;
z-index: 5;
top: 0;
left: 0;
padding: 8%; }
/*# sourceMappingURL=global.css.map */

View file

@ -0,0 +1 @@
global.min.css

File diff suppressed because one or more lines are too long

1
shared/static/css/global.min.css vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -1,16 +1,16 @@
/*NE PAS MODIFIER LE FICHIER .CSS, MAIS PLUTÔT LE /*NE PAS MODIFIER LE FICHIER .CSS, MAIS PLUTÔT LE
FICHIER .SCSS */ FICHIER .SCSS */
@import 'variables'; @import '_variables';
@import 'messages'; @import '_messages';
@import 'header'; @import '_header';
@import 'forms'; @import '_forms';
@import 'tree'; @import '_tree';
@import 'filters'; @import '_filters';
/* MISE EN FORME GÉNÉRALE */ /* MISE EN FORME GÉNÉRALE */
html { html {
height : 100% ; height : 100% ;
background-color: $third_white_color; background-color: $html-background;
} }
body { body {
@ -19,15 +19,55 @@ body {
} }
#principal { #principal {
background-color: $third_white_color; background-color: $html-background;
} }
/*MAIN*/ /*MAIN*/
main { main {
background-color:white; background-color:$content-background;
border-width: 2px;
border-color: $content-border;
border-style: none;
border-collapse: collapse;
display: table-cell;
margin-top:0px; margin-top:0px;
padding: 15px; padding: 0px;
.fuid, h1, h2, h3 {
margin-left: -15px;
margin-right: -15px;
margin-top: 0px;
margin-bottom: 0px;
}
h1, h2, h3 {
margin-top: -2px;
margin-bottom: -2px;
margin-left: -17px;
margin-right: -17px;
color: white;
padding-left: 15px;
padding-right: 15px;
}
h1 {
background-color: $h1_background;
font-family: $font_bold;
font-weight: 600;
padding-bottom: 10px;
padding-top: 15px;
}
h2, h3 {
background-color: $h2_background;
border-bottom : 2px solid $main_c5;
padding-bottom : 5px ;
padding-top: 10px;
font-family: $font_bold;
font-weight: 600;
font-size: x-large;
}
h3 {
background-color: $h3_background;
color: main_c6
}
a { a {
color: $main_bold_color; color: $main_bold_color;
@ -37,26 +77,17 @@ main {
color : $main_bold_color; color : $main_bold_color;
} }
} }
h1 {
border-bottom : 7px solid $second_bold_color; .text {
padding-bottom : 5px ; padding: 15px;
font-family: $font_bold;
font-weight: 600;
}
h2 {
border-bottom : 2px solid $main_bold_color;
color: $main_bold_color;
padding-bottom : 5px ;
font-family: $font_bold;
font-weight: 600;
} }
} }
/*ASIDE*/ /*ASIDE*/
aside { aside {
background-color:$second_soft_color; background-color:$aside-background;
color: white; color: white;
margin-top:0px; margin-top: 0px;
padding: 0px!important; padding: 0px!important;
a { a {
@ -68,21 +99,23 @@ aside {
color : $main_soft_color; color : $main_soft_color;
} }
} }
code { code {
color: white; color: white;
background-color: $second_bold_color; background-color: $second_bold_color;
} }
.heading { .heading {
padding: 8px 15px; padding: 8px 15px;
font-size: 32px; font-size: 32px;
line-height: 1.3; line-height: 1.3;
text-align:center; text-align:center;
&.inverted { &.inverted {
background-color:$second_white_color; background-color:$second_white_color;
color:black; color:black;
} }
&.small { &.small {
font-size: 25px; font-size: 25px;
@ -102,6 +135,7 @@ aside {
border-bottom-style: solid; border-bottom-style: solid;
} }
} }
.text { .text {
padding: 15px; padding: 15px;
@ -109,13 +143,14 @@ aside {
background-color:$second_white_color; background-color:$second_white_color;
color:black; color:black;
} }
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
main { main {
margin-top:20px; margin-top:20px;
border-style: dashed;
} }
aside { aside {
margin-top:20px; margin-top:20px;
@ -233,7 +268,7 @@ a.module {
border-left: 6px solid $main_soft_color; border-left: 6px solid $main_soft_color;
border-right: none; border-right: none;
} }
.activity-title { .activity-title {
font-size: large; font-size: large;
} }
@ -254,7 +289,7 @@ a.module {
.sending-request { .sending-request {
position: relative; position: relative;
&:after { &:after {
content: "Chargement..."; content: "Chargement...";
position: absolute; position: absolute;

View file

@ -1,29 +0,0 @@
/* COLORS */
$main_bold_color: #FF6969;
$main_soft_color: #FF9191;
$main_white_color: #FFEBEB;
$second_bold_color: #FFB363;
$second_soft_color: #FFC282;
$second_white_color: #FFF5EB;
$third_bold_color: #48B0C7;
$third_soft_color: #8FD4E3;
$third_white_color: #DCEAED;
$btn-font-color: white;
$btn-bg-base: $main_bold_color;
$btn-bg-special: $main_soft_color;
$btn-border: $main_bold_color;
$underline-brand: $second_soft_color;
$yes_color: #55C487;
$no_color: #E36268;
$dunno_color: #5599C4;
/* FONTS */
$font_brand:'Lily Script One', cursive;
$font_nav:'Work Sans', cursive;
$font_bold:'Capriola', sans-serif;
$font_normal:'Saira Semi Condensed', sans-serif;

View file

@ -6,6 +6,7 @@
{% block content %} {% block content %}
<h1>Bienvenue sur Poulpe !</h1> <h1>Bienvenue sur Poulpe !</h1>
<h2>Modules</h2> <h2>Modules</h2>
<h3>Delete me Test</h3>
<div class="module-list"> <div class="module-list">
<a href="{% url 'equipment:home' %}" class="module"> <a href="{% url 'equipment:home' %}" class="module">
<span class="glyphicon glyphicon-list-alt"></span> <span class="glyphicon glyphicon-list-alt"></span>