From 12f0da492a2479dc8783da9575a5336e7132b412 Mon Sep 17 00:00:00 2001 From: Evarin Date: Wed, 17 May 2017 00:10:13 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9tails=20d'affichage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- avisstage/models.py | 2 +- avisstage/sass/screen.scss | 5 +- avisstage/static/css/screen.css | 236 ++++++++++++++++---------------- 3 files changed, 122 insertions(+), 121 deletions(-) diff --git a/avisstage/models.py b/avisstage/models.py index c17a893..15d0001 100644 --- a/avisstage/models.py +++ b/avisstage/models.py @@ -44,7 +44,7 @@ class Normalien(models.Model): # Liste des stages publiés def stages_publics(self): - return self.stages.filter(public=True) + return self.stages.filter(public=True).order_by('-date_debut') # Hook à la création d'un nouvel utilisateur : récupération de ses infos par LDAP def create_user_profile(sender, instance, created, **kwargs): diff --git a/avisstage/sass/screen.scss b/avisstage/sass/screen.scss index 95517b9..a5b5296 100644 --- a/avisstage/sass/screen.scss +++ b/avisstage/sass/screen.scss @@ -335,6 +335,7 @@ article.stage { min-width: 250px; width: 30%; min-height: 300px; + vertical-align: middle; } .desc { padding: 5px; @@ -355,8 +356,8 @@ article.stage { .chapo { font-size: 1.1em; - font-family: $textfont; - font-weight: 500; + //font-family: $textfont; + font-weight: 700; padding-left: 0px; } .avis-texte { diff --git a/avisstage/static/css/screen.css b/avisstage/static/css/screen.css index 0192537..c4cf709 100644 --- a/avisstage/static/css/screen.css +++ b/avisstage/static/css/screen.css @@ -407,45 +407,45 @@ article.stage section.misc .misc-content.withmap .map { min-width: 250px; width: 30%; min-height: 300px; + vertical-align: middle; } -/* line 339, ../../sass/screen.scss */ +/* line 340, ../../sass/screen.scss */ article.stage section.misc .misc-content.withmap .desc { padding: 5px; padding-left: 15px; } -/* line 347, ../../sass/screen.scss */ +/* line 348, ../../sass/screen.scss */ article.stage section .chapo, article.stage section .avis-texte { margin-bottom: 15px; background: #fff; padding: 0 20px; } -/* line 352, ../../sass/screen.scss */ +/* line 353, ../../sass/screen.scss */ article.stage section .avis-texte { font-size: 18px; } -/* line 356, ../../sass/screen.scss */ +/* line 357, ../../sass/screen.scss */ article.stage section .chapo { font-size: 1.1em; - font-family: "Dosis", sans-serif; - font-weight: 500; + font-weight: 700; padding-left: 0px; } -/* line 362, ../../sass/screen.scss */ +/* line 363, ../../sass/screen.scss */ article.stage section .avis-texte { padding-left: 15px; } -/* line 367, ../../sass/screen.scss */ +/* line 368, ../../sass/screen.scss */ article.stage section .plusmoins { max-width: 600px; margin: 15px auto; margin-top: 40px; } -/* line 372, ../../sass/screen.scss */ +/* line 373, ../../sass/screen.scss */ article.stage section .plusmoins > div { display: table; width: 100%; } -/* line 376, ../../sass/screen.scss */ +/* line 377, ../../sass/screen.scss */ article.stage section .plusmoins > div:before { content: " "; width: 90px; @@ -454,66 +454,66 @@ article.stage section .plusmoins > div:before { text-align: right; padding-right: 12px; } -/* line 385, ../../sass/screen.scss */ +/* line 386, ../../sass/screen.scss */ article.stage section .plusmoins > div > *, article.stage section .plusmoins > div:before { display: table-cell; } -/* line 389, ../../sass/screen.scss */ +/* line 390, ../../sass/screen.scss */ article.stage section .plusmoins > div > div { padding: 15px; color: #fff; } -/* line 392, ../../sass/screen.scss */ +/* line 393, ../../sass/screen.scss */ article.stage section .plusmoins > div > div h4 { font-weight: normal; margin-left: -5px; font-size: 0.9em; opacity: 0.9; } -/* line 398, ../../sass/screen.scss */ +/* line 399, ../../sass/screen.scss */ article.stage section .plusmoins > div > div p { font-weight: bold; margin: 2px; } -/* line 406, ../../sass/screen.scss */ +/* line 407, ../../sass/screen.scss */ article.stage section .plusmoins .plus > div { background: #1775c6; } -/* line 409, ../../sass/screen.scss */ +/* line 410, ../../sass/screen.scss */ article.stage section .plusmoins .plus:before { content: "Les +"; vertical-align: bottom; color: #1567af; } -/* line 416, ../../sass/screen.scss */ +/* line 417, ../../sass/screen.scss */ article.stage section .plusmoins .moins > div { background: #df076c; } -/* line 419, ../../sass/screen.scss */ +/* line 420, ../../sass/screen.scss */ article.stage section .plusmoins .moins:before { content: "Les –"; vertical-align: top; color: #c70660; } -/* line 430, ../../sass/screen.scss */ +/* line 431, ../../sass/screen.scss */ article.stage .section-wrapper { display: table; margin-left: -15px; width: 100%; } -/* line 435, ../../sass/screen.scss */ +/* line 436, ../../sass/screen.scss */ article.stage .section-wrapper .toc-wrapper, article.stage .section-wrapper > section { display: table-cell; vertical-align: top; } -/* line 439, ../../sass/screen.scss */ +/* line 440, ../../sass/screen.scss */ article.stage .section-wrapper .toc-wrapper { max-width: 230px; width: 25%; padding: 5px; padding-right: 25px; } -/* line 445, ../../sass/screen.scss */ +/* line 446, ../../sass/screen.scss */ article.stage .section-wrapper .toc { font-family: "Dosis", sans-serif; position: -webkit-sticky; @@ -524,12 +524,12 @@ article.stage .section-wrapper .toc { padding: 5px; box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.2); } -/* line 455, ../../sass/screen.scss */ +/* line 456, ../../sass/screen.scss */ article.stage .section-wrapper .toc ul { list-style: none; padding: 0; } -/* line 460, ../../sass/screen.scss */ +/* line 461, ../../sass/screen.scss */ article.stage .section-wrapper .toc a { display: block; color: inherit; @@ -538,44 +538,44 @@ article.stage .section-wrapper .toc a { padding: 5px; line-height: 1; } -/* line 468, ../../sass/screen.scss */ +/* line 469, ../../sass/screen.scss */ article.stage .section-wrapper .toc a:hover { color: #8fcc33; } -/* line 472, ../../sass/screen.scss */ +/* line 473, ../../sass/screen.scss */ article.stage .section-wrapper .toc .toc-h1 a { font-weight: 900; } -/* line 475, ../../sass/screen.scss */ +/* line 476, ../../sass/screen.scss */ article.stage .section-wrapper .toc .toc-h2 { margin-top: 10px; font-weight: 400; } -/* line 479, ../../sass/screen.scss */ +/* line 480, ../../sass/screen.scss */ article.stage .section-wrapper .toc .toc-h3 a { font-weight: 300; } -/* line 482, ../../sass/screen.scss */ +/* line 483, ../../sass/screen.scss */ article.stage .section-wrapper .toc .toc-active a { color: #0f4c82; } -/* line 489, ../../sass/screen.scss */ +/* line 490, ../../sass/screen.scss */ .misc-hdr { display: table; width: 100%; border-bottom: 1px solid #ccc; } -/* line 494, ../../sass/screen.scss */ +/* line 495, ../../sass/screen.scss */ .misc-hdr > * { display: table-cell; vertical-align: bottom; } -/* line 499, ../../sass/screen.scss */ +/* line 500, ../../sass/screen.scss */ .misc-hdr h1 { width: 100%; } -/* line 502, ../../sass/screen.scss */ +/* line 503, ../../sass/screen.scss */ .misc-hdr .dates { width: 50px; background-color: #950548; @@ -586,34 +586,34 @@ article.stage .section-wrapper .toc .toc-active a { font-size: 0.8em; text-align: center; } -/* line 512, ../../sass/screen.scss */ +/* line 513, ../../sass/screen.scss */ .misc-hdr .dates span { display: block; } -/* line 515, ../../sass/screen.scss */ +/* line 516, ../../sass/screen.scss */ .misc-hdr .dates .year { font-size: 1.8em; } -/* line 523, ../../sass/screen.scss */ +/* line 524, ../../sass/screen.scss */ .edit-box { background: #eee; margin: 10px; padding: 10px 20px; text-align: center; } -/* line 529, ../../sass/screen.scss */ +/* line 530, ../../sass/screen.scss */ .edit-box.public { background: #cae3f9; border: 1px solid #125b9b; } -/* line 534, ../../sass/screen.scss */ +/* line 535, ../../sass/screen.scss */ .edit-box.prive { background: #fdcfe4; border: 1px solid #ad0654; } -/* line 547, ../../sass/screen.scss */ +/* line 548, ../../sass/screen.scss */ input, textarea, select, div.tinymce, option, optgroup:before { background: #fff; font-size: 1em; @@ -623,13 +623,13 @@ input, textarea, select, div.tinymce, option, optgroup:before { padding: 5px; text-align: left; } -/* line 556, ../../sass/screen.scss */ +/* line 557, ../../sass/screen.scss */ input:focus, input.mce-edit-focus, textarea:focus, textarea.mce-edit-focus, select:focus, select.mce-edit-focus, div.tinymce:focus, div.tinymce.mce-edit-focus, option:focus, option.mce-edit-focus, optgroup:before:focus, optgroup:before.mce-edit-focus { background-color: #e9f5d6; outline: none; } -/* line 563, ../../sass/screen.scss */ +/* line 564, ../../sass/screen.scss */ input[type='text'], input[type='password'], input[type='email'], textarea, select { border: none; @@ -639,7 +639,7 @@ input[type='email'], textarea, select { transition: border 1s ease-out, background 1s ease-out; } -/* line 572, ../../sass/screen.scss */ +/* line 573, ../../sass/screen.scss */ select { -moz-appearance: none; appearance: none; @@ -647,21 +647,21 @@ select { margin-right: 5px; cursor: pointer; } -/* line 579, ../../sass/screen.scss */ +/* line 580, ../../sass/screen.scss */ select option { padding: 3px; white-space: pre-wrap; } -/* line 585, ../../sass/screen.scss */ +/* line 586, ../../sass/screen.scss */ select optgroup option { padding-left: 10px; } -/* line 588, ../../sass/screen.scss */ +/* line 589, ../../sass/screen.scss */ select optgroup:before { font-weight: bold; } -/* line 594, ../../sass/screen.scss */ +/* line 595, ../../sass/screen.scss */ input[type="submit"], .btn { font: 19px "Dosis", sans-serif; background-color: #8fcc33; @@ -672,17 +672,17 @@ input[type="submit"], .btn { display: inline-block; } -/* line 604, ../../sass/screen.scss */ +/* line 605, ../../sass/screen.scss */ p.submits { text-align: right; } -/* line 608, ../../sass/screen.scss */ +/* line 609, ../../sass/screen.scss */ form .commentaire { font-style: italic; } -/* line 612, ../../sass/screen.scss */ +/* line 613, ../../sass/screen.scss */ .edit-btn { border-color: #706c00; color: #000; @@ -691,14 +691,14 @@ form .commentaire { background-origin: content-box; background-size: contain; } -/* line 620, ../../sass/screen.scss */ +/* line 621, ../../sass/screen.scss */ .edit-btn:after { content: ""; width: 30px; display: inline-block; } -/* line 627, ../../sass/screen.scss */ +/* line 628, ../../sass/screen.scss */ textarea, div.tinymce { font-family: "Lato", sans-serif; border: none; @@ -708,20 +708,20 @@ textarea, div.tinymce { transition: border 1s ease-out, background 1s ease-out; } -/* line 636, ../../sass/screen.scss */ +/* line 637, ../../sass/screen.scss */ textarea { height: 200px; resize: vertical; } -/* line 644, ../../sass/screen.scss */ +/* line 645, ../../sass/screen.scss */ form .field { margin: 5px 0; display: flex; background: #fff; padding: 10px; } -/* line 650, ../../sass/screen.scss */ +/* line 651, ../../sass/screen.scss */ form .field label, form .field .label { display: inline-block; width: 250px; @@ -730,39 +730,39 @@ form .field label, form .field .label { padding-top: 5px; flex-shrink: 0; } -/* line 658, ../../sass/screen.scss */ +/* line 659, ../../sass/screen.scss */ form .field label.required:before, form .field .label.required:before { margin-right: 5px; content: "*"; color: #f70978; } -/* line 664, ../../sass/screen.scss */ +/* line 665, ../../sass/screen.scss */ form .field label { font-family: Alegreya, serif; font-weight: bold; } -/* line 668, ../../sass/screen.scss */ +/* line 669, ../../sass/screen.scss */ form .field .help_text { font-style: italic; font-size: 0.9em; } -/* line 672, ../../sass/screen.scss */ +/* line 673, ../../sass/screen.scss */ form .field .input { display: inline-block; flex-grow: 1; margin-right: 10px; } -/* line 682, ../../sass/screen.scss */ +/* line 683, ../../sass/screen.scss */ ul.as-selections { display: flex; flex-wrap: wrap; } -/* line 686, ../../sass/screen.scss */ +/* line 687, ../../sass/screen.scss */ ul.as-selections li { display: inline-block; } -/* line 690, ../../sass/screen.scss */ +/* line 691, ../../sass/screen.scss */ ul.as-selections .as-selection-item { padding: 0 5px; background: #f99b20; @@ -771,52 +771,52 @@ ul.as-selections .as-selection-item { border-radius: 2px; font-weight: 500; } -/* line 698, ../../sass/screen.scss */ +/* line 699, ../../sass/screen.scss */ ul.as-selections .as-selection-item a.as-close { color: #fff; -webkit-cursor: pointer; cursor: pointer; margin-right: 5px; } -/* line 705, ../../sass/screen.scss */ +/* line 706, ../../sass/screen.scss */ ul.as-selections .as-selection-item.selected { background: #8fcc33; } -/* line 710, ../../sass/screen.scss */ +/* line 711, ../../sass/screen.scss */ ul.as-selections .as-original { flex-grow: 1; min-width: 200px; } -/* line 714, ../../sass/screen.scss */ +/* line 715, ../../sass/screen.scss */ ul.as-selections .as-original input { width: 100%; } -/* line 720, ../../sass/screen.scss */ +/* line 721, ../../sass/screen.scss */ div.as-results { position: relative; } -/* line 722, ../../sass/screen.scss */ +/* line 723, ../../sass/screen.scss */ div.as-results ul { position: absolute; width: 100%; background: #fff; border: 1px solid #d2ebad; } -/* line 729, ../../sass/screen.scss */ +/* line 730, ../../sass/screen.scss */ div.as-results ul li { padding: 3px 5px; } -/* line 735, ../../sass/screen.scss */ +/* line 736, ../../sass/screen.scss */ div.as-results ul li.as-result-item.active { background: #fddeb5; } -/* line 740, ../../sass/screen.scss */ +/* line 741, ../../sass/screen.scss */ div.as-results ul li.as-message { font-style: italic; } -/* line 750, ../../sass/screen.scss */ +/* line 751, ../../sass/screen.scss */ .window { display: none; position: fixed; @@ -827,11 +827,11 @@ div.as-results ul li.as-message { left: 0; z-index: 50; } -/* line 760, ../../sass/screen.scss */ +/* line 761, ../../sass/screen.scss */ .window.visible { display: block; } -/* line 764, ../../sass/screen.scss */ +/* line 765, ../../sass/screen.scss */ .window .window-bg { background: #000; opacity: 0.7; @@ -842,7 +842,7 @@ div.as-results ul li.as-message { top: 0; z-index: -1; } -/* line 775, ../../sass/screen.scss */ +/* line 776, ../../sass/screen.scss */ .window .window-content { position: relative; margin: 0 auto; @@ -856,11 +856,11 @@ div.as-results ul li.as-message { max-height: 100%; overflow: auto; } -/* line 789, ../../sass/screen.scss */ +/* line 790, ../../sass/screen.scss */ .window .window-content form label, .window .window-content form .label { width: 150px; } -/* line 795, ../../sass/screen.scss */ +/* line 796, ../../sass/screen.scss */ .window .window-closer { position: absolute; top: 0; @@ -868,65 +868,65 @@ div.as-results ul li.as-message { padding: 12px; z-index: 3; } -/* line 801, ../../sass/screen.scss */ +/* line 802, ../../sass/screen.scss */ .window .window-closer:after { content: "×"; } -/* line 812, ../../sass/screen.scss */ +/* line 813, ../../sass/screen.scss */ #lieu_widget .lieu-ui { position: relative; } -/* line 814, ../../sass/screen.scss */ +/* line 815, ../../sass/screen.scss */ #lieu_widget .lieu-ui .map { height: 400px; width: 100%; } -/* line 818, ../../sass/screen.scss */ +/* line 819, ../../sass/screen.scss */ #lieu_widget .lieu-ui.hidden { display: none; } -/* line 821, ../../sass/screen.scss */ +/* line 822, ../../sass/screen.scss */ #lieu_widget .lieu-ui .masked { visibility: hidden; } -/* line 826, ../../sass/screen.scss */ +/* line 827, ../../sass/screen.scss */ #lieu_widget .lieu-choixmodif { display: none; } -/* line 831, ../../sass/screen.scss */ +/* line 832, ../../sass/screen.scss */ #lieu_widget.modif .lieu-choixmodif { display: unset; } -/* line 836, ../../sass/screen.scss */ +/* line 837, ../../sass/screen.scss */ #lieu_widget.modif .lieu-ui, #lieu_widget.attente .lieu-ui { display: none; } -/* line 843, ../../sass/screen.scss */ +/* line 844, ../../sass/screen.scss */ #lieu_widget.edit .lieu-ui .lieu-acinput { display: none; } -/* line 846, ../../sass/screen.scss */ +/* line 847, ../../sass/screen.scss */ #lieu_widget.edit .lieu-ui .map { height: 200px; } -/* line 852, ../../sass/screen.scss */ +/* line 853, ../../sass/screen.scss */ #lieu_widget #avis_lieu_vide { display: none; } -/* line 856, ../../sass/screen.scss */ +/* line 857, ../../sass/screen.scss */ #lieu_widget .message { background: #fddeb5; padding: 5px; font-style: italic; font-size: 0.9em; } -/* line 862, ../../sass/screen.scss */ +/* line 863, ../../sass/screen.scss */ #lieu_widget .message.hidden { display: none; } -/* line 868, ../../sass/screen.scss */ +/* line 869, ../../sass/screen.scss */ a.lieu-change { color: #fff; background: #f99b20; @@ -939,25 +939,25 @@ a.lieu-change { border-radius: 5px; margin-right: 7px; } -/* line 880, ../../sass/screen.scss */ +/* line 881, ../../sass/screen.scss */ a.lieu-change.ajout:before { content: "+"; margin-right: 5px; } -/* line 886, ../../sass/screen.scss */ +/* line 887, ../../sass/screen.scss */ #stages-map { width: 100%; height: 600px; max-height: 90vh; } -/* line 893, ../../sass/screen.scss */ +/* line 894, ../../sass/screen.scss */ #id_stage-thematiques { display: none; } -/* line 899, ../../sass/screen.scss */ +/* line 900, ../../sass/screen.scss */ .homeh1 { display: flex; justify-content: space-between; @@ -967,22 +967,22 @@ a.lieu-change.ajout:before { border-bottom: 3px solid #000; margin-bottom: 15px; } -/* line 908, ../../sass/screen.scss */ +/* line 909, ../../sass/screen.scss */ .homeh1 > * { display: inline-block; } -/* line 911, ../../sass/screen.scss */ +/* line 912, ../../sass/screen.scss */ .homeh1 p { text-align: right; } -/* line 916, ../../sass/screen.scss */ +/* line 917, ../../sass/screen.scss */ .betacadre { background: #fa6cae; padding: 10px; } -/* line 921, ../../sass/screen.scss */ +/* line 922, ../../sass/screen.scss */ .entrer { background: #fff; max-width: 500px; @@ -991,84 +991,84 @@ a.lieu-change.ajout:before { margin: 15px auto; } -/* line 929, ../../sass/screen.scss */ +/* line 930, ../../sass/screen.scss */ article.promo { display: block; font-size: 1.1em; } -/* line 933, ../../sass/screen.scss */ +/* line 934, ../../sass/screen.scss */ article.promo .explications { display: table; } -/* line 936, ../../sass/screen.scss */ +/* line 937, ../../sass/screen.scss */ article.promo .explications:first-child { direction: rtl; } -/* line 938, ../../sass/screen.scss */ +/* line 939, ../../sass/screen.scss */ article.promo .explications:first-child > * { direction: ltr; } -/* line 943, ../../sass/screen.scss */ +/* line 944, ../../sass/screen.scss */ article.promo .explications > div { display: table-cell; vertical-align: middle; text-align: center; } -/* line 948, ../../sass/screen.scss */ +/* line 949, ../../sass/screen.scss */ article.promo .explications > div p { margin: 15px 15px; } -/* line 956, ../../sass/screen.scss */ +/* line 957, ../../sass/screen.scss */ .faq-toc { font-family: "Lato", sans-serif; display: block; max-width: 700px; margin: 0 auto; } -/* line 961, ../../sass/screen.scss */ +/* line 962, ../../sass/screen.scss */ .faq-toc ul { margin: 20px; } -/* line 965, ../../sass/screen.scss */ +/* line 966, ../../sass/screen.scss */ .faq-toc ul li a { color: #000; display: block; padding: 5px; } -/* line 971, ../../sass/screen.scss */ +/* line 972, ../../sass/screen.scss */ .faq-toc ul li.toc-h1 { display: none; } -/* line 975, ../../sass/screen.scss */ +/* line 976, ../../sass/screen.scss */ .faq-toc ul li.toc-h2 a { background: #fcc883; } -/* line 979, ../../sass/screen.scss */ +/* line 980, ../../sass/screen.scss */ .faq-toc ul li.toc-h3 a { padding-left: 10px; background: #fff; font-weight: normal; } -/* line 985, ../../sass/screen.scss */ +/* line 986, ../../sass/screen.scss */ .faq-toc ul li a:hover { color: #395214; background: #bce085 !important; } -/* line 994, ../../sass/screen.scss */ +/* line 995, ../../sass/screen.scss */ .faq article { background: #fff; padding: 15px; } -/* line 997, ../../sass/screen.scss */ +/* line 998, ../../sass/screen.scss */ .faq article h2 { background-color: #fcc883; color: #ae6505; margin: -15px; padding: 15px; } -/* line 1004, ../../sass/screen.scss */ +/* line 1005, ../../sass/screen.scss */ .faq article h3 { color: #0f4c82; background-color: #9dcbf3; @@ -1076,19 +1076,19 @@ article.promo .explications > div p { margin-top: 30px; padding: 10px 15px; } -/* line 1011, ../../sass/screen.scss */ +/* line 1012, ../../sass/screen.scss */ .faq article h3:nth-child(2) { margin-top: 0; } -/* line 1016, ../../sass/screen.scss */ +/* line 1017, ../../sass/screen.scss */ .faq article ul { padding-left: 20px; } -/* line 1018, ../../sass/screen.scss */ +/* line 1019, ../../sass/screen.scss */ .faq article ul li { list-style: initial; } -/* line 1023, ../../sass/screen.scss */ +/* line 1024, ../../sass/screen.scss */ .faq article p, .faq article ul { font-family: "Lato", sans-serif; font-size: 18px;