Commit a0f47cac authored by Skia's avatar Skia

Merge branch 'tempcss' into 'master'

[style|design].[sass|css]

See merge request !69
parents b401efc6 e59d769d
Pipeline #956 passed with stage
in 4 minutes and 15 seconds
......@@ -33,6 +33,14 @@ sudo apt install libmysqlclient-dev libssl-dev libjpeg-dev zlib1g-dev python3-de
The development is done with sqlite, but it is advised to set a more robust DBMS for production (Postgresql for example)
### Collecting statics for production:
We use scss in the project. In development environment (DEBUG=True), scss is compiled every time the file is needed. For production, it assumes you have already compiled every files and to do so, you need to use the following commands :
```
./manage.py collectstatic # To collect statics
./manage.py compilestatic # To compile scss in those statics
```
### Misc about development
......
#!/usr/bin/env python3
# -*- coding:utf-8 -*
#
# Copyright 2017
# - Sli <antoine@bartuccio.fr>
#
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
# http://ae.utbm.fr.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License a published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
# Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
import os
import sass
from django.core.management.base import BaseCommand
from django.conf import settings
class Command(BaseCommand):
"""
Compiles scss in static folder for production
"""
help = "Compile scss files from static folder"
def compile(self, filename):
args = {
"filename": filename,
"include_paths": settings.STATIC_ROOT,
}
if settings.SASS_PRECISION:
args['precision'] = settings.SASS_PRECISION
return sass.compile(**args)
def is_compilable(self, file, ext_list):
path, ext = os.path.splitext(file)
return ext in ext_list
def exec_on_folder(self, folder, func):
to_exec = []
for file in os.listdir(folder):
file = os.path.join(folder, file)
if os.path.isdir(file):
self.exec_on_folder(file, func)
elif self.is_compilable(file, ['.scss']):
to_exec.append(file)
for file in to_exec:
func(file)
def compilescss(self, file):
print("compiling %s" % file)
with(open(file.replace('.scss', '.css'), "w")) as newfile:
newfile.write(self.compile(file))
def removescss(self, file):
print("removing %s" % file)
os.remove(file)
def handle(self, *args, **options):
if os.path.isdir(settings.STATIC_ROOT):
print("---- Compiling scss files ---")
self.exec_on_folder(settings.STATIC_ROOT, self.compilescss)
print("---- Removing scss files ----")
self.exec_on_folder(settings.STATIC_ROOT, self.removescss)
else:
print("No static folder avalaible, please use collectstatic before compiling scss")
#!/usr/bin/env python3
# -*- coding:utf-8 -*
#
# Copyright 2016,2017
# - Sli <antoine@bartuccio.fr>
#
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
# http://ae.utbm.fr.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License a published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
# Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
import os
from collections import OrderedDict
from django.conf import settings
from django.contrib.staticfiles.finders import FileSystemFinder
from django.core.files.storage import FileSystemStorage
class ScssFinder(FileSystemFinder):
"""
Find static *.css files compiled on the fly
"""
locations = []
def __init__(self, apps=None, *args, **kwargs):
location = settings.STATIC_ROOT
if not os.path.isdir(location):
return
self.locations = [
('', location),
]
self.storages = OrderedDict()
filesystem_storage = FileSystemStorage(location=location)
filesystem_storage.prefix = self.locations[0][0]
self.storages[location] = filesystem_storage
def find(self, path, all=False):
if path.endswith('.css'):
return super(ScssFinder, self).find(path, all)
return []
#!/usr/bin/env python3
# -*- coding:utf-8 -*
#
# Copyright 2017
# - Sli <antoine@bartuccio.fr>
#
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
# http://ae.utbm.fr.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License a published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
# Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
import os
import sass
from django.utils.encoding import force_bytes, iri_to_uri
from django.core.files.base import ContentFile
from django.utils.six.moves.urllib.parse import urljoin
from django.templatetags.static import static
from django.conf import settings
from core.scss.storage import ScssFileStorage, find_file
class ScssProcessor(object):
"""
If DEBUG mode enabled : compile the scss file
Else : give the path of the corresponding css supposed to already be compiled
Don't forget to use compilestatics to compile scss for production
"""
prefix = iri_to_uri(getattr(settings, 'STATIC_URL', '/static/'))
storage = ScssFileStorage()
scss_extensions = [".scss"]
def __init__(self, path=None):
self.path = path
def _convert_scss(self):
basename, ext = os.path.splitext(self.path)
css_filename = self.path.replace(".scss", ".css")
url = urljoin(self.prefix, css_filename)
if not settings.DEBUG:
return url
if ext not in self.scss_extensions:
return static(self.path)
# Compilation on the fly
compile_args = {
"filename": find_file(self.path),
"include_paths": settings.SASS_INCLUDE_FOLDERS,
}
if settings.SASS_PRECISION:
compile_args['precision'] = settings.SASS_PRECISION
content = sass.compile(**compile_args)
content = force_bytes(content)
if self.storage.exists(css_filename):
self.storage.delete(css_filename)
self.storage.save(css_filename, ContentFile(content))
return url
def get_converted_scss(self):
if self.path:
return self._convert_scss()
else:
return ""
#!/usr/bin/env python3
# -*- coding:utf-8 -*
#
# Copyright 2017
# - Sli <antoine@bartuccio.fr>
#
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
# http://ae.utbm.fr.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License a published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
# Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
from django.conf import settings
from django.contrib.staticfiles.finders import get_finders
from django.core.files.storage import FileSystemStorage
class ScssFileStorage(FileSystemStorage):
def __init__(self, location=None, base_url=None, *args, **kwargs):
if location is None:
location = settings.STATIC_ROOT
if base_url is None:
base_url = settings.STATIC_URL
super(ScssFileStorage, self).__init__(location, base_url, *args, **kwargs)
def find_file(path):
for finder in get_finders():
result = finder.find(path)
if result:
return result
$first-color: hsl(220, 100%, 50%);
$second-color: hsl(40, 100%, 50%);
$primary-color: hsl(219.9, 53.7%, 50%);
$secondary-color: hsl(40.1, 78.0%, 50%);
$primary-color-text: hsl(0, 0%, 100%);
$secondary-color-text: hsla(0, 0%, 0%, 0.87);
$primary-light-color: hsl(219.8, 46.4%, 64.9%);
$primary-dark-color: hsl(219.8, 46.4%, 35.1%);
$secondary-light-color: hsl(40, 68%, 65%);
$secondary-dark-color: hsl(40, 68%, 35%);
$primary-neutral-color: hsl(219.6, 20.8%, 50%);
$primary-neutral-light-color: hsl(219.6, 20.8%, 83%);
$primary-neutral-dark-color: hsl(219.6, 20.8%, 17%);
$secondary-neutral-color: hsl(40, 57.6%, 50%);
$secondary-neutral-light-color: hsl(40, 57.6%, 83%);
$secondary-neutral-dark-color: hsl(40, 57.6%, 17%);
$white-color: hsl(219.6, 20.8%, 98%);
$black-color: hsl(40.0, 0%, 17%);
/*--------------------------------GENERAL------------------------------*/
body{
background-color:#EEE;
position: relative;
width: 100%;
font-family: sans-serif;
body {
background-color: $primary-neutral-light-color;
position: relative;
width: 100%;
font-family: sans-serif;
}
a {
text-decoration: none;
color: #265C83;
text-decoration: none;
color: $primary-dark-color;
&:hover {
color: $primary-light-color;
}
&:active {
color: $primary-color;
}
}
a:hover { color: #7FDBFF; }
a:active { color: #007BE6; }
.ib {
display: inline-block;
padding: 2px;
margin: 2px;
display: inline-block;
padding: 2px;
margin: 2px;
}
.w_big {
width: 75%;
width: 75%;
}
.w_medium {
width: 45%;
width: 45%;
}
.w_small {
width: 20%;
width: 20%;
}
/*--------------------------------HEADER-------------------------------*/
#logo {
margin-left: 5%;
display: inline-block;
margin-left: 5%;
display: inline-block;
}
header {
display: block;
position: absolute;
top : 0px;
right : 2%;
background-color:#DDD;
margin: 0 10px;
padding: 0 10px;
border-radius: 0 0 10px 10px;
}
header ul {
display: block;
position: absolute;
top: 0px;
right: 2%;
background-color: $secondary-light-color;
margin: 0 10px;
padding: 0 10px;
border-radius: 0 0 10px 10px;
ul {
display: inline-block;
list-style-type: none;
margin: 0px;
padding-right: 3px;
vertical-align: middle;
}
header a {
}
a {
display: inline-block;
color: inherit;
text-decoration: none;
padding: 1em;
}
header a:hover {
color: #265C83;
}
header form {
&:hover {
color: $primary-dark-color;
}
}
form {
display: inline-block;
padding: 1em;
width: 150px;
}
}
#popupheader {
width: 88%;
margin: 0px auto;
padding: 0.3em 1%;
}
#language_chooser {
position: absolute;
text-align: center;
left: 5px;
top: 5px;
width: 88%;
margin: 0px auto;
padding: 0.3em 1%;
}
#language_chooser input {
#language_chooser {
position: absolute;
text-align: center;
left: 5px;
top: 5px;
input {
margin: 2px;
width: 3em;
height: 2em;
}
}
#notif {
display: none;
position: absolute;
background: lightgrey;
text-align: center;
overflow: scroll;
max-height: 400px;
}
#notif li:hover {
display: none;
position: absolute;
background: lightgrey;
text-align: center;
overflow: scroll;
max-height: 400px;
li:hover {
background: #bcc;
}
}
#alert_box p, #info_box p {
margin: 0px;
padding: 0px;
margin: 0px;
padding: 0px;
}
#alert_box, #info_box {
font-size: smaller;
display: inline-block;
border: solid 1px grey;
vertical-align: top;
padding: 2px;
margin: 4px;
margin-top: 60px;
min-width: 10%;
max-width: 30%;
min-height: 20px;
#alert_box {
font-size: smaller;
display: inline-block;
border: solid 1px grey;
vertical-align: top;
padding: 2px;
margin: 4px;
margin-top: 60px;
min-width: 10%;
max-width: 30%;
min-height: 20px;
}
#info_box {
background: cornsilk
font-size: smaller;
display: inline-block;
border: solid 1px $primary-neutral-light-color;
vertical-align: top;
padding: 2px;
margin: 4px;
margin-top: 60px;
min-width: 10%;
max-width: 30%;
min-height: 20px;
background: $white-color;
}
#alert_box {
background: gold;
background: gold;
}
/*---------------------------------NAV---------------------------------*/
nav {
display: block;
width: 90%;
margin: 0px auto;
background: grey;
color: white;
}
nav a {
color: white;
nav {
display: block;
width: 90%;
margin: 0px auto;
background: $primary-color;
color: $white-color;
a {
color: $white-color;
font-style: normal;
font-weight: bolder;
text-decoration: none;
display: inline-block;
padding: 20px;
}
nav a:hover {
background: #535353;
color: white;
&:hover {
background: $primary-dark-color;
color: $white-color;
}
}
}
/*--------------------------------CONTENT------------------------------*/
#quick_notif {
width: 90%;
margin: 0px auto;
list-style-type: none;
background: lightblue;
}
#quick_notif li {
width: 90%;
margin: 0px auto;
list-style-type: none;
background: $primary-neutral-light-color;
li {
padding: 10px;
}
}
#content {
width: 88%;
margin: 0px auto;
padding: 1em 1%;
background: white;
overflow: auto;
width: 88%;
margin: 0px auto;
padding: 1em 1%;
background: $white-color;
overflow: auto;
}
h1, h2, h3, h4, h5, h6 {
font-weight: bold;
margin-top: 0.5em;
font-weight: bold;
margin-top: 0.5em;
}
h1 {
font-size: 160%;
margin-left: 50px;
font-size: 160%;
margin-left: 50px;
}
h2 {
font-size: 150%;
margin-left: 40px;
font-size: 150%;
margin-left: 40px;
}
h3 {
font-size: 140%;
margin-left: 30px;
font-size: 140%;
margin-left: 30px;
}
h4 {
font-size: 130%;
margin-left: 20px;
font-size: 130%;
margin-left: 20px;
}
h5 {
font-size: 120%;
margin-left: 10px;
font-size: 120%;
margin-left: 10px;
}
h6 {
font-size: 110%;
margin-left: 0px;
font-size: 110%;
margin-left: 0px;
}
p, pre {
margin-top: 1em;
margin-left: 0px;
margin-top: 1em;
margin-left: 0px;
}
ul, ol {
margin-top: 1em;
margin-bottom: 1em;
list-style-type: disc;
margin-left: 25px;
margin-top: 1em;
margin-bottom: 1em;
list-style-type: disc;
margin-left: 25px;
}
code {
font-family: monospace;
font-family: monospace;
}
blockquote {
margin: 10px;
padding: 5px;
border: solid 1px black;
margin: 10px;
padding: 5px;
border: solid 1px $black-color;
}
.edit-bar {
display: block;
margin: 4px;
}
.edit-bar a {
display: block;
margin: 4px;
a {
display: inline-block;
margin: 4px;
}
}
.important {
font-size: 1.2em;
font-weight: bold;
color: red;
font-size: 1.2em;
font-weight: bold;
color: red;
}
table {
width: 100%;
font-size: 0.90em;
width: 100%;
font-size: 0.90em;
}
td {
padding: 4px;
margin: 5px;
border: solid 1px darkgrey;
border-collapse: collapse;
vertical-align: top;
overflow: hidden;
text-overflow: ellipsis;
}
td>ul {
padding: 4px;
margin: 5px;
border: solid 1px $primary-neutral-color;
border-collapse: collapse;
vertical-align: top;
overflow: hidden;
text-overflow: ellipsis;
> ul {
margin-top: 0px;
}
}
thead {
font-weight: bold;
}
tbody>tr:nth-child(even) {
background: lightgrey;
font-weight: bold;
}
tbody>tr:hover {
background: darkgrey;
tbody > tr {
&:nth-child(even) {
background: $primary-neutral-light-color;
}
&:hover {
background: $secondary-neutral-light-color;
width: 100%;
}
}
em {
font-style: italic;
font-style: italic;
}
.highlight {