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

Merge branch 'Evarin/css-sitecof' into 'master'

Browse source 
Améliorations CSS + directoryentrypage sitecof encore

See merge request klub-dev-ens/gestioCOF!447
This commit is contained in:
Martin Pepin 2020-08-30 12:47:11 +02:00
parent d96b3d26b6 24eaaa277f
commit 8576023b42
6 changed files with 283 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
gestioncof/cms/migrations/0004_auto_20200829_2314.py Normal file
View file

@ -0,0 +1,134 @@
# Generated by Django 2.2.15 on 2020-08-29 21:14
import wagtail.core.blocks
import wagtail.core.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("cofcms", "0003_directory_entry_optional_links"),
]
operations = [
migrations.AlterField(
model_name="cofdirectoryentrypage",
name="links",
field=wagtail.core.fields.StreamField(
[
(
"lien",
wagtail.core.blocks.StructBlock(
[
("url", wagtail.core.blocks.URLBlock(required=True)),
("texte", wagtail.core.blocks.CharBlock()),
]
),
),
(
"contact",
wagtail.core.blocks.StructBlock(
[
(
"email",
wagtail.core.blocks.EmailBlock(required=True),
),
("texte", wagtail.core.blocks.CharBlock()),
]
),
),
(
"info",
wagtail.core.blocks.StructBlock(
[
("nom", wagtail.core.blocks.CharBlock(required=False)),
("texte", wagtail.core.blocks.CharBlock(required=True)),
]
),
),
],
blank=True,
),
),
migrations.AlterField(
model_name="cofdirectoryentrypage",
name="links_en",
field=wagtail.core.fields.StreamField(
[
(
"lien",
wagtail.core.blocks.StructBlock(
[
("url", wagtail.core.blocks.URLBlock(required=True)),
("texte", wagtail.core.blocks.CharBlock()),
]
),
),
(
"contact",
wagtail.core.blocks.StructBlock(
[
(
"email",
wagtail.core.blocks.EmailBlock(required=True),
),
("texte", wagtail.core.blocks.CharBlock()),
]
),
),
(
"info",
wagtail.core.blocks.StructBlock(
[
("nom", wagtail.core.blocks.CharBlock(required=False)),
("texte", wagtail.core.blocks.CharBlock(required=True)),
]
),
),
],
blank=True,
null=True,
),
),
migrations.AlterField(
model_name="cofdirectoryentrypage",
name="links_fr",
field=wagtail.core.fields.StreamField(
[
(
"lien",
wagtail.core.blocks.StructBlock(
[
("url", wagtail.core.blocks.URLBlock(required=True)),
("texte", wagtail.core.blocks.CharBlock()),
]
),
),
(
"contact",
wagtail.core.blocks.StructBlock(
[
(
"email",
wagtail.core.blocks.EmailBlock(required=True),
),
("texte", wagtail.core.blocks.CharBlock()),
]
),
),
(
"info",
wagtail.core.blocks.StructBlock(
[
("nom", wagtail.core.blocks.CharBlock(required=False)),
("texte", wagtail.core.blocks.CharBlock(required=True)),
]
),
),
],
blank=True,
null=True,
),
),
]

9
gestioncof/cms/models.py
View file

@ -193,6 +193,15 @@ class COFDirectoryEntryPage(Page):
] ]
), ),
), ),
(
"info",
blocks.StructBlock(
[
("nom", blocks.CharBlock(required=False)),
("texte", blocks.CharBlock(required=True)),
]
),
),
], ],
blank=True, blank=True,
) )

207
gestioncof/cms/static/cofcms/css/screen.css
View file

@ -87,94 +87,95 @@ header {
/* line 24, ../sass/screen.scss */ /* line 24, ../sass/screen.scss */
h1, h2 { h1, h2 {
font-family: "Carter One", "serif"; font-family: "Carter One", "serif";
color: #90001C;
} }
/* line 29, ../sass/screen.scss */ /* line 28, ../sass/screen.scss */
h1 { h1 {
font-size: 2.3em; font-size: 2.3em;
color: #90001C;
} }
/* line 33, ../sass/screen.scss */ /* line 33, ../sass/screen.scss */
h2 { h2 {
font-size: 1.6em; font-size: 1.6em;
color: #b01432;
} }
/* line 38, ../sass/screen.scss */ /* line 39, ../sass/screen.scss */
a { a {
color: #CC9500; color: #CC9500;
text-decoration: none; text-decoration: none;
font-weight: bold; font-weight: bold;
padding: 0 3px; padding: 0 2px;
margin: 0 -3px; margin: 0 -2px;
} }
/* line 44, ../sass/screen.scss */ /* line 45, ../sass/screen.scss */
a:hover { a:hover {
text-decoration: underline; text-decoration: underline;
} }
/* line 49, ../sass/screen.scss */ /* line 50, ../sass/screen.scss */
h2 a { h2 a {
font-weight: inherit; font-weight: inherit;
color: inherit; color: inherit;
} }
/* line 55, ../sass/screen.scss */ /* line 56, ../sass/screen.scss */
header a { header a {
color: #fefefe; color: #fefefe;
} }
/* line 57, ../sass/screen.scss */ /* line 58, ../sass/screen.scss */
header a:hover { header a:hover {
text-decoration: none; text-decoration: none;
} }
/* line 61, ../sass/screen.scss */ /* line 62, ../sass/screen.scss */
header section { header section {
display: flex; display: flex;
width: 100%; width: 100%;
justify-content: space-between; justify-content: space-between;
align-items: stretch; align-items: stretch;
} }
/* line 67, ../sass/screen.scss */ /* line 68, ../sass/screen.scss */
header section.bottom-menu { header section.bottom-menu {
justify-content: space-around; justify-content: space-around;
text-align: center; text-align: center;
background: #90001C; background: #90001C;
} }
/* line 73, ../sass/screen.scss */ /* line 74, ../sass/screen.scss */
header h1 { header h1 {
padding: 0 15px; padding: 0 15px;
} }
/* line 76, ../sass/screen.scss */ /* line 77, ../sass/screen.scss */
header nav { header nav {
display: inline-flex; display: inline-flex;
} }
/* line 78, ../sass/screen.scss */ /* line 79, ../sass/screen.scss */
header nav ul { header nav ul {
display: inline-flex; display: inline-flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
/* line 81, ../sass/screen.scss */ /* line 82, ../sass/screen.scss */
header nav ul li { header nav ul li {
display: inline-block; display: inline-block;
} }
/* line 83, ../sass/screen.scss */ /* line 84, ../sass/screen.scss */
header nav ul li > * { header nav ul li > * {
display: block; display: block;
padding: 10px 15px; padding: 10px 15px;
font-weight: bold; font-weight: bold;
} }
/* line 88, ../sass/screen.scss */ /* line 89, ../sass/screen.scss */
header nav ul li > *:hover { header nav ul li > *:hover {
background: #280008; background: #280008;
} }
/* line 94, ../sass/screen.scss */ /* line 95, ../sass/screen.scss */
header nav .lang-select { header nav .lang-select {
display: inline-block; display: inline-block;
height: 100%; height: 100%;
vertical-align: top; vertical-align: top;
position: relative; position: relative;
} }
/* line 100, ../sass/screen.scss */ /* line 101, ../sass/screen.scss */
header nav .lang-select:before { header nav .lang-select:before {
content: ""; content: "";
color: #fff; color: #fff;
@ -186,12 +187,12 @@ header nav .lang-select:before {
margin: 10px 0; margin: 10px 0;
padding-left: 10px; padding-left: 10px;
} }
/* line 112, ../sass/screen.scss */ /* line 113, ../sass/screen.scss */
header nav .lang-select a { header nav .lang-select a {
padding: 10px 20px; padding: 10px 20px;
display: block; display: block;
} }
/* line 116, ../sass/screen.scss */ /* line 117, ../sass/screen.scss */
header nav .lang-select a img { header nav .lang-select a img {
display: block; display: block;
width: auto; width: auto;
@ -199,34 +200,34 @@ header nav .lang-select a img {
vertical-align: middle; vertical-align: middle;
} }
/* line 127, ../sass/screen.scss */ /* line 128, ../sass/screen.scss */
article { article {
line-height: 1.4; line-height: 1.4;
} }
/* line 129, ../sass/screen.scss */ /* line 130, ../sass/screen.scss */
article p, article ul { article p, article ul {
margin: 0.4em 0; margin: 0.4em 0;
} }
/* line 132, ../sass/screen.scss */ /* line 133, ../sass/screen.scss */
article ul { article ul {
padding-left: 20px; padding-left: 20px;
} }
/* line 134, ../sass/screen.scss */ /* line 135, ../sass/screen.scss */
article ul li { article ul li {
list-style: outside; list-style: outside;
} }
/* line 138, ../sass/screen.scss */ /* line 139, ../sass/screen.scss */
article:last-child { article:last-child {
margin-bottom: 30px; margin-bottom: 30px;
} }
/* line 143, ../sass/screen.scss */ /* line 144, ../sass/screen.scss */
.container { .container {
max-width: 1000px; max-width: 1000px;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
} }
/* line 148, ../sass/screen.scss */ /* line 149, ../sass/screen.scss */
.container .aside-wrap { .container .aside-wrap {
position: absolute; position: absolute;
top: 30px; top: 30px;
@ -234,7 +235,7 @@ article:last-child {
width: 25%; width: 25%;
left: 6px; left: 6px;
} }
/* line 155, ../sass/screen.scss */ /* line 156, ../sass/screen.scss */
.container .aside-wrap .aside { .container .aside-wrap .aside {
color: #222; color: #222;
position: fixed; position: fixed;
@ -245,93 +246,97 @@ article:last-child {
padding: 15px; padding: 15px;
box-shadow: -3px 3px 1px rgba(34, 6, 12, 0.3); box-shadow: -3px 3px 1px rgba(34, 6, 12, 0.3);
} }
/* line 165, ../sass/screen.scss */ /* line 166, ../sass/screen.scss */
.container .aside-wrap .aside h2 { .container .aside-wrap .aside h2 {
color: #000; color: #000;
} }
/* line 169, ../sass/screen.scss */ /* line 170, ../sass/screen.scss */
.container .aside-wrap .aside .calendar { .container .aside-wrap .aside .calendar {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
} }
/* line 173, ../sass/screen.scss */ /* line 174, ../sass/screen.scss */
.container .aside-wrap .aside .calendar:last-child { .container .aside-wrap .aside .calendar:last-child {
margin-bottom: 40px; margin-bottom: 40px;
} }
/* line 178, ../sass/screen.scss */ /* line 179, ../sass/screen.scss */
.container .aside-wrap .aside a { .container .aside-wrap .aside a {
color: #000; color: #000;
text-decoration: none; text-decoration: none;
background-image: linear-gradient(to top, rgba(255, 255, 255, 0.7) 30%, rgba(255, 255, 255, 0) 30%); background-image: linear-gradient(to top, rgba(255, 255, 255, 0.7) 30%, rgba(255, 255, 255, 0) 30%);
} }
/* line 182, ../sass/screen.scss */ /* line 183, ../sass/screen.scss */
.container .aside-wrap .aside a:hover { .container .aside-wrap .aside a:hover {
text-decoration: underline; text-decoration: underline;
} }
/* line 187, ../sass/screen.scss */ /* line 188, ../sass/screen.scss */
.container .aside-wrap .aside .aside-content { .container .aside-wrap .aside .aside-content {
max-height: 70vh; max-height: 70vh;
max-height: calc(80vh - 150px); max-height: calc(80vh - 150px);
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
} }
/* line 195, ../sass/screen.scss */ /* line 196, ../sass/screen.scss */
.container .aside-wrap .aside ul.directory li { .container .aside-wrap .aside ul.directory li {
list-style: "|" inside; list-style: "*" inside;
padding-left: 10px; padding-left: 10px;
text-indent: -10px; text-indent: -10px;
margin-bottom: 5px; margin-bottom: 5px;
} }
/* line 205, ../sass/screen.scss */ /* line 206, ../sass/screen.scss */
.container .content { .container .content {
max-width: 900px; max-width: 900px;
margin-left: auto; margin-left: auto;
margin-right: 6px; margin-right: 6px;
} }
/* line 210, ../sass/screen.scss */ /* line 211, ../sass/screen.scss */
.container .content h3 { .container .content h3 {
font-weight: bold; font-weight: bold;
font-size: 1.2em; font-size: 1.2em;
} }
/* line 215, ../sass/screen.scss */ /* line 216, ../sass/screen.scss */
.container .content h4 { .container .content h4 {
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
/* line 220, ../sass/screen.scss */ /* line 221, ../sass/screen.scss */
.container .content b, .container .content strong { .container .content b, .container .content strong {
font-weight: bold; font-weight: bold;
} }
/* line 224, ../sass/screen.scss */ /* line 225, ../sass/screen.scss */
.container .content i { .container .content i {
font-style: italic; font-style: italic;
} }
/* line 228, ../sass/screen.scss */ /* line 229, ../sass/screen.scss */
.container .content p a { .container .content .intro, .container .content article.paragraph, .container .content article.entry {
line-height: 1.5;
}
/* line 232, ../sass/screen.scss */
.container .content .intro a, .container .content article.paragraph a, .container .content article.entry a {
color: #000; color: #000;
background-image: linear-gradient(to top, rgba(255, 197, 0, 0.8) 30%, rgba(255, 197, 0, 0) 30%); background-image: linear-gradient(to top, rgba(255, 197, 0, 0.8) 30%, rgba(255, 197, 0, 0) 30%);
text-decoration: none; text-decoration: none;
} }
/* line 235, ../sass/screen.scss */ /* line 238, ../sass/screen.scss */
.container .content .intro ul, .container .content .intro ol, .container .content article.paragraph ul, .container .content article.paragraph ol, .container .content article.entry .desc ul, .container .content article.entry .desc ol { .container .content .intro ul, .container .content .intro ol, .container .content article.paragraph ul, .container .content article.paragraph ol, .container .content article.entry ul, .container .content article.entry ol {
padding-left: 1em; padding-left: 1em;
} }
/* line 241, ../sass/screen.scss */ /* line 244, ../sass/screen.scss */
.container .content .intro ul li, .container .content article.paragraph ul li, .container .content article.entry .desc ul li { .container .content .intro ul li, .container .content article.paragraph ul li, .container .content article.entry ul li {
list-style: disc; list-style: disc;
} }
/* line 244, ../sass/screen.scss */ /* line 247, ../sass/screen.scss */
.container .content .intro ol li, .container .content article.paragraph ol li, .container .content article.entry .desc ol li { .container .content .intro ol li, .container .content article.paragraph ol li, .container .content article.entry ol li {
list-style: arabic; list-style: arabic;
} }
/* line 249, ../sass/screen.scss */ /* line 252, ../sass/screen.scss */
.container .content .intro { .container .content .intro {
border-bottom: 3px solid #7f7f7f; border-bottom: 3px solid #7f7f7f;
margin: 20px 0; margin: 20px 0;
margin-top: 5px; margin-top: 5px;
padding: 15px 5px; padding: 15px 5px;
} }
/* line 258, ../sass/screen.scss */ /* line 261, ../sass/screen.scss */
.container .content section article { .container .content section article {
background: #fff; background: #fff;
padding: 20px 30px; padding: 20px 30px;
@ -339,35 +344,35 @@ article:last-child {
border: 1px solid rgba(34, 6, 12, 0.1); border: 1px solid rgba(34, 6, 12, 0.1);
border-radius: 2px; border-radius: 2px;
} }
/* line 266, ../sass/screen.scss */ /* line 269, ../sass/screen.scss */
.container .content section article + h2 { .container .content section article + h2 {
margin-top: 15px; margin-top: 15px;
} }
/* line 270, ../sass/screen.scss */ /* line 273, ../sass/screen.scss */
.container .content section article + article { .container .content section article + article {
margin-top: 25px; margin-top: 25px;
} }
/* line 274, ../sass/screen.scss */ /* line 277, ../sass/screen.scss */
.container .content section .image { .container .content section .image {
margin: 15px 0; margin: 15px 0;
text-align: center; text-align: center;
padding: 20px; padding: 20px;
} }
/* line 279, ../sass/screen.scss */ /* line 282, ../sass/screen.scss */
.container .content section .image img { .container .content section .image img {
max-width: 100%; max-width: 100%;
height: auto; height: auto;
box-shadow: -7px 7px 1px rgba(34, 6, 12, 0.2); box-shadow: -7px 7px 1px rgba(34, 6, 12, 0.2);
} }
/* line 287, ../sass/screen.scss */ /* line 290, ../sass/screen.scss */
.container .content section.directory article.entry { .container .content section.directory article.entry {
width: 80%; width: 90%;
max-width: 600px; max-width: 600px;
max-height: 100%; max-height: 100%;
position: relative; position: relative;
margin-left: 6%; margin-left: 6%;
} }
/* line 294, ../sass/screen.scss */ /* line 297, ../sass/screen.scss */
.container .content section.directory article.entry .entry-image { .container .content section.directory article.entry .entry-image {
display: block; display: block;
float: right; float: right;
@ -381,32 +386,38 @@ article:last-child {
margin-left: 10px; margin-left: 10px;
margin-bottom: 10px; margin-bottom: 10px;
transform: translateX(10px); transform: translateX(10px);
line-height: 0;
} }
/* line 308, ../sass/screen.scss */ /* line 312, ../sass/screen.scss */
.container .content section.directory article.entry .entry-image img { .container .content section.directory article.entry .entry-image img {
width: auto; width: auto;
height: auto; height: auto;
max-width: 100%; max-width: 100%;
max-height: 100%; max-height: 100%;
} }
/* line 316, ../sass/screen.scss */ /* line 320, ../sass/screen.scss */
.container .content section.directory article.entry ul.links { .container .content section.directory article.entry ul.links {
margin-top: 10px; margin-top: 10px;
border-top: 1px solid #90001C; border-top: 1px solid #90001C;
padding-top: 10px; padding-top: 10px;
font-weight: bold;
} }
/* line 324, ../sass/screen.scss */ /* line 326, ../sass/screen.scss */
.container .content section.directory article.entry ul.links .label {
font-weight: normal;
}
/* line 333, ../sass/screen.scss */
.container .content section.actuhome { .container .content section.actuhome {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-around; justify-content: space-around;
align-items: top; align-items: top;
} }
/* line 330, ../sass/screen.scss */ /* line 339, ../sass/screen.scss */
.container .content section.actuhome article + article { .container .content section.actuhome article + article {
margin: 0; margin: 0;
} }
/* line 334, ../sass/screen.scss */ /* line 343, ../sass/screen.scss */
.container .content section.actuhome article.actu { .container .content section.actuhome article.actu {
position: relative; position: relative;
background: none; background: none;
@ -416,7 +427,7 @@ article:last-child {
min-width: 300px; min-width: 300px;
flex: 1; flex: 1;
} }
/* line 343, ../sass/screen.scss */ /* line 352, ../sass/screen.scss */
.container .content section.actuhome article.actu .actu-header { .container .content section.actuhome article.actu .actu-header {
position: relative; position: relative;
box-shadow: -4px 5px 1px rgba(34, 6, 12, 0.3); box-shadow: -4px 5px 1px rgba(34, 6, 12, 0.3);
@ -430,7 +441,7 @@ article:last-child {
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
/* line 356, ../sass/screen.scss */ /* line 365, ../sass/screen.scss */
.container .content section.actuhome article.actu .actu-header h2 { .container .content section.actuhome article.actu .actu-header h2 {
position: absolute; position: absolute;
width: 100%; width: 100%;
@ -440,11 +451,11 @@ article:last-child {
text-shadow: 0 0 5px rgba(34, 6, 12, 0.8); text-shadow: 0 0 5px rgba(34, 6, 12, 0.8);
background: linear-gradient(to top, rgba(0, 0, 0, 0.7), transparent); background: linear-gradient(to top, rgba(0, 0, 0, 0.7), transparent);
} }
/* line 364, ../sass/screen.scss */ /* line 373, ../sass/screen.scss */
.container .content section.actuhome article.actu .actu-header h2 a { .container .content section.actuhome article.actu .actu-header h2 a {
color: #fff; color: #fff;
} }
/* line 370, ../sass/screen.scss */ /* line 379, ../sass/screen.scss */
.container .content section.actuhome article.actu .actu-misc { .container .content section.actuhome article.actu .actu-misc {
background: white; background: white;
box-shadow: -2px 2px 1px rgba(34, 6, 12, 0.2); box-shadow: -2px 2px 1px rgba(34, 6, 12, 0.2);
@ -454,17 +465,17 @@ article:last-child {
padding: 15px; padding: 15px;
padding-top: 5px; padding-top: 5px;
} }
/* line 379, ../sass/screen.scss */ /* line 388, ../sass/screen.scss */
.container .content section.actuhome article.actu .actu-misc .actu-minical { .container .content section.actuhome article.actu .actu-misc .actu-minical {
display: block; display: block;
} }
/* line 382, ../sass/screen.scss */ /* line 391, ../sass/screen.scss */
.container .content section.actuhome article.actu .actu-misc .actu-dates { .container .content section.actuhome article.actu .actu-misc .actu-dates {
display: block; display: block;
text-align: right; text-align: right;
font-size: 0.9em; font-size: 0.9em;
} }
/* line 389, ../sass/screen.scss */ /* line 398, ../sass/screen.scss */
.container .content section.actuhome article.actu .actu-overlay { .container .content section.actuhome article.actu .actu-overlay {
display: block; display: block;
background: none; background: none;
@ -476,82 +487,82 @@ article:last-child {
z-index: 5; z-index: 5;
opacity: 0; opacity: 0;
} }
/* line 405, ../sass/screen.scss */ /* line 414, ../sass/screen.scss */
.container .content section.actulist article.actu { .container .content section.actulist article.actu {
display: flex; display: flex;
width: 100%; width: 100%;
padding: 0; padding: 0;
} }
/* line 410, ../sass/screen.scss */ /* line 419, ../sass/screen.scss */
.container .content section.actulist article.actu .actu-image { .container .content section.actulist article.actu .actu-image {
width: 30%; width: 30%;
max-width: 200px; max-width: 200px;
background-size: cover; background-size: cover;
background-position: center center; background-position: center center;
} }
/* line 416, ../sass/screen.scss */ /* line 425, ../sass/screen.scss */
.container .content section.actulist article.actu .actu-infos { .container .content section.actulist article.actu .actu-infos {
padding: 15px; padding: 15px;
flex: 1; flex: 1;
} }
/* line 420, ../sass/screen.scss */ /* line 429, ../sass/screen.scss */
.container .content section.actulist article.actu .actu-infos .actu-dates { .container .content section.actulist article.actu .actu-infos .actu-dates {
font-weight: bold; font-weight: bold;
font-size: 0.9em; font-size: 0.9em;
} }
/* line 430, ../sass/screen.scss */ /* line 439, ../sass/screen.scss */
.container .aside-wrap + .content { .container .aside-wrap + .content {
max-width: 70%; max-width: 70%;
} }
/* line 435, ../sass/screen.scss */ /* line 444, ../sass/screen.scss */
.calendar { .calendar {
color: rgba(0, 0, 0, 0.8); color: rgba(0, 0, 0, 0.8);
width: 200px; width: 200px;
} }
/* line 439, ../sass/screen.scss */ /* line 448, ../sass/screen.scss */
.calendar td, .calendar th { .calendar td, .calendar th {
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
border: 2px solid transparent; border: 2px solid transparent;
padding: 1px; padding: 1px;
} }
/* line 446, ../sass/screen.scss */ /* line 455, ../sass/screen.scss */
.calendar th { .calendar th {
font-weight: bold; font-weight: bold;
} }
/* line 450, ../sass/screen.scss */ /* line 459, ../sass/screen.scss */
.calendar td { .calendar td {
font-size: 0.8em; font-size: 0.8em;
width: 28px; width: 28px;
height: 28px; height: 28px;
} }
/* line 455, ../sass/screen.scss */ /* line 464, ../sass/screen.scss */
.calendar td.out { .calendar td.out {
opacity: 0.3; opacity: 0.3;
} }
/* line 458, ../sass/screen.scss */ /* line 467, ../sass/screen.scss */
.calendar td.today { .calendar td.today {
border-bottom-color: #000; border-bottom-color: #000;
} }
/* line 461, ../sass/screen.scss */ /* line 470, ../sass/screen.scss */
.calendar td:nth-child(7), .calendar td:nth-child(6) { .calendar td:nth-child(7), .calendar td:nth-child(6) {
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
} }
/* line 464, ../sass/screen.scss */ /* line 473, ../sass/screen.scss */
.calendar td.hasevent { .calendar td.hasevent {
position: relative; position: relative;
font-weight: bold; font-weight: bold;
color: #90001C; color: #90001C;
font-size: 1em; font-size: 1em;
} }
/* line 470, ../sass/screen.scss */ /* line 479, ../sass/screen.scss */
.calendar td.hasevent > a { .calendar td.hasevent > a {
padding: 3px; padding: 3px;
color: #90001C !important; color: #90001C !important;
background: none !important; background: none !important;
} }
/* line 476, ../sass/screen.scss */ /* line 485, ../sass/screen.scss */
.calendar td.hasevent ul.cal-events { .calendar td.hasevent ul.cal-events {
font-size: 0.9em; font-size: 0.9em;
text-align: left; text-align: left;
@ -565,11 +576,11 @@ article:last-child {
padding: 5px; padding: 5px;
background-color: #90001C; background-color: #90001C;
} }
/* line 489, ../sass/screen.scss */ /* line 498, ../sass/screen.scss */
.calendar td.hasevent ul.cal-events .datename { .calendar td.hasevent ul.cal-events .datename {
display: none; display: none;
} }
/* line 492, ../sass/screen.scss */ /* line 501, ../sass/screen.scss */
.calendar td.hasevent ul.cal-events:before { .calendar td.hasevent ul.cal-events:before {
top: -12px; top: -12px;
left: 38px; left: 38px;
@ -578,25 +589,25 @@ article:last-child {
border: 6px solid transparent; border: 6px solid transparent;
border-bottom-color: #90001C; border-bottom-color: #90001C;
} }
/* line 500, ../sass/screen.scss */ /* line 509, ../sass/screen.scss */
.calendar td.hasevent ul.cal-events a { .calendar td.hasevent ul.cal-events a {
color: #fff; color: #fff;
background: none !important; background: none !important;
} }
/* line 506, ../sass/screen.scss */ /* line 515, ../sass/screen.scss */
.calendar td.hasevent > a:hover { .calendar td.hasevent > a:hover {
background-color: #90001C; background-color: #90001C;
color: #fff !important; color: #fff !important;
} }
/* line 510, ../sass/screen.scss */ /* line 519, ../sass/screen.scss */
.calendar td.hasevent > a:hover + ul.cal-events { .calendar td.hasevent > a:hover + ul.cal-events {
display: block; display: block;
} }
/* line 518, ../sass/screen.scss */ /* line 527, ../sass/screen.scss */
.calendar tr.head th { .calendar tr.head th {
position: relative; position: relative;
} }
/* line 520, ../sass/screen.scss */ /* line 529, ../sass/screen.scss */
.calendar tr.head th a { .calendar tr.head th a {
position: absolute; position: absolute;
display: block; display: block;
@ -605,30 +616,30 @@ article:last-child {
top: -5px; top: -5px;
background: none !important; background: none !important;
} }
/* line 528, ../sass/screen.scss */ /* line 537, ../sass/screen.scss */
.calendar tr.head th:first-child a { .calendar tr.head th:first-child a {
left: 0; left: 0;
text-align: left; text-align: left;
} }
/* line 532, ../sass/screen.scss */ /* line 541, ../sass/screen.scss */
.calendar tr.head th:last-child a { .calendar tr.head th:last-child a {
text-align: right; text-align: right;
right: 0; right: 0;
} }
/* line 540, ../sass/screen.scss */ /* line 549, ../sass/screen.scss */
#calendar-wrap .details { #calendar-wrap .details {
border-top: 1px solid #90001C; border-top: 1px solid #90001C;
margin-top: 15px; margin-top: 15px;
padding-top: 10px; padding-top: 10px;
} }
/* line 545, ../sass/screen.scss */ /* line 554, ../sass/screen.scss */
#calendar-wrap .details li.datename { #calendar-wrap .details li.datename {
font-weight: bold; font-weight: bold;
font-size: 1.1em; font-size: 1.1em;
margin-bottom: 5px; margin-bottom: 5px;
} }
/* line 546, ../sass/screen.scss */ /* line 555, ../sass/screen.scss */
#calendar-wrap .details li.datename:after { #calendar-wrap .details li.datename:after {
content: " :"; content: " :";
} }

31
gestioncof/cms/static/cofcms/sass/screen.scss
View file

@ -23,15 +23,16 @@ header {
h1, h2 { h1, h2 {
font-family: $headfont; font-family: $headfont;
color: $titre;
} }
h1 { h1 {
font-size: 2.3em; font-size: 2.3em;
color: $titre;
} }
h2 { h2 {
font-size: 1.6em; font-size: 1.6em;
color: desaturate(lighten($titre, 10%), 20%);
} }
@ -39,8 +40,8 @@ a {
color: $lien; color: $lien;
text-decoration: none; text-decoration: none;
font-weight: bold; font-weight: bold;
padding: 0 3px; padding: 0 2px;
margin: 0 -3px; margin: 0 -2px;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
} }
@ -193,7 +194,7 @@ article {
ul.directory { ul.directory {
li { li {
list-style: "|" inside; list-style: "*" inside;
padding-left: 10px; padding-left: 10px;
text-indent: -10px; text-indent: -10px;
margin-bottom: 5px; margin-bottom: 5px;
@ -225,13 +226,15 @@ article {
font-style: italic; font-style: italic;
} }
p a { .intro, article.paragraph, article.entry {
color: #000; line-height: 1.5;
background-image: linear-gradient(to top, rgba($aside, 0.8) 30%, rgba($aside, 0) 30%);
text-decoration: none; a {
} color: #000;
background-image: linear-gradient(to top, rgba($aside, 0.8) 30%, rgba($aside, 0) 30%);
text-decoration: none;
}
.intro, article.paragraph, article.entry .desc {
ul, ol { ul, ol {
padding-left: 1em; padding-left: 1em;
li { li {
@ -285,7 +288,7 @@ article {
&.directory { &.directory {
article.entry { article.entry {
width: 80%; width: 90%;
max-width: 600px; max-width: 600px;
max-height: 100%; max-height: 100%;
position: relative; position: relative;
@ -304,6 +307,7 @@ article {
margin-left: 10px; margin-left: 10px;
margin-bottom: 10px; margin-bottom: 10px;
transform: translateX(10px); transform: translateX(10px);
line-height: 0;
img { img {
width: auto; width: auto;
@ -317,6 +321,11 @@ article {
margin-top: 10px; margin-top: 10px;
border-top: 1px solid $sousbandeau; border-top: 1px solid $sousbandeau;
padding-top: 10px; padding-top: 10px;
font-weight: bold;
.label {
font-weight: normal;
}
} }
} }
} }

9
gestioncof/cms/templates/cofcms/base.html
View file

@ -4,7 +4,14 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% block title %}{% trans "Association des élèves de l'ENS Ulm" %}{% endblock %}</title> <title>{% block title %}
{% if page.seo_title %}
{{ page.seo_title }} |
{% elif page.title %}
{{ page.title }} |
{% endif %}
{% trans "Association des élèves de l'ENS Ulm" %}
{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{% static "fonts/CarterOne/carterOne.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "fonts/CarterOne/carterOne.css" %}"/>
<link rel="stylesheet" type="text/css" href="{% static "fonts/SourceSansPro/sourceSansPro.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "fonts/SourceSansPro/sourceSansPro.css" %}"/>
<link rel="stylesheet" type="text/css" href="{% static "cofcms/css/screen.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "cofcms/css/screen.css" %}"/>

4
gestioncof/cms/templates/cofcms/cof_directory_page.html
View file

@ -35,8 +35,10 @@
<li> <li>
{% if block.block_type == "lien" %} {% if block.block_type == "lien" %}
<a href="{{ block.value.url }}">{{ block.value.texte }}</a> <a href="{{ block.value.url }}">{{ block.value.texte }}</a>
{% elif block.block_type == "contact" %}
<span class="label">{{ block.value.texte }} :</span> <button data-mref="{{ block.value.email|obfuscate_mail }}" class="facteur">{% trans "Afficher l'adresse mail" %}</button>
{% else %} {% else %}
{{ block.value.texte }} : <button data-mref="{{ block.value.email|obfuscate_mail }}" class="facteur">{% trans "Afficher l'adresse mail" %}</a> {% if block.value.nom %}<span class="label">{{ block.value.nom }} :</span> {% endif %}{{ block.value.texte }}
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}