cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'Aufinal/webfonts' into 'master'

Browse source 
Sert les polices en local

See merge request klub-dev-ens/gestioCOF!354
This commit is contained in:
Robin Champenois 2019-02-18 22:40:10 +01:00
commit 0eccfcf886
26 changed files with 102 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gestioncof/static/css/cof.css
View file

@ -4,6 +4,7 @@ html,body {
font-family: 'Hind', sans-serif; font-family: 'Hind', sans-serif;
*/ */
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
font-weight: 300;
} }
#principal { #principal {
@ -703,15 +704,6 @@ header a:active {
color : white ; color : white ;
} }
/*
#header h1 {
font-family: 'Droid Serif', serif;
font-weight: bold;
font-size: 18px;
margin-bottom: 5px;
float: left;
}*/
.user-is-cof { .user-is-cof {
color : #ADE297; color : #ADE297;

BIN
gestioncof/static/css/droidserif.woff
View file

Binary file not shown.

4
gestioncof/templates/base.html
View file

@ -11,7 +11,8 @@
{# CSS #} {# CSS #}
<link type="text/css" rel="stylesheet" href="{% static "css/bootstrap.min.css" %}" /> <link type="text/css" rel="stylesheet" href="{% static "css/bootstrap.min.css" %}" />
<link type="text/css" rel="stylesheet" href="{% static "css/cof.css" %}" /> <link type="text/css" rel="stylesheet" href="{% static "css/cof.css" %}" />
<link href="https://fonts.googleapis.com/css?family=Dosis|Dosis:700|Raleway|Roboto:300,300i,700" rel="stylesheet"> <link type="text/css" rel="stylesheet" href="{% static 'fonts/Roboto/roboto.css' %}" />
<link type="text/css" rel="stylesheet" href="{% static 'fonts/Dosis/dosis.css' %}" />
<link rel="stylesheet" href="{% static "font-awesome/css/font-awesome.min.css" %}"> <link rel="stylesheet" href="{% static "font-awesome/css/font-awesome.min.css" %}">
{# JS #} {# JS #}
@ -22,5 +23,4 @@
<body> <body>
{% block content %}{% endblock %} {% block content %}{% endblock %}
</body> </body>
<link href="https://fonts.googleapis.com/css?family=Dosis|Dosis:700|Raleway|Roboto:300,300i,700" rel="stylesheet">
</html> </html>

2
kfet/templates/kfet/base.html
View file

@ -13,7 +13,7 @@
{# CSS #} {# CSS #}
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href='https://fonts.googleapis.com/css?family=Roboto:400,700|Roboto+Mono:400,700|Roboto+Slab:400,700' rel='stylesheet' type='text/css'> <link type="text/css" rel="stylesheet" href="{% static 'fonts/Roboto/roboto.css' %}" />
<link rel="stylesheet" style="text/css" href="{% static 'kfet/css/jquery-ui.min.css' %}"> <link rel="stylesheet" style="text/css" href="{% static 'kfet/css/jquery-ui.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'kfet/css/jquery-confirm.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'kfet/css/jquery-confirm.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'kfet/css/index.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'kfet/css/index.css' %}">

19
shared/static/fonts/Dosis/dosis.css Normal file
View file

@ -0,0 +1,19 @@
/* dosis-regular - latin */
@font-face {
font-family: 'Dosis';
font-style: normal;
font-weight: 400;
src: local('Dosis Regular'), local('Dosis-Regular'),
url('./fonts/dosis-v7-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/dosis-v7-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* dosis-700 - latin */
@font-face {
font-family: 'Dosis';
font-style: normal;
font-weight: 700;
src: local('Dosis Bold'), local('Dosis-Bold'),
url('./fonts/dosis-v7-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/dosis-v7-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

BIN
shared/static/fonts/Dosis/fonts/dosis-v7-latin-700.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Dosis/fonts/dosis-v7-latin-700.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Dosis/fonts/dosis-v7-latin-regular.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Dosis/fonts/dosis-v7-latin-regular.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-mono-v5-latin-700.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-mono-v5-latin-700.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-mono-v5-latin-regular.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-mono-v5-latin-regular.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-slab-v7-latin-700.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-slab-v7-latin-700.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-slab-v7-latin-regular.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-slab-v7-latin-regular.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-v18-latin-300.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-v18-latin-300.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-v18-latin-300italic.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-v18-latin-300italic.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-v18-latin-700.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-v18-latin-700.woff2 Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-v18-latin-regular.woff Normal file
View file

Binary file not shown.

BIN
shared/static/fonts/Roboto/fonts/roboto-v18-latin-regular.woff2 Normal file
View file

Binary file not shown.

79
shared/static/fonts/Roboto/roboto.css Normal file
View file

@ -0,0 +1,79 @@
/* roboto-300 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: local('Roboto Light'), local('Roboto-Light'),
url('./fonts/roboto-v18-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/roboto-v18-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-regular - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto'), local('Roboto-Regular'),
url('./fonts/roboto-v18-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/roboto-v18-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-300italic - latin */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 300;
src: local('Roboto Light Italic'), local('Roboto-LightItalic'),
url('./fonts/roboto-v18-latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/roboto-v18-latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-700 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: local('Roboto Bold'), local('Roboto-Bold'),
url('./fonts/roboto-v18-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/roboto-v18-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-mono-regular - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 400;
src: local('Roboto Mono'), local('RobotoMono-Regular'),
url('./fonts/roboto-mono-v5-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/roboto-mono-v5-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-mono-700 - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 700;
src: local('Roboto Mono Bold'), local('RobotoMono-Bold'),
url('./fonts/roboto-mono-v5-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/roboto-mono-v5-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-slab-regular - latin */
@font-face {
font-family: 'Roboto Slab';
font-style: normal;
font-weight: 400;
src: local('Roboto Slab Regular'), local('RobotoSlab-Regular'),
url('./fonts/roboto-slab-v7-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/roboto-slab-v7-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-slab-700 - latin */
@font-face {
font-family: 'Roboto Slab';
font-style: normal;
font-weight: 700;
src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'),
url('./fonts/roboto-slab-v7-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('./fonts/roboto-slab-v7-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}