From e485307eeab5f6a296bde18e0fafcc60b39744d3 Mon Sep 17 00:00:00 2001 From: Evarin Date: Sat, 21 Oct 2017 18:08:42 +0200 Subject: [PATCH] Fix little details --- mainsite/static/css/screen.css | 85 +++++++++++++++++--------------- mainsite/static/sass/screen.scss | 21 +++++--- 2 files changed, 58 insertions(+), 48 deletions(-) diff --git a/mainsite/static/css/screen.css b/mainsite/static/css/screen.css index 075df4e..72b6c54 100644 --- a/mainsite/static/css/screen.css +++ b/mainsite/static/css/screen.css @@ -76,7 +76,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, /* line 17, ../sass/screen.scss */ body, html { - background: #f8ef78; + background: #ece251; padding: 0; margin: 0; height: 100%; @@ -149,29 +149,30 @@ header { header { border-bottom: 3px solid #000; position: relative; - padding-bottom: 30px; + padding-bottom: 15px; margin: 30px auto; + margin-bottom: 55px; } - /* line 86, ../sass/screen.scss */ + /* line 87, ../sass/screen.scss */ header:after { content: " "; position: absolute; - width: 110%; + width: 90%; z-index: 1; - left: -5%; - bottom: 25px; + left: 5%; + bottom: -25px; border-bottom: 3px solid #000; } } -/* line 98, ../sass/screen.scss */ +/* line 99, ../sass/screen.scss */ .container { margin: 0 auto; max-width: 1200px; width: 100%; } @media screen and (min-width: 600px) { - /* line 98, ../sass/screen.scss */ + /* line 99, ../sass/screen.scss */ .container { display: table; display: flex; @@ -179,28 +180,28 @@ header { } } -/* line 109, ../sass/screen.scss */ +/* line 110, ../sass/screen.scss */ .sidebar { width: 400px; padding-right: 40px; } -/* line 113, ../sass/screen.scss */ +/* line 114, ../sass/screen.scss */ .sidebar .minimenu { display: none; } -/* line 117, ../sass/screen.scss */ +/* line 118, ../sass/screen.scss */ .sidebar ul.nav { margin-bottom: 30px; } -/* line 120, ../sass/screen.scss */ +/* line 121, ../sass/screen.scss */ .sidebar ul.nav li { display: block; font-weight: normal; margin: 7px 0; } -/* line 125, ../sass/screen.scss */ +/* line 126, ../sass/screen.scss */ .sidebar ul.nav li a { - border: 1px solid #8c0e00; + border: 1px solid rgba(140, 14, 0, 0.5); background: #fff; color: #8c0e00; padding: 10px 0; @@ -208,27 +209,27 @@ header { text-align: center; } @media screen and (min-width: 600px) { - /* line 125, ../sass/screen.scss */ + /* line 126, ../sass/screen.scss */ .sidebar ul.nav li a { box-shadow: -2px 2px 0 #f08f00; transition: box-shadow 0.4s ease-out, transform 0.4s ease-out; } - /* line 137, ../sass/screen.scss */ + /* line 138, ../sass/screen.scss */ .sidebar ul.nav li a:hover { box-shadow: -6px 6px 0 #f08f00; transform: translateX(2px) translateY(-2px); } } -/* line 148, ../sass/screen.scss */ +/* line 149, ../sass/screen.scss */ .main { background: #fff; flex-grow: 1; padding: 20px; width: 100%; - border: 1px solid rgba(140, 14, 0, 0.5); + border: 1px solid rgba(140, 14, 0, 0.7); } -/* line 155, ../sass/screen.scss */ +/* line 156, ../sass/screen.scss */ .main .last-publication a { display: block; max-width: 350px; @@ -244,35 +245,35 @@ header { box-shadow: 0 0 0 rgba(140, 14, 0, 0); transition: box-shadow 1s ease-out; } -/* line 170, ../sass/screen.scss */ +/* line 171, ../sass/screen.scss */ .main .last-publication a:hover { box-shadow: 0 0 5px #8c0e00; } -/* line 176, ../sass/screen.scss */ +/* line 177, ../sass/screen.scss */ .publication-list { margin: 10px 5px; margin-left: 30px; padding: 0 30px; max-width: 700px; } -/* line 182, ../sass/screen.scss */ +/* line 183, ../sass/screen.scss */ .publication-list .publication-entry { display: flex; align-items: center; position: relative; border-bottom: 1px solid #86abcb; } -/* line 188, ../sass/screen.scss */ +/* line 189, ../sass/screen.scss */ .publication-list .publication-entry:first-child { border-top: 1px solid #86abcb; } -/* line 192, ../sass/screen.scss */ +/* line 193, ../sass/screen.scss */ .publication-list .publication-entry > span { padding: 7px 5px; display: inline-block; } -/* line 196, ../sass/screen.scss */ +/* line 197, ../sass/screen.scss */ .publication-list .publication-entry .publication-date { text-align: right; font-weight: light; @@ -280,16 +281,16 @@ header { font-style: italic; width: 100px; } -/* line 203, ../sass/screen.scss */ +/* line 204, ../sass/screen.scss */ .publication-list .publication-entry .publication-descr { font-size: 0.9em; opacity: 0.9; } -/* line 206, ../sass/screen.scss */ +/* line 207, ../sass/screen.scss */ .publication-list .publication-entry .publication-descr:before { content: "– "; } -/* line 210, ../sass/screen.scss */ +/* line 211, ../sass/screen.scss */ .publication-list .publication-entry a.overlay { position: absolute; z-index: 1; @@ -300,12 +301,12 @@ header { } @media screen and (max-width: 599px) { - /* line 222, ../sass/screen.scss */ + /* line 223, ../sass/screen.scss */ body { padding-top: 75px; } - /* line 225, ../sass/screen.scss */ + /* line 226, ../sass/screen.scss */ header, .sidebar { position: fixed; top: 0; @@ -313,18 +314,22 @@ header { width: 100%; } - /* line 231, ../sass/screen.scss */ + /* line 232, ../sass/screen.scss */ header { z-index: 15; right: 60px; + left: 0; + width: unset; height: 60px; + line-height: 60px; } - /* line 235, ../sass/screen.scss */ + /* line 239, ../sass/screen.scss */ header img { - height: 55px; + max-height: 55px; + vertical-align: middle; } - /* line 239, ../sass/screen.scss */ + /* line 244, ../sass/screen.scss */ .sidebar { z-index: 14; background: #f8ef78; @@ -334,18 +339,18 @@ header { max-height: 100vh; overflow-y: auto; } - /* line 248, ../sass/screen.scss */ + /* line 253, ../sass/screen.scss */ .sidebar .minimenu { position: absolute; right: 5px; top: 5px; display: block; } - /* line 253, ../sass/screen.scss */ + /* line 258, ../sass/screen.scss */ .sidebar .minimenu img { height: 50px; } - /* line 257, ../sass/screen.scss */ + /* line 262, ../sass/screen.scss */ .sidebar ul.nav { display: flex; width: 100%; @@ -354,17 +359,17 @@ header { font-size: 0.95em; margin-bottom: 10px; } - /* line 265, ../sass/screen.scss */ + /* line 270, ../sass/screen.scss */ .sidebar ul.nav li { display: inline-block; min-width: 150px; margin: 5px; } - /* line 269, ../sass/screen.scss */ + /* line 274, ../sass/screen.scss */ .sidebar ul.nav li a { padding: 10px; } - /* line 276, ../sass/screen.scss */ + /* line 281, ../sass/screen.scss */ .sidebar.collapse ul { display: none; } diff --git a/mainsite/static/sass/screen.scss b/mainsite/static/sass/screen.scss index cf7716f..3691f6f 100644 --- a/mainsite/static/sass/screen.scss +++ b/mainsite/static/sass/screen.scss @@ -15,7 +15,7 @@ $switchwidth: 600px; } body, html { - background: desaturate(darken($cadreclair, 10%), 10%); + background: desaturate(darken($cadreclair, 20%), 20%); padding: 0; margin: 0; height: 100%; @@ -80,16 +80,17 @@ header { @media screen and (min-width:$switchwidth) { border-bottom: 3px solid #000; position: relative; - padding-bottom: 30px; + padding-bottom: 15px; margin: 30px auto; + margin-bottom: 55px; &:after { content: " "; position: absolute; - width: 110%; + width: 90%; z-index: 1; - left: -5%; - bottom: 25px; + left: 5%; + bottom: -25px; border-bottom: 3px solid #000; } } @@ -123,7 +124,7 @@ header { margin: 7px 0; a { - border: 1px solid $rouge; + border: 1px solid rgba($rouge, 0.5); background: $blanc; color: $rouge; padding: 10px 0; @@ -150,7 +151,7 @@ header { flex-grow: 1; padding: 20px; width: 100%; - border: 1px solid rgba($rouge, 0.5); + border: 1px solid rgba($rouge, 0.7); .last-publication a { display: block; @@ -231,9 +232,13 @@ header { header { z-index: 15; right: 60px; + left: 0; + width: unset; height: 60px; + line-height: 60px; img { - height: 55px; + max-height: 55px; + vertical-align: middle; } } .sidebar {