From 31d14648056d3a3e26c0b3c8e63e3c302a6c0ecf Mon Sep 17 00:00:00 2001 From: Xaver Maierhofer Date: Thu, 19 May 2016 17:47:32 +0200 Subject: [PATCH] clean scss (#21) * [TASK] CGL - Formation * [TASK] Generic font fallback * [TASK] Remove swp file --- lib/infobox/.charts.js.swp | Bin 16384 -> 0 bytes scss/_filters.scss | 6 +++--- scss/_legend.scss | 33 ++++++++++++++------------------- scss/_map.scss | 26 +++++++++++++++++++------- scss/_reset.scss | 6 ++++++ scss/_shadow.scss | 24 ++++++++++-------------- scss/main.scss | 16 ++++++++-------- 7 files changed, 60 insertions(+), 51 deletions(-) delete mode 100644 lib/infobox/.charts.js.swp diff --git a/lib/infobox/.charts.js.swp b/lib/infobox/.charts.js.swp deleted file mode 100644 index 243ae9186354c11289bebd332b34f45a8cab25d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 DJvC;f diff --git a/scss/_filters.scss b/scss/_filters.scss index 2e69dde..32e1f8c 100644 --- a/scss/_filters.scss +++ b/scss/_filters.scss @@ -2,15 +2,15 @@ margin: 0; display: flex; flex-wrap: wrap; - font-family: Roboto; + font-family: Roboto, sans-serif; font-size: 0.83em; font-weight: bold; padding: 0 6pt 6pt !important; - li { + li { border-radius: 20pt; display: flex; - padding: 0pt 0 0pt 8pt; + padding: 0 0 0 8pt; margin: 3pt; align-items: center; background: #009ee0; diff --git a/scss/_legend.scss b/scss/_legend.scss index 9f66ed0..c6394c0 100644 --- a/scss/_legend.scss +++ b/scss/_legend.scss @@ -1,28 +1,23 @@ -.legend .symbol -{ - width: 1em; - height: 1em; - border-radius: 50%; - display: inline-block; - vertical-align: -5%; +.legend .symbol { + width: 1em; + height: 1em; + border-radius: 50%; + display: inline-block; + vertical-align: -5%; } -.legend-new .symbol -{ - background-color: #93E929; +.legend-new .symbol { + background-color: #93E929; } -.legend-online .symbol -{ - background-color: #1566A9; +.legend-online .symbol { + background-color: #1566A9; } -.legend-offline .symbol -{ - background-color: #D43E2A; +.legend-offline .symbol { + background-color: #D43E2A; } -.legend-online, .legend-offline -{ - margin-left: 1em; +.legend-online, .legend-offline { + margin-left: 1em; } diff --git a/scss/_map.scss b/scss/_map.scss index bc3a919..5f83e97 100644 --- a/scss/_map.scss +++ b/scss/_map.scss @@ -10,7 +10,7 @@ width: 100%; height: 100%; - .node-alert { + .node-alert { -webkit-animation: blink 2s linear; -webkit-animation-iteration-count: infinite; animation: blink 2s linear; @@ -35,13 +35,25 @@ } @-webkit-keyframes blink { - 0% { opacity: 1.0; } - 80% { opacity: 1.0; } - 90% { opacity: 0.0; } + 0% { + opacity: 1.0; + } + 80% { + opacity: 1.0; + } + 90% { + opacity: 0.0; + } } @keyframes blink { - 0% { opacity: 1.0; } - 80% { opacity: 1.0; } - 90% { opacity: 0.0; } + 0% { + opacity: 1.0; + } + 80% { + opacity: 1.0; + } + 90% { + opacity: 0.0; + } } diff --git a/scss/_reset.scss b/scss/_reset.scss index 7c19fad..297b298 100644 --- a/scss/_reset.scss +++ b/scss/_reset.scss @@ -22,25 +22,31 @@ time, mark, audio, video { font: inherit; vertical-align: baseline; } + /* HTML5 display-role reset for older browsers */ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; } + body { line-height: 1; } + ol, ul { list-style: none; } + blockquote, q { quotes: none; } + blockquote:before, blockquote:after, q:before, q:after { content: ''; content: none; } + table { border-collapse: collapse; border-spacing: 0; diff --git a/scss/_shadow.scss b/scss/_shadow.scss index 13483e5..7c89b34 100644 --- a/scss/_shadow.scss +++ b/scss/_shadow.scss @@ -1,19 +1,15 @@ /* Original is in LESS and can be found here: https://gist.github.com/gefangenimnetz/3ef3e18364edf105c5af */ -@mixin shadow($level:1){ +@mixin shadow($level:1) { @if $level == 1 { - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); - } - @else if $level == 2 { - box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); - } - @else if $level == 3 { - box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); - } - @else if $level == 4 { - box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); - } - @else if $level == 5 { - box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); + } @else if $level == 2 { + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + } @else if $level == 3 { + box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); + } @else if $level == 4 { + box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22); + } @else if $level == 5 { + box-shadow: 0 19px 38px rgba(0, 0, 0, 0.30), 0 15px 12px rgba(0, 0, 0, 0.22); } } diff --git a/scss/main.scss b/scss/main.scss index 3660109..e290144 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -44,7 +44,7 @@ $buttondistance: 12pt; margin: 0; list-style: none; display: flex; - font-family: Roboto; + font-family: Roboto, sans-serif; @include shadow(1); } @@ -151,9 +151,9 @@ table.attributes td { img { max-width: 100%; } - + input[type="text"], textarea { - box-shadow: 0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); border-radius: 5px; border: none; line-height: 1.67em; @@ -200,7 +200,7 @@ button:hover { } button:active { - box-shadow: inset 0px 5px 20px rgba(0, 0, 0, 0.19), inset 0px 3px 6px rgba(0, 0, 0, 0.23); + box-shadow: inset 0 5px 20px rgba(0, 0, 0, 0.19), inset 0 3px 6px rgba(0, 0, 0, 0.23); } button::-moz-focus-inner { @@ -405,9 +405,9 @@ table { @media screen and (max-width: 80em) { .sidebar { font-size: 0.8em; - top: 0pt; - left: 0pt; - margin: 0pt; + top: 0; + left: 0; + margin: 0; width: $sidebarwidthsmall; min-height: 100vh; @include shadow(2); @@ -438,7 +438,7 @@ table { .sidebar { position: static; - margin: 0em !important; + margin: 0 !important; width: auto; height: auto; min-height: 0;