From 359f85a42d84caa9cd2d92bdfd146047225edc87 Mon Sep 17 00:00:00 2001 From: Evarin Date: Sat, 29 Aug 2020 21:34:28 +0200 Subject: [PATCH 1/2] Sitecof : CSS fixes --- gestioncof/cms/static/cofcms/css/screen.css | 197 +++++++++++------- gestioncof/cms/static/cofcms/sass/screen.scss | 36 ++++ gestioncof/cms/templates/cofcms/base_nav.html | 6 +- 3 files changed, 157 insertions(+), 82 deletions(-) diff --git a/gestioncof/cms/static/cofcms/css/screen.css b/gestioncof/cms/static/cofcms/css/screen.css index 5065be39..35d82c70 100644 --- a/gestioncof/cms/static/cofcms/css/screen.css +++ b/gestioncof/cms/static/cofcms/css/screen.css @@ -2,7 +2,7 @@ * In this file you should write your main styles. (or centralize your imports) * Import this file using the following HTML or equivalent: * */ -/* line 5, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -24,45 +24,45 @@ time, mark, audio, video { vertical-align: baseline; } -/* line 22, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } -/* line 103, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 103, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../var/lib/gems/2.5.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -99,66 +99,71 @@ h2 { font-size: 1.6em; } -/* line 36, ../sass/screen.scss */ +/* line 37, ../sass/screen.scss */ a { color: #CC9500; text-decoration: none; font-weight: bold; } -/* line 42, ../sass/screen.scss */ +/* line 43, ../sass/screen.scss */ h2 a { font-weight: inherit; color: inherit; } -/* line 48, ../sass/screen.scss */ +/* line 49, ../sass/screen.scss */ header a { color: #fefefe; } -/* line 51, ../sass/screen.scss */ +/* line 52, ../sass/screen.scss */ header section { display: flex; width: 100%; justify-content: space-between; align-items: stretch; } -/* line 57, ../sass/screen.scss */ +/* line 58, ../sass/screen.scss */ header section.bottom-menu { justify-content: space-around; text-align: center; background: #90001C; } -/* line 63, ../sass/screen.scss */ +/* line 64, ../sass/screen.scss */ header h1 { padding: 0 15px; } /* line 67, ../sass/screen.scss */ -header nav ul { +header nav { display: inline-flex; } /* line 69, ../sass/screen.scss */ +header nav ul { + display: inline-flex; + flex-wrap: wrap; +} +/* line 72, ../sass/screen.scss */ header nav ul li { display: inline-block; } -/* line 71, ../sass/screen.scss */ +/* line 74, ../sass/screen.scss */ header nav ul li > * { display: block; padding: 10px 15px; font-weight: bold; } -/* line 76, ../sass/screen.scss */ +/* line 79, ../sass/screen.scss */ header nav ul li > *:hover { background: #280008; } -/* line 82, ../sass/screen.scss */ +/* line 85, ../sass/screen.scss */ header nav .lang-select { display: inline-block; height: 100%; vertical-align: top; position: relative; } -/* line 88, ../sass/screen.scss */ +/* line 91, ../sass/screen.scss */ header nav .lang-select:before { content: ""; color: #fff; @@ -170,12 +175,12 @@ header nav .lang-select:before { margin: 10px 0; padding-left: 10px; } -/* line 100, ../sass/screen.scss */ +/* line 103, ../sass/screen.scss */ header nav .lang-select a { padding: 10px 20px; display: block; } -/* line 104, ../sass/screen.scss */ +/* line 107, ../sass/screen.scss */ header nav .lang-select a img { display: block; width: auto; @@ -183,34 +188,34 @@ header nav .lang-select a img { vertical-align: middle; } -/* line 115, ../sass/screen.scss */ +/* line 118, ../sass/screen.scss */ article { line-height: 1.4; } -/* line 117, ../sass/screen.scss */ +/* line 120, ../sass/screen.scss */ article p, article ul { margin: 0.4em 0; } -/* line 120, ../sass/screen.scss */ +/* line 123, ../sass/screen.scss */ article ul { padding-left: 20px; } -/* line 122, ../sass/screen.scss */ +/* line 125, ../sass/screen.scss */ article ul li { list-style: outside; } -/* line 126, ../sass/screen.scss */ +/* line 129, ../sass/screen.scss */ article:last-child { margin-bottom: 30px; } -/* line 131, ../sass/screen.scss */ +/* line 134, ../sass/screen.scss */ .container { max-width: 1000px; margin: 0 auto; position: relative; } -/* line 136, ../sass/screen.scss */ +/* line 139, ../sass/screen.scss */ .container .aside-wrap { position: absolute; top: 30px; @@ -218,7 +223,7 @@ article:last-child { width: 25%; left: 6px; } -/* line 143, ../sass/screen.scss */ +/* line 146, ../sass/screen.scss */ .container .aside-wrap .aside { color: #222; position: fixed; @@ -229,50 +234,80 @@ article:last-child { padding: 15px; box-shadow: -4px 4px 1px rgba(153, 118, 0, 0.3); } -/* line 153, ../sass/screen.scss */ +/* line 156, ../sass/screen.scss */ .container .aside-wrap .aside h2 { color: #fff; } -/* line 157, ../sass/screen.scss */ +/* line 160, ../sass/screen.scss */ .container .aside-wrap .aside .calendar { margin: 0 auto; display: block; } -/* line 162, ../sass/screen.scss */ +/* line 165, ../sass/screen.scss */ .container .aside-wrap .aside a { color: #805d00; } -/* line 164, ../sass/screen.scss */ +/* line 167, ../sass/screen.scss */ .container .aside-wrap .aside a:hover { text-decoration: underline; } -/* line 169, ../sass/screen.scss */ +/* line 172, ../sass/screen.scss */ .container .aside-wrap .aside .aside-content { max-height: 70vh; max-height: calc(80vh - 150px); overflow-y: auto; } -/* line 176, ../sass/screen.scss */ +/* line 179, ../sass/screen.scss */ .container .aside-wrap .aside ul.directory li { list-style: "." inside; padding-left: 10px; text-indent: -10px; margin-bottom: 5px; } -/* line 186, ../sass/screen.scss */ +/* line 189, ../sass/screen.scss */ .container .content { max-width: 900px; margin-left: auto; margin-right: 6px; } -/* line 191, ../sass/screen.scss */ +/* line 194, ../sass/screen.scss */ +.container .content h3 { + font-weight: bold; + font-size: 1.2em; +} +/* line 199, ../sass/screen.scss */ +.container .content h4 { + font-weight: bold; + font-style: italic; +} +/* line 204, ../sass/screen.scss */ +.container .content b, .container .content strong { + font-weight: bold; +} +/* line 208, ../sass/screen.scss */ +.container .content i { + font-style: italic; +} +/* line 213, ../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 { + padding-left: 1em; +} +/* line 219, ../sass/screen.scss */ +.container .content .intro ul li, .container .content article.paragraph ul li, .container .content article.entry .desc ul li { + list-style: disc; +} +/* line 222, ../sass/screen.scss */ +.container .content .intro ol li, .container .content article.paragraph ol li, .container .content article.entry .desc ol li { + list-style: arabic; +} +/* line 227, ../sass/screen.scss */ .container .content .intro { border-bottom: 3px solid #7f7f7f; margin: 20px 0; margin-top: 5px; padding: 15px 5px; } -/* line 200, ../sass/screen.scss */ +/* line 236, ../sass/screen.scss */ .container .content section article { background: #fff; padding: 20px 30px; @@ -280,31 +315,31 @@ article:last-child { border: 1px solid rgba(153, 118, 0, 0.1); border-radius: 2px; } -/* line 206, ../sass/screen.scss */ +/* line 242, ../sass/screen.scss */ .container .content section article a { color: #CC9500; } -/* line 211, ../sass/screen.scss */ +/* line 247, ../sass/screen.scss */ .container .content section article + h2 { margin-top: 15px; } -/* line 215, ../sass/screen.scss */ +/* line 251, ../sass/screen.scss */ .container .content section article + article { margin-top: 25px; } -/* line 219, ../sass/screen.scss */ +/* line 255, ../sass/screen.scss */ .container .content section .image { margin: 15px 0; text-align: center; padding: 20px; } -/* line 224, ../sass/screen.scss */ +/* line 260, ../sass/screen.scss */ .container .content section .image img { max-width: 100%; height: auto; box-shadow: -7px 7px 1px rgba(153, 118, 0, 0.2); } -/* line 232, ../sass/screen.scss */ +/* line 268, ../sass/screen.scss */ .container .content section.directory article.entry { width: 80%; max-width: 600px; @@ -312,7 +347,7 @@ article:last-child { position: relative; margin-left: 6%; } -/* line 239, ../sass/screen.scss */ +/* line 275, ../sass/screen.scss */ .container .content section.directory article.entry .entry-image { display: block; float: right; @@ -327,31 +362,31 @@ article:last-child { margin-bottom: 10px; transform: translateX(10px); } -/* line 253, ../sass/screen.scss */ +/* line 289, ../sass/screen.scss */ .container .content section.directory article.entry .entry-image img { width: auto; height: auto; max-width: 100%; max-height: 100%; } -/* line 261, ../sass/screen.scss */ +/* line 297, ../sass/screen.scss */ .container .content section.directory article.entry ul.links { margin-top: 10px; border-top: 1px solid #90001C; padding-top: 10px; } -/* line 269, ../sass/screen.scss */ +/* line 305, ../sass/screen.scss */ .container .content section.actuhome { display: flex; flex-wrap: wrap; justify-content: space-around; align-items: top; } -/* line 275, ../sass/screen.scss */ +/* line 311, ../sass/screen.scss */ .container .content section.actuhome article + article { margin: 0; } -/* line 279, ../sass/screen.scss */ +/* line 315, ../sass/screen.scss */ .container .content section.actuhome article.actu { position: relative; background: none; @@ -361,7 +396,7 @@ article:last-child { min-width: 300px; flex: 1; } -/* line 288, ../sass/screen.scss */ +/* line 324, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-header { position: relative; box-shadow: -4px 5px 1px rgba(153, 118, 0, 0.3); @@ -375,7 +410,7 @@ article:last-child { background-position: center center; background-repeat: no-repeat; } -/* line 301, ../sass/screen.scss */ +/* line 337, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-header h2 { position: absolute; width: 100%; @@ -385,11 +420,11 @@ article:last-child { text-shadow: 0 0 5px rgba(153, 118, 0, 0.8); background: linear-gradient(to top, rgba(0, 0, 0, 0.7), transparent); } -/* line 309, ../sass/screen.scss */ +/* line 345, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-header h2 a { color: #fff; } -/* line 315, ../sass/screen.scss */ +/* line 351, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-misc { background: white; box-shadow: -2px 2px 1px rgba(153, 118, 0, 0.2); @@ -399,17 +434,17 @@ article:last-child { padding: 15px; padding-top: 5px; } -/* line 324, ../sass/screen.scss */ +/* line 360, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-misc .actu-minical { display: block; } -/* line 327, ../sass/screen.scss */ +/* line 363, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-misc .actu-dates { display: block; text-align: right; font-size: 0.9em; } -/* line 334, ../sass/screen.scss */ +/* line 370, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-overlay { display: block; background: none; @@ -421,81 +456,81 @@ article:last-child { z-index: 5; opacity: 0; } -/* line 350, ../sass/screen.scss */ +/* line 386, ../sass/screen.scss */ .container .content section.actulist article.actu { display: flex; width: 100%; padding: 0; } -/* line 355, ../sass/screen.scss */ +/* line 391, ../sass/screen.scss */ .container .content section.actulist article.actu .actu-image { width: 30%; max-width: 200px; background-size: cover; background-position: center center; } -/* line 361, ../sass/screen.scss */ +/* line 397, ../sass/screen.scss */ .container .content section.actulist article.actu .actu-infos { padding: 15px; flex: 1; } -/* line 365, ../sass/screen.scss */ +/* line 401, ../sass/screen.scss */ .container .content section.actulist article.actu .actu-infos .actu-dates { font-weight: bold; font-size: 0.9em; } -/* line 375, ../sass/screen.scss */ +/* line 411, ../sass/screen.scss */ .container .aside-wrap + .content { max-width: 70%; } -/* line 380, ../sass/screen.scss */ +/* line 416, ../sass/screen.scss */ .calendar { color: rgba(0, 0, 0, 0.8); width: 200px; } -/* line 384, ../sass/screen.scss */ +/* line 420, ../sass/screen.scss */ .calendar td, .calendar th { text-align: center; vertical-align: middle; border: 2px solid transparent; padding: 1px; } -/* line 391, ../sass/screen.scss */ +/* line 427, ../sass/screen.scss */ .calendar th { font-weight: bold; } -/* line 395, ../sass/screen.scss */ +/* line 431, ../sass/screen.scss */ .calendar td { font-size: 0.8em; width: 28px; height: 28px; } -/* line 400, ../sass/screen.scss */ +/* line 436, ../sass/screen.scss */ .calendar td.out { opacity: 0.3; } -/* line 403, ../sass/screen.scss */ +/* line 439, ../sass/screen.scss */ .calendar td.today { border-bottom-color: #000; } -/* line 406, ../sass/screen.scss */ +/* line 442, ../sass/screen.scss */ .calendar td:nth-child(7), .calendar td:nth-child(6) { background: rgba(0, 0, 0, 0.2); } -/* line 409, ../sass/screen.scss */ +/* line 445, ../sass/screen.scss */ .calendar td.hasevent { position: relative; font-weight: bold; color: #90001C; font-size: 1em; } -/* line 415, ../sass/screen.scss */ +/* line 451, ../sass/screen.scss */ .calendar td.hasevent > a { padding: 3px; color: #90001C !important; } -/* line 420, ../sass/screen.scss */ +/* line 456, ../sass/screen.scss */ .calendar td.hasevent ul.cal-events { text-align: left; display: none; @@ -508,11 +543,11 @@ article:last-child { padding: 5px; background-color: #90001C; } -/* line 433, ../sass/screen.scss */ +/* line 469, ../sass/screen.scss */ .calendar td.hasevent ul.cal-events .datename { display: none; } -/* line 436, ../sass/screen.scss */ +/* line 472, ../sass/screen.scss */ .calendar td.hasevent ul.cal-events:before { top: -12px; left: 38px; @@ -521,33 +556,33 @@ article:last-child { border: 6px solid transparent; border-bottom-color: #90001C; } -/* line 444, ../sass/screen.scss */ +/* line 480, ../sass/screen.scss */ .calendar td.hasevent ul.cal-events a { color: #fff; } -/* line 449, ../sass/screen.scss */ +/* line 485, ../sass/screen.scss */ .calendar td.hasevent > a:hover { background-color: #90001C; color: #fff !important; } -/* line 453, ../sass/screen.scss */ +/* line 489, ../sass/screen.scss */ .calendar td.hasevent > a:hover + ul.cal-events { display: block; } -/* line 461, ../sass/screen.scss */ +/* line 497, ../sass/screen.scss */ #calendar-wrap .details { border-top: 1px solid #90001C; margin-top: 15px; padding-top: 10px; } -/* line 466, ../sass/screen.scss */ +/* line 502, ../sass/screen.scss */ #calendar-wrap .details li.datename { font-weight: bold; font-size: 1.1em; margin-bottom: 5px; } -/* line 467, ../sass/screen.scss */ +/* line 503, ../sass/screen.scss */ #calendar-wrap .details li.datename:after { content: " :"; } diff --git a/gestioncof/cms/static/cofcms/sass/screen.scss b/gestioncof/cms/static/cofcms/sass/screen.scss index 0f2001f8..f99b9129 100644 --- a/gestioncof/cms/static/cofcms/sass/screen.scss +++ b/gestioncof/cms/static/cofcms/sass/screen.scss @@ -33,6 +33,7 @@ h2 { font-size: 1.6em; } + a { color: $lien; text-decoration: none; @@ -64,8 +65,10 @@ header { padding: 0 15px; } nav { + display: inline-flex; ul { display: inline-flex; + flex-wrap: wrap; li { display: inline-block; & > * { @@ -188,6 +191,39 @@ article { margin-left: auto; margin-right: 6px; + h3 { + font-weight: bold; + font-size: 1.2em; + } + + h4 { + font-weight: bold; + font-style: italic; + } + + b, strong { + font-weight: bold; + } + + i { + font-style: italic; + } + + .intro, article.paragraph, article.entry .desc { + ul, ol { + padding-left: 1em; + li { + + } + } + ul li { + list-style: disc; + } + ol li { + list-style: arabic; + } + } + .intro { border-bottom: 3px solid darken($fond, 50%); margin: 20px 0; diff --git a/gestioncof/cms/templates/cofcms/base_nav.html b/gestioncof/cms/templates/cofcms/base_nav.html index b7ce4c66..f8b3fa65 100644 --- a/gestioncof/cms/templates/cofcms/base_nav.html +++ b/gestioncof/cms/templates/cofcms/base_nav.html @@ -4,7 +4,11 @@
  • {% if item.link_page %} - {{ item.link_page.title }} + {% if item.link_page.seo_title %} + {{ item.link_page.seo_title }} + {% else %} + {{ item.link_page.title }} + {% endif %} {% else %} From 72210e198006e3431d7d424b23748174cbe182ef Mon Sep 17 00:00:00 2001 From: Evarin Date: Sat, 29 Aug 2020 22:18:32 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Sitecof=20:=20am=C3=A9liogrations=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestioncof/cms/static/cofcms/css/ie.css | 5 - gestioncof/cms/static/cofcms/css/print.css | 3 - gestioncof/cms/static/cofcms/css/screen.css | 258 +++++++++++------- .../cms/static/cofcms/sass/_colors.scss | 2 +- gestioncof/cms/static/cofcms/sass/screen.scss | 63 ++++- gestioncof/cms/templates/cofcms/calendar.html | 2 +- 6 files changed, 207 insertions(+), 126 deletions(-) delete mode 100644 gestioncof/cms/static/cofcms/css/ie.css delete mode 100644 gestioncof/cms/static/cofcms/css/print.css diff --git a/gestioncof/cms/static/cofcms/css/ie.css b/gestioncof/cms/static/cofcms/css/ie.css deleted file mode 100644 index 5cd5b6c5..00000000 --- a/gestioncof/cms/static/cofcms/css/ie.css +++ /dev/null @@ -1,5 +0,0 @@ -/* Welcome to Compass. Use this file to write IE specific override styles. - * Import this file using the following HTML or equivalent: - * */ diff --git a/gestioncof/cms/static/cofcms/css/print.css b/gestioncof/cms/static/cofcms/css/print.css deleted file mode 100644 index b0e9e456..00000000 --- a/gestioncof/cms/static/cofcms/css/print.css +++ /dev/null @@ -1,3 +0,0 @@ -/* Welcome to Compass. Use this file to define print styles. - * Import this file using the following HTML or equivalent: - * */ diff --git a/gestioncof/cms/static/cofcms/css/screen.css b/gestioncof/cms/static/cofcms/css/screen.css index 35d82c70..c81bf304 100644 --- a/gestioncof/cms/static/cofcms/css/screen.css +++ b/gestioncof/cms/static/cofcms/css/screen.css @@ -76,94 +76,105 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, body { background: #fefefe; font: 17px "Source Sans Pro", "sans-serif"; + color: #000; } -/* line 19, ../sass/screen.scss */ +/* line 20, ../sass/screen.scss */ header { background: #5B0012; } -/* line 23, ../sass/screen.scss */ +/* line 24, ../sass/screen.scss */ h1, h2 { font-family: "Carter One", "serif"; color: #90001C; } -/* line 28, ../sass/screen.scss */ +/* line 29, ../sass/screen.scss */ h1 { font-size: 2.3em; } -/* line 32, ../sass/screen.scss */ +/* line 33, ../sass/screen.scss */ h2 { font-size: 1.6em; } -/* line 37, ../sass/screen.scss */ +/* line 38, ../sass/screen.scss */ a { color: #CC9500; text-decoration: none; font-weight: bold; + padding: 0 3px; + margin: 0 -3px; +} +/* line 44, ../sass/screen.scss */ +a:hover { + text-decoration: underline; } -/* line 43, ../sass/screen.scss */ +/* line 49, ../sass/screen.scss */ h2 a { font-weight: inherit; color: inherit; } -/* line 49, ../sass/screen.scss */ +/* line 55, ../sass/screen.scss */ header a { color: #fefefe; } -/* line 52, ../sass/screen.scss */ +/* line 57, ../sass/screen.scss */ +header a:hover { + text-decoration: none; +} +/* line 61, ../sass/screen.scss */ header section { display: flex; width: 100%; justify-content: space-between; align-items: stretch; } -/* line 58, ../sass/screen.scss */ +/* line 67, ../sass/screen.scss */ header section.bottom-menu { justify-content: space-around; text-align: center; background: #90001C; } -/* line 64, ../sass/screen.scss */ +/* line 73, ../sass/screen.scss */ header h1 { padding: 0 15px; } -/* line 67, ../sass/screen.scss */ +/* line 76, ../sass/screen.scss */ header nav { display: inline-flex; } -/* line 69, ../sass/screen.scss */ +/* line 78, ../sass/screen.scss */ header nav ul { display: inline-flex; flex-wrap: wrap; } -/* line 72, ../sass/screen.scss */ +/* line 81, ../sass/screen.scss */ header nav ul li { display: inline-block; } -/* line 74, ../sass/screen.scss */ +/* line 83, ../sass/screen.scss */ header nav ul li > * { display: block; padding: 10px 15px; font-weight: bold; } -/* line 79, ../sass/screen.scss */ +/* line 88, ../sass/screen.scss */ header nav ul li > *:hover { background: #280008; } -/* line 85, ../sass/screen.scss */ +/* line 94, ../sass/screen.scss */ header nav .lang-select { display: inline-block; height: 100%; vertical-align: top; position: relative; } -/* line 91, ../sass/screen.scss */ +/* line 100, ../sass/screen.scss */ header nav .lang-select:before { content: ""; color: #fff; @@ -175,12 +186,12 @@ header nav .lang-select:before { margin: 10px 0; padding-left: 10px; } -/* line 103, ../sass/screen.scss */ +/* line 112, ../sass/screen.scss */ header nav .lang-select a { padding: 10px 20px; display: block; } -/* line 107, ../sass/screen.scss */ +/* line 116, ../sass/screen.scss */ header nav .lang-select a img { display: block; width: auto; @@ -188,34 +199,34 @@ header nav .lang-select a img { vertical-align: middle; } -/* line 118, ../sass/screen.scss */ +/* line 127, ../sass/screen.scss */ article { line-height: 1.4; } -/* line 120, ../sass/screen.scss */ +/* line 129, ../sass/screen.scss */ article p, article ul { margin: 0.4em 0; } -/* line 123, ../sass/screen.scss */ +/* line 132, ../sass/screen.scss */ article ul { padding-left: 20px; } -/* line 125, ../sass/screen.scss */ +/* line 134, ../sass/screen.scss */ article ul li { list-style: outside; } -/* line 129, ../sass/screen.scss */ +/* line 138, ../sass/screen.scss */ article:last-child { margin-bottom: 30px; } -/* line 134, ../sass/screen.scss */ +/* line 143, ../sass/screen.scss */ .container { max-width: 1000px; margin: 0 auto; position: relative; } -/* line 139, ../sass/screen.scss */ +/* line 148, ../sass/screen.scss */ .container .aside-wrap { position: absolute; top: 30px; @@ -223,7 +234,7 @@ article:last-child { width: 25%; left: 6px; } -/* line 146, ../sass/screen.scss */ +/* line 155, ../sass/screen.scss */ .container .aside-wrap .aside { color: #222; position: fixed; @@ -232,114 +243,123 @@ article:last-child { width: 100%; background: #FFC500; padding: 15px; - box-shadow: -4px 4px 1px rgba(153, 118, 0, 0.3); + box-shadow: -3px 3px 1px rgba(34, 6, 12, 0.3); } -/* line 156, ../sass/screen.scss */ +/* line 165, ../sass/screen.scss */ .container .aside-wrap .aside h2 { - color: #fff; + color: #000; } -/* line 160, ../sass/screen.scss */ +/* line 169, ../sass/screen.scss */ .container .aside-wrap .aside .calendar { margin: 0 auto; display: block; } -/* line 165, ../sass/screen.scss */ -.container .aside-wrap .aside a { - color: #805d00; +/* line 173, ../sass/screen.scss */ +.container .aside-wrap .aside .calendar:last-child { + margin-bottom: 40px; } -/* line 167, ../sass/screen.scss */ +/* line 178, ../sass/screen.scss */ +.container .aside-wrap .aside a { + color: #000; + text-decoration: none; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.7) 30%, rgba(255, 255, 255, 0) 30%); +} +/* line 182, ../sass/screen.scss */ .container .aside-wrap .aside a:hover { text-decoration: underline; } -/* line 172, ../sass/screen.scss */ +/* line 187, ../sass/screen.scss */ .container .aside-wrap .aside .aside-content { max-height: 70vh; max-height: calc(80vh - 150px); overflow-y: auto; + overflow-x: hidden; } -/* line 179, ../sass/screen.scss */ +/* line 195, ../sass/screen.scss */ .container .aside-wrap .aside ul.directory li { - list-style: "." inside; + list-style: "|" inside; padding-left: 10px; text-indent: -10px; margin-bottom: 5px; } -/* line 189, ../sass/screen.scss */ +/* line 205, ../sass/screen.scss */ .container .content { max-width: 900px; margin-left: auto; margin-right: 6px; } -/* line 194, ../sass/screen.scss */ +/* line 210, ../sass/screen.scss */ .container .content h3 { font-weight: bold; font-size: 1.2em; } -/* line 199, ../sass/screen.scss */ +/* line 215, ../sass/screen.scss */ .container .content h4 { font-weight: bold; font-style: italic; } -/* line 204, ../sass/screen.scss */ +/* line 220, ../sass/screen.scss */ .container .content b, .container .content strong { font-weight: bold; } -/* line 208, ../sass/screen.scss */ +/* line 224, ../sass/screen.scss */ .container .content i { font-style: italic; } -/* line 213, ../sass/screen.scss */ +/* line 228, ../sass/screen.scss */ +.container .content p a { + color: #000; + background-image: linear-gradient(to top, rgba(255, 197, 0, 0.8) 30%, rgba(255, 197, 0, 0) 30%); + text-decoration: none; +} +/* line 235, ../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 { padding-left: 1em; } -/* line 219, ../sass/screen.scss */ +/* line 241, ../sass/screen.scss */ .container .content .intro ul li, .container .content article.paragraph ul li, .container .content article.entry .desc ul li { list-style: disc; } -/* line 222, ../sass/screen.scss */ +/* line 244, ../sass/screen.scss */ .container .content .intro ol li, .container .content article.paragraph ol li, .container .content article.entry .desc ol li { list-style: arabic; } -/* line 227, ../sass/screen.scss */ +/* line 249, ../sass/screen.scss */ .container .content .intro { border-bottom: 3px solid #7f7f7f; margin: 20px 0; margin-top: 5px; padding: 15px 5px; } -/* line 236, ../sass/screen.scss */ +/* line 258, ../sass/screen.scss */ .container .content section article { background: #fff; padding: 20px 30px; - box-shadow: -4px 4px 1px rgba(153, 118, 0, 0.3); - border: 1px solid rgba(153, 118, 0, 0.1); + box-shadow: -3px 3px 1px rgba(34, 6, 12, 0.3); + border: 1px solid rgba(34, 6, 12, 0.1); border-radius: 2px; } -/* line 242, ../sass/screen.scss */ -.container .content section article a { - color: #CC9500; -} -/* line 247, ../sass/screen.scss */ +/* line 266, ../sass/screen.scss */ .container .content section article + h2 { margin-top: 15px; } -/* line 251, ../sass/screen.scss */ +/* line 270, ../sass/screen.scss */ .container .content section article + article { margin-top: 25px; } -/* line 255, ../sass/screen.scss */ +/* line 274, ../sass/screen.scss */ .container .content section .image { margin: 15px 0; text-align: center; padding: 20px; } -/* line 260, ../sass/screen.scss */ +/* line 279, ../sass/screen.scss */ .container .content section .image img { max-width: 100%; height: auto; - box-shadow: -7px 7px 1px rgba(153, 118, 0, 0.2); + box-shadow: -7px 7px 1px rgba(34, 6, 12, 0.2); } -/* line 268, ../sass/screen.scss */ +/* line 287, ../sass/screen.scss */ .container .content section.directory article.entry { width: 80%; max-width: 600px; @@ -347,46 +367,46 @@ article:last-child { position: relative; margin-left: 6%; } -/* line 275, ../sass/screen.scss */ +/* line 294, ../sass/screen.scss */ .container .content section.directory article.entry .entry-image { display: block; float: right; width: 150px; background: #fff; - box-shadow: -4px 4px 1px rgba(153, 118, 0, 0.2); - border-right: 1px solid rgba(153, 118, 0, 0.2); - border-top: 1px solid rgba(153, 118, 0, 0.2); + box-shadow: -4px 4px 1px rgba(34, 6, 12, 0.2); + border-right: 1px solid rgba(34, 6, 12, 0.2); + border-top: 1px solid rgba(34, 6, 12, 0.2); padding: 1px; overflow: hidden; margin-left: 10px; margin-bottom: 10px; transform: translateX(10px); } -/* line 289, ../sass/screen.scss */ +/* line 308, ../sass/screen.scss */ .container .content section.directory article.entry .entry-image img { width: auto; height: auto; max-width: 100%; max-height: 100%; } -/* line 297, ../sass/screen.scss */ +/* line 316, ../sass/screen.scss */ .container .content section.directory article.entry ul.links { margin-top: 10px; border-top: 1px solid #90001C; padding-top: 10px; } -/* line 305, ../sass/screen.scss */ +/* line 324, ../sass/screen.scss */ .container .content section.actuhome { display: flex; flex-wrap: wrap; justify-content: space-around; align-items: top; } -/* line 311, ../sass/screen.scss */ +/* line 330, ../sass/screen.scss */ .container .content section.actuhome article + article { margin: 0; } -/* line 315, ../sass/screen.scss */ +/* line 334, ../sass/screen.scss */ .container .content section.actuhome article.actu { position: relative; background: none; @@ -396,12 +416,12 @@ article:last-child { min-width: 300px; flex: 1; } -/* line 324, ../sass/screen.scss */ +/* line 343, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-header { position: relative; - box-shadow: -4px 5px 1px rgba(153, 118, 0, 0.3); - border-right: 1px solid rgba(153, 118, 0, 0.2); - border-top: 1px solid rgba(153, 118, 0, 0.2); + box-shadow: -4px 5px 1px rgba(34, 6, 12, 0.3); + border-right: 1px solid rgba(34, 6, 12, 0.2); + border-top: 1px solid rgba(34, 6, 12, 0.2); min-height: 180px; padding: 0; margin: 0; @@ -410,41 +430,41 @@ article:last-child { background-position: center center; background-repeat: no-repeat; } -/* line 337, ../sass/screen.scss */ +/* line 356, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-header h2 { position: absolute; width: 100%; bottom: 0; left: 0; padding: 5px; - text-shadow: 0 0 5px rgba(153, 118, 0, 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); } -/* line 345, ../sass/screen.scss */ +/* line 364, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-header h2 a { color: #fff; } -/* line 351, ../sass/screen.scss */ +/* line 370, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-misc { background: white; - box-shadow: -2px 2px 1px rgba(153, 118, 0, 0.2); - border: 1px solid rgba(153, 118, 0, 0.2); + box-shadow: -2px 2px 1px rgba(34, 6, 12, 0.2); + border: 1px solid rgba(34, 6, 12, 0.2); border-radius: 2px; margin: 0 10px; padding: 15px; padding-top: 5px; } -/* line 360, ../sass/screen.scss */ +/* line 379, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-misc .actu-minical { display: block; } -/* line 363, ../sass/screen.scss */ +/* line 382, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-misc .actu-dates { display: block; text-align: right; font-size: 0.9em; } -/* line 370, ../sass/screen.scss */ +/* line 389, ../sass/screen.scss */ .container .content section.actuhome article.actu .actu-overlay { display: block; background: none; @@ -456,98 +476,100 @@ article:last-child { z-index: 5; opacity: 0; } -/* line 386, ../sass/screen.scss */ +/* line 405, ../sass/screen.scss */ .container .content section.actulist article.actu { display: flex; width: 100%; padding: 0; } -/* line 391, ../sass/screen.scss */ +/* line 410, ../sass/screen.scss */ .container .content section.actulist article.actu .actu-image { width: 30%; max-width: 200px; background-size: cover; background-position: center center; } -/* line 397, ../sass/screen.scss */ +/* line 416, ../sass/screen.scss */ .container .content section.actulist article.actu .actu-infos { padding: 15px; flex: 1; } -/* line 401, ../sass/screen.scss */ +/* line 420, ../sass/screen.scss */ .container .content section.actulist article.actu .actu-infos .actu-dates { font-weight: bold; font-size: 0.9em; } -/* line 411, ../sass/screen.scss */ +/* line 430, ../sass/screen.scss */ .container .aside-wrap + .content { max-width: 70%; } -/* line 416, ../sass/screen.scss */ +/* line 435, ../sass/screen.scss */ .calendar { color: rgba(0, 0, 0, 0.8); width: 200px; } -/* line 420, ../sass/screen.scss */ +/* line 439, ../sass/screen.scss */ .calendar td, .calendar th { text-align: center; vertical-align: middle; border: 2px solid transparent; padding: 1px; } -/* line 427, ../sass/screen.scss */ +/* line 446, ../sass/screen.scss */ .calendar th { font-weight: bold; } -/* line 431, ../sass/screen.scss */ +/* line 450, ../sass/screen.scss */ .calendar td { font-size: 0.8em; width: 28px; height: 28px; } -/* line 436, ../sass/screen.scss */ +/* line 455, ../sass/screen.scss */ .calendar td.out { opacity: 0.3; } -/* line 439, ../sass/screen.scss */ +/* line 458, ../sass/screen.scss */ .calendar td.today { border-bottom-color: #000; } -/* line 442, ../sass/screen.scss */ +/* line 461, ../sass/screen.scss */ .calendar td:nth-child(7), .calendar td:nth-child(6) { background: rgba(0, 0, 0, 0.2); } -/* line 445, ../sass/screen.scss */ +/* line 464, ../sass/screen.scss */ .calendar td.hasevent { position: relative; font-weight: bold; color: #90001C; font-size: 1em; } -/* line 451, ../sass/screen.scss */ +/* line 470, ../sass/screen.scss */ .calendar td.hasevent > a { padding: 3px; color: #90001C !important; + background: none !important; } -/* line 456, ../sass/screen.scss */ +/* line 476, ../sass/screen.scss */ .calendar td.hasevent ul.cal-events { + font-size: 0.9em; text-align: left; display: none; position: absolute; z-index: 2; background: #fff; - width: 150px; + width: 100px; left: -30px; margin-top: 10px; padding: 5px; background-color: #90001C; } -/* line 469, ../sass/screen.scss */ +/* line 489, ../sass/screen.scss */ .calendar td.hasevent ul.cal-events .datename { display: none; } -/* line 472, ../sass/screen.scss */ +/* line 492, ../sass/screen.scss */ .calendar td.hasevent ul.cal-events:before { top: -12px; left: 38px; @@ -556,33 +578,57 @@ article:last-child { border: 6px solid transparent; border-bottom-color: #90001C; } -/* line 480, ../sass/screen.scss */ +/* line 500, ../sass/screen.scss */ .calendar td.hasevent ul.cal-events a { color: #fff; + background: none !important; } -/* line 485, ../sass/screen.scss */ +/* line 506, ../sass/screen.scss */ .calendar td.hasevent > a:hover { background-color: #90001C; color: #fff !important; } -/* line 489, ../sass/screen.scss */ +/* line 510, ../sass/screen.scss */ .calendar td.hasevent > a:hover + ul.cal-events { display: block; } +/* line 518, ../sass/screen.scss */ +.calendar tr.head th { + position: relative; +} +/* line 520, ../sass/screen.scss */ +.calendar tr.head th a { + position: absolute; + display: block; + width: 150%; + padding: 5px; + top: -5px; + background: none !important; +} +/* line 528, ../sass/screen.scss */ +.calendar tr.head th:first-child a { + left: 0; + text-align: left; +} +/* line 532, ../sass/screen.scss */ +.calendar tr.head th:last-child a { + text-align: right; + right: 0; +} -/* line 497, ../sass/screen.scss */ +/* line 540, ../sass/screen.scss */ #calendar-wrap .details { border-top: 1px solid #90001C; margin-top: 15px; padding-top: 10px; } -/* line 502, ../sass/screen.scss */ +/* line 545, ../sass/screen.scss */ #calendar-wrap .details li.datename { font-weight: bold; font-size: 1.1em; margin-bottom: 5px; } -/* line 503, ../sass/screen.scss */ +/* line 546, ../sass/screen.scss */ #calendar-wrap .details li.datename:after { content: " :"; } diff --git a/gestioncof/cms/static/cofcms/sass/_colors.scss b/gestioncof/cms/static/cofcms/sass/_colors.scss index 2d295b98..e07429f8 100644 --- a/gestioncof/cms/static/cofcms/sass/_colors.scss +++ b/gestioncof/cms/static/cofcms/sass/_colors.scss @@ -5,7 +5,7 @@ $aside: #FFC500; $titre: $sousbandeau; $lien: #CC9500; $headerlien: $fond; -$ombres: darken($aside, 20%); +$ombres: darken(desaturate($bandeau, 30%), 10%); $bodyfont: "Source Sans Pro", "sans-serif"; $headfont: "Carter One", "serif"; diff --git a/gestioncof/cms/static/cofcms/sass/screen.scss b/gestioncof/cms/static/cofcms/sass/screen.scss index f99b9129..f707be7b 100644 --- a/gestioncof/cms/static/cofcms/sass/screen.scss +++ b/gestioncof/cms/static/cofcms/sass/screen.scss @@ -14,6 +14,7 @@ body { background: $fond; font: 17px $bodyfont; + color: #000; } header { @@ -38,6 +39,11 @@ a { color: $lien; text-decoration: none; font-weight: bold; + padding: 0 3px; + margin: 0 -3px; + &:hover { + text-decoration: underline; + } } h2 a { @@ -48,6 +54,9 @@ h2 a { header { a { color: $headerlien; + &:hover { + text-decoration: none; + } } section { display: flex; @@ -151,19 +160,25 @@ article { width: 100%; background: $aside; padding: 15px; - box-shadow: -4px 4px 1px rgba($ombres, 0.3); + box-shadow: -3px 3px 1px rgba($ombres, 0.3); h2 { - color: #fff; + color: #000; } .calendar { margin: 0 auto; display: block; + + &:last-child { + margin-bottom: 40px; + } } a { - color: darken($lien, 15%); + color: #000; + text-decoration: none; + background-image: linear-gradient(to top, rgba(#fff, 0.7) 30%, rgba(#fff, 0) 30%); &:hover { text-decoration: underline; } @@ -173,11 +188,12 @@ article { max-height: 70vh; max-height: calc(80vh - 150px); overflow-y: auto; + overflow-x: hidden; } ul.directory { li { - list-style: "." inside; + list-style: "|" inside; padding-left: 10px; text-indent: -10px; margin-bottom: 5px; @@ -209,6 +225,12 @@ article { font-style: italic; } + p 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 { padding-left: 1em; @@ -236,12 +258,9 @@ article { article { background: #fff; padding: 20px 30px;; - box-shadow: -4px 4px 1px rgba($ombres, 0.3); + box-shadow: -3px 3px 1px rgba($ombres, 0.3); border: 1px solid rgba($ombres, 0.1); border-radius: 2px; - a { - color: $lien; - } } article + h2 { @@ -451,16 +470,17 @@ article { & > a { padding: 3px; color: $sousbandeau !important; + background: none !important; } ul.cal-events { - + font-size: 0.9em; text-align: left; display: none; position: absolute; z-index: 2; background: #fff; - width: 150px; + width: 100px; left: -30px; margin-top: 10px; padding: 5px; @@ -479,6 +499,7 @@ article { } a { color: #fff; + background: none !important; } } @@ -492,6 +513,28 @@ article { } } } + + tr.head { + th { + position: relative; + a { + position: absolute; + display: block; + width: 150%; + padding: 5px; + top: -5px; + background: none !important; + } + &:first-child a { + left: 0; + text-align: left; + } + &:last-child a { + text-align: right; + right: 0; + } + } + } } #calendar-wrap .details { diff --git a/gestioncof/cms/templates/cofcms/calendar.html b/gestioncof/cms/templates/cofcms/calendar.html index a6a9d87e..c06a23c7 100644 --- a/gestioncof/cms/templates/cofcms/calendar.html +++ b/gestioncof/cms/templates/cofcms/calendar.html @@ -1,7 +1,7 @@ {% load wagtailcore_tags wagtailroutablepage_tags static i18n %} - +
    < {{ this_month|date:"F Y" }} >