From 7e365d32e9a21b7dfcaa87711e3ca4ca477c8d09 Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub
Date: Fri, 22 Sep 2017 14:24:43 +0200
Subject: [PATCH 01/23] Remove sass map
---
.gitignore | 1 +
static/css/style.sass.css.map | 9 ---------
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 100644 static/css/style.sass.css.map
diff --git a/.gitignore b/.gitignore
index aee0a08..582b02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
.env
__pycache__
afpy.egg-info
+static/css/*.map
# PyCharm project files
.idea
diff --git a/static/css/style.sass.css.map b/static/css/style.sass.css.map
deleted file mode 100644
index e269058..0000000
--- a/static/css/style.sass.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "version": 3,
- "file": "../../sass/style.css",
- "sources": [
- "../../sass/style.sass"
- ],
- "names": [],
- "mappings": "AAAA,OAAO,CAAC,mEAAI;AAOZ,AAAA,IAAI,CAAC;EACH,UAAU,EAPN,OAAO;EAQX,KAAK,EAJA,OAAO;EAKZ,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,kBAAkB;EAC/B,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC,GAAI;;AAEhB,AAAA,MAAM,CAAC;EACL,UAAU,EAjBH,OAAO;EAkBd,KAAK,EAAE,CAAC;EACR,KAAK,EAAE,IAAI,GAAI;;AAEjB,AAAA,GAAG,CAAC;EACF,IAAI,EAAE,MAAM;EACZ,KAAK,EAAE,CAAC,GAcyB;EAhBnC,AAIE,GAJC,CAID,EAAE,CAAC;IACD,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,CAAC;IACT,YAAY,EAAE,CAAC,GAOc;IAhBjC,AAWI,GAXD,CAID,EAAE,CAOA,CAAC,CAAC;MACA,KAAK,EA9BJ,OAAO;MA+BR,OAAO,EAAE,KAAK;MACd,WAAW,EAAE,GAAG;MAChB,OAAO,EAAE,GAAG;MACZ,eAAe,EAAE,IAAI,GAAI;;AAE/B,AAAA,IAAI,CAAC;EACH,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,MAAM;EACjB,KAAK,EAAE,CAAC,GAAI;;AAEd,AAAA,EAAE,CAAC;EACD,KAAK,EA3CY,OAAO;EA4CxB,IAAI,EAAE,MAAM;EACZ,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,QAAQ;EAChB,SAAS,EAAE,MAAM,GAWK;EAhBxB,AAOE,EAPA,AAOA,OAAQ,CAAC;IACP,UAAU,EAlDK,OAAO;IAmDtB,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI,GAAI;EAZnB,AAeE,EAfA,CAeA,IAAI,CAAC;IACH,OAAO,EAAE,KAAK,GAAI;;AAEtB,AAAA,EAAE,CAAC;EACD,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,GAAG,GAAI;;AAEtB,AAAA,OAAO,CAAC;EACN,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI,GAgBK;EAlBtB,AAIE,OAJK,CAIL,EAAE,CAAC;IACD,UAAU,EAAE,UAAU;IACtB,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM;IAClB,OAAO,EAAE,GAAG;IACZ,KAAK,EAAE,KAAK,GAAI;EAXpB,AAaE,OAbK,CAaL,EAAE,CAAC;IACD,UAAU,EAAE,UAAU;IACtB,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,KAAK,GAAI"
-}
\ No newline at end of file
From 86ca1dee0d66e1d8e503e2e84f64c1456852ae86 Mon Sep 17 00:00:00 2001
From: annabellou
Date: Fri, 22 Sep 2017 14:24:51 +0200
Subject: [PATCH 02/23] Add style on articles (job, news)
---
sass/style.sass | 31 +++++++++++++++++++++++++++++++
static/css/style.sass.css | 25 +++++++++++++++++++++++++
static/css/style.sass.css.map | 2 +-
3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/sass/style.sass b/sass/style.sass
index 3231353..95b0559 100644
--- a/sass/style.sass
+++ b/sass/style.sass
@@ -84,3 +84,34 @@ h2
padding: 3em 0 0
text-align: center
width: 300px
+
+#planet, #emplois, #index
+ main
+ box-sizing: border-box
+ display: flex
+ flex-wrap: wrap
+
+ h2
+ flex: 1 100%
+
+ article
+ background: lighten($bkg, 5%)
+ border: 1px solid $bkg
+ box-sizing: border-box
+ flex: 1 50%
+ padding: 2em
+
+ a
+ color: $action-secondary
+ font-size: .8em
+ font-weight: 700
+ text-decoration: none
+ text-transform: uppercase
+ transition: color 250ms
+
+ &:hover
+ color: lighten($action-secondary, 10%)
+
+ h2
+ font-size: 1.2em
+ font-weight: 600
diff --git a/static/css/style.sass.css b/static/css/style.sass.css
index 7144a81..2eae407 100644
--- a/static/css/style.sass.css
+++ b/static/css/style.sass.css
@@ -73,4 +73,29 @@ h2 {
text-align: center;
width: 300px; }
+#planet main, #emplois main, #index main {
+ box-sizing: border-box;
+ display: flex;
+ flex-wrap: wrap; }
+ #planet main h2, #emplois main h2, #index main h2 {
+ flex: 1 100%; }
+ #planet main article, #emplois main article, #index main article {
+ background: #31313b;
+ border: 1px solid #25252D;
+ box-sizing: border-box;
+ flex: 1 50%;
+ padding: 2em; }
+ #planet main article a, #emplois main article a, #index main article a {
+ color: #ffcd05;
+ font-size: .8em;
+ font-weight: 700;
+ text-decoration: none;
+ text-transform: uppercase;
+ transition: color 250ms; }
+ #planet main article a:hover, #emplois main article a:hover, #index main article a:hover {
+ color: #ffd738; }
+ #planet main article h2, #emplois main article h2, #index main article h2 {
+ font-size: 1.2em;
+ font-weight: 600; }
+
/*# sourceMappingURL=../static/css/style.sass.css.map */
\ No newline at end of file
diff --git a/static/css/style.sass.css.map b/static/css/style.sass.css.map
index e269058..43ce68d 100644
--- a/static/css/style.sass.css.map
+++ b/static/css/style.sass.css.map
@@ -5,5 +5,5 @@
"../../sass/style.sass"
],
"names": [],
- "mappings": "AAAA,OAAO,CAAC,mEAAI;AAOZ,AAAA,IAAI,CAAC;EACH,UAAU,EAPN,OAAO;EAQX,KAAK,EAJA,OAAO;EAKZ,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,kBAAkB;EAC/B,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC,GAAI;;AAEhB,AAAA,MAAM,CAAC;EACL,UAAU,EAjBH,OAAO;EAkBd,KAAK,EAAE,CAAC;EACR,KAAK,EAAE,IAAI,GAAI;;AAEjB,AAAA,GAAG,CAAC;EACF,IAAI,EAAE,MAAM;EACZ,KAAK,EAAE,CAAC,GAcyB;EAhBnC,AAIE,GAJC,CAID,EAAE,CAAC;IACD,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,CAAC;IACT,YAAY,EAAE,CAAC,GAOc;IAhBjC,AAWI,GAXD,CAID,EAAE,CAOA,CAAC,CAAC;MACA,KAAK,EA9BJ,OAAO;MA+BR,OAAO,EAAE,KAAK;MACd,WAAW,EAAE,GAAG;MAChB,OAAO,EAAE,GAAG;MACZ,eAAe,EAAE,IAAI,GAAI;;AAE/B,AAAA,IAAI,CAAC;EACH,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,MAAM;EACjB,KAAK,EAAE,CAAC,GAAI;;AAEd,AAAA,EAAE,CAAC;EACD,KAAK,EA3CY,OAAO;EA4CxB,IAAI,EAAE,MAAM;EACZ,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,QAAQ;EAChB,SAAS,EAAE,MAAM,GAWK;EAhBxB,AAOE,EAPA,AAOA,OAAQ,CAAC;IACP,UAAU,EAlDK,OAAO;IAmDtB,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI,GAAI;EAZnB,AAeE,EAfA,CAeA,IAAI,CAAC;IACH,OAAO,EAAE,KAAK,GAAI;;AAEtB,AAAA,EAAE,CAAC;EACD,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,GAAG,GAAI;;AAEtB,AAAA,OAAO,CAAC;EACN,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI,GAgBK;EAlBtB,AAIE,OAJK,CAIL,EAAE,CAAC;IACD,UAAU,EAAE,UAAU;IACtB,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM;IAClB,OAAO,EAAE,GAAG;IACZ,KAAK,EAAE,KAAK,GAAI;EAXpB,AAaE,OAbK,CAaL,EAAE,CAAC;IACD,UAAU,EAAE,UAAU;IACtB,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,KAAK,GAAI"
+ "mappings": "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"
}
\ No newline at end of file
From 29e3102241673c77af3fd4827954f43f8f8856c8 Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub
Date: Fri, 22 Sep 2017 14:26:03 +0200
Subject: [PATCH 03/23] Fix the button to register
---
templates/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/index.html b/templates/index.html
index c2818a6..96f1875 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,7 @@
Adhérer
{{ lipsum(1) }}
-
From 991fbf24847e7d2dfb3b70025a9d025fc9105d9b Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub
Date: Fri, 22 Sep 2017 14:27:28 +0200
Subject: [PATCH 04/23] Ignore the map again
---
static/css/style.sass.css.map | 9 ---------
1 file changed, 9 deletions(-)
delete mode 100644 static/css/style.sass.css.map
diff --git a/static/css/style.sass.css.map b/static/css/style.sass.css.map
deleted file mode 100644
index 43ce68d..0000000
--- a/static/css/style.sass.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "version": 3,
- "file": "../../sass/style.css",
- "sources": [
- "../../sass/style.sass"
- ],
- "names": [],
- "mappings": "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"
-}
\ No newline at end of file
From 0cce92e95ac226a9f2d6808b01894ec5f3741f73 Mon Sep 17 00:00:00 2001
From: Lucie Anglade
Date: Fri, 22 Sep 2017 14:37:44 +0200
Subject: [PATCH 05/23] Remove duplicate iframe
---
templates/clavardage.html | 2 --
1 file changed, 2 deletions(-)
diff --git a/templates/clavardage.html b/templates/clavardage.html
index b8028cd..a2c1dfb 100644
--- a/templates/clavardage.html
+++ b/templates/clavardage.html
@@ -41,6 +41,4 @@
Vous pouvez aussi accéder au T'chat via un client irc : irc://irc.freenode.net/python-fr.
-
-
{% endblock main %}
From 07da38ed81eee7e020c5ffee8c4cc02e423c8d22 Mon Sep 17 00:00:00 2001
From: annabellou
Date: Fri, 22 Sep 2017 14:48:11 +0200
Subject: [PATCH 06/23] Add style on button & links
---
sass/style.sass | 37 ++++++++++++++++++++++++++-----------
static/css/style.sass.css | 35 +++++++++++++++++++++++++----------
2 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/sass/style.sass b/sass/style.sass
index 95b0559..bba3b96 100644
--- a/sass/style.sass
+++ b/sass/style.sass
@@ -5,6 +5,31 @@ $action: #2e5cfd
$action-secondary: #ffcd05
$text: #eaeaea
+a
+ color: $action-secondary
+ font-size: .8em
+ font-weight: 700
+ text-decoration: none
+ text-transform: uppercase
+ transition: color 250ms
+
+ &:hover
+ color: lighten($action-secondary, 10%)
+
+input[type="submit"]
+ background: $action
+ border: 0
+ color: #fff
+ cursor: pointer
+ font-family: 'Hind', sans-serif
+ outline: transparent
+ padding: 1em 2em
+ text-transform: uppercase
+ transition: background 250ms
+
+ &:hover
+ background: lighten($action, 5%)
+
body
background: $bkg
color: $text
@@ -43,6 +68,7 @@ main
margin: 0 auto
max-width: 1200px
order: 3
+ width: 100%
h1
color: $action-secondary
@@ -101,17 +127,6 @@ h2
flex: 1 50%
padding: 2em
- a
- color: $action-secondary
- font-size: .8em
- font-weight: 700
- text-decoration: none
- text-transform: uppercase
- transition: color 250ms
-
- &:hover
- color: lighten($action-secondary, 10%)
-
h2
font-size: 1.2em
font-weight: 600
diff --git a/static/css/style.sass.css b/static/css/style.sass.css
index 2eae407..382b3c2 100644
--- a/static/css/style.sass.css
+++ b/static/css/style.sass.css
@@ -1,4 +1,27 @@
@import url("https://fonts.googleapis.com/css?family=Hind:300,400,600,700");
+a {
+ color: #ffcd05;
+ font-size: .8em;
+ font-weight: 700;
+ text-decoration: none;
+ text-transform: uppercase;
+ transition: color 250ms; }
+ a:hover {
+ color: #ffd738; }
+
+input[type="submit"] {
+ background: #2e5cfd;
+ border: 0;
+ color: #fff;
+ cursor: pointer;
+ font-family: 'Hind', sans-serif;
+ outline: transparent;
+ padding: 1em 2em;
+ text-transform: uppercase;
+ transition: background 250ms; }
+ input[type="submit"]:hover {
+ background: #4770fd; }
+
body {
background: #25252D;
color: #eaeaea;
@@ -34,7 +57,8 @@ nav {
main {
margin: 0 auto;
max-width: 1200px;
- order: 3; }
+ order: 3;
+ width: 100%; }
h1 {
color: #ffcd05;
@@ -85,15 +109,6 @@ h2 {
box-sizing: border-box;
flex: 1 50%;
padding: 2em; }
- #planet main article a, #emplois main article a, #index main article a {
- color: #ffcd05;
- font-size: .8em;
- font-weight: 700;
- text-decoration: none;
- text-transform: uppercase;
- transition: color 250ms; }
- #planet main article a:hover, #emplois main article a:hover, #index main article a:hover {
- color: #ffd738; }
#planet main article h2, #emplois main article h2, #index main article h2 {
font-size: 1.2em;
font-weight: 600; }
From ef8834a84a701a72ad19e92a33fc948336aa061f Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub
Date: Fri, 22 Sep 2017 14:58:01 +0200
Subject: [PATCH 07/23] Add footer
---
sass/style.sass | 73 ++++++++++++++++++++++-----------------
static/css/style.sass.css | 35 ++++++++++++-------
templates/_layout.jinja2 | 10 ++++++
templates/a-propos.rst | 8 ++---
templates/contact.rst | 25 ++++++++++++++
templates/index.html | 16 +++++----
templates/legal.rst | 6 ++++
7 files changed, 119 insertions(+), 54 deletions(-)
create mode 100644 templates/contact.rst
create mode 100644 templates/legal.rst
diff --git a/sass/style.sass b/sass/style.sass
index 95b0559..afb73bc 100644
--- a/sass/style.sass
+++ b/sass/style.sass
@@ -9,20 +9,19 @@ body
background: $bkg
color: $text
display: flex
- flex-wrap: wrap
+ flex-direction: column
font-family: 'Hind', sans-serif
font-size: .9em
font-weight: 300
margin: 0
+ min-height: 100vh
padding: 0
header
background: $header
order: 1
- width: 100%
nav
- flex: 1 100%
order: 0
ul
@@ -40,13 +39,29 @@ nav
text-decoration: none
main
+ flex-grow: 1
margin: 0 auto
max-width: 1200px
order: 3
+footer
+ background: $header
+ margin-top: 2em
+ order: 4
+
+ ul
+ display: flex
+ justify-content: center
+ list-style: none
+ padding: 0
+
+ a
+ color: inherit
+ text-decoration: inherit
+ padding: 1em
+
h1
color: $action-secondary
- flex: 1 100%
font-weight: 300
margin: 2em auto
max-width: 1200px
@@ -85,33 +100,29 @@ h2
text-align: center
width: 300px
-#planet, #emplois, #index
- main
+#planet main, #emplois main, #index-news
+ box-sizing: border-box
+ display: flex
+ flex-wrap: wrap
+
+ article
+ background: lighten($bkg, 5%)
+ border: 1px solid $bkg
box-sizing: border-box
- display: flex
- flex-wrap: wrap
+ flex: 1 50%
+ padding: 2em
+
+ a
+ color: $action-secondary
+ font-size: .8em
+ font-weight: 700
+ text-decoration: none
+ text-transform: uppercase
+ transition: color 250ms
+
+ &:hover
+ color: lighten($action-secondary, 10%)
h2
- flex: 1 100%
-
- article
- background: lighten($bkg, 5%)
- border: 1px solid $bkg
- box-sizing: border-box
- flex: 1 50%
- padding: 2em
-
- a
- color: $action-secondary
- font-size: .8em
- font-weight: 700
- text-decoration: none
- text-transform: uppercase
- transition: color 250ms
-
- &:hover
- color: lighten($action-secondary, 10%)
-
- h2
- font-size: 1.2em
- font-weight: 600
+ font-size: 1.2em
+ font-weight: 600
diff --git a/static/css/style.sass.css b/static/css/style.sass.css
index 2eae407..7d937b4 100644
--- a/static/css/style.sass.css
+++ b/static/css/style.sass.css
@@ -3,20 +3,19 @@ body {
background: #25252D;
color: #eaeaea;
display: flex;
- flex-wrap: wrap;
+ flex-direction: column;
font-family: 'Hind', sans-serif;
font-size: .9em;
font-weight: 300;
margin: 0;
+ min-height: 100vh;
padding: 0; }
header {
background: #1d1e23;
- order: 1;
- width: 100%; }
+ order: 1; }
nav {
- flex: 1 100%;
order: 0; }
nav ul {
display: flex;
@@ -32,13 +31,27 @@ nav {
text-decoration: none; }
main {
+ flex-grow: 1;
margin: 0 auto;
max-width: 1200px;
order: 3; }
+footer {
+ background: #1d1e23;
+ margin-top: 2em;
+ order: 4; }
+ footer ul {
+ display: flex;
+ justify-content: center;
+ list-style: none;
+ padding: 0; }
+ footer ul a {
+ color: inherit;
+ text-decoration: inherit;
+ padding: 1em; }
+
h1 {
color: #ffcd05;
- flex: 1 100%;
font-weight: 300;
margin: 2em auto;
max-width: 1200px; }
@@ -73,28 +86,26 @@ h2 {
text-align: center;
width: 300px; }
-#planet main, #emplois main, #index main {
+#planet main, #emplois main, #index-news {
box-sizing: border-box;
display: flex;
flex-wrap: wrap; }
- #planet main h2, #emplois main h2, #index main h2 {
- flex: 1 100%; }
- #planet main article, #emplois main article, #index main article {
+ #planet main article, #emplois main article, #index-news article {
background: #31313b;
border: 1px solid #25252D;
box-sizing: border-box;
flex: 1 50%;
padding: 2em; }
- #planet main article a, #emplois main article a, #index main article a {
+ #planet main article a, #emplois main article a, #index-news article a {
color: #ffcd05;
font-size: .8em;
font-weight: 700;
text-decoration: none;
text-transform: uppercase;
transition: color 250ms; }
- #planet main article a:hover, #emplois main article a:hover, #index main article a:hover {
+ #planet main article a:hover, #emplois main article a:hover, #index-news article a:hover {
color: #ffd738; }
- #planet main article h2, #emplois main article h2, #index main article h2 {
+ #planet main article h2, #emplois main article h2, #index-news article h2 {
font-size: 1.2em;
font-weight: 600; }
diff --git a/templates/_layout.jinja2 b/templates/_layout.jinja2
index 9da3898..990436a 100644
--- a/templates/_layout.jinja2
+++ b/templates/_layout.jinja2
@@ -24,5 +24,15 @@
{% block main %}{% endblock main %}
+