Freifunk-Troisdorf/meshviewer
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean scss (#21)

Browse Source 
* [TASK] CGL - Formation

* [TASK] Generic font fallback

* [TASK] Remove swp file
This commit is contained in:
Xaver Maierhofer 2016-05-19 17:47:32 +02:00 committed by PetaByteBoy // Milan Pässler
parent e1e510c308
commit 31d1464805
7 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/infobox/.charts.js.swp
View File

Binary file not shown.

4
scss/_filters.scss
View File

@ -2,7 +2,7 @@
margin: 0; margin: 0;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
font-family: Roboto; font-family: Roboto, sans-serif;
font-size: 0.83em; font-size: 0.83em;
font-weight: bold; font-weight: bold;
padding: 0 6pt 6pt !important; padding: 0 6pt 6pt !important;
@ -10,7 +10,7 @@
li { li {
border-radius: 20pt; border-radius: 20pt;
display: flex; display: flex;
padding: 0pt 0 0pt 8pt; padding: 0 0 0 8pt;
margin: 3pt; margin: 3pt;
align-items: center; align-items: center;
background: #009ee0; background: #009ee0;

15
scss/_legend.scss
View File

@ -1,5 +1,4 @@
.legend .symbol .legend .symbol {
{
width: 1em; width: 1em;
height: 1em; height: 1em;
border-radius: 50%; border-radius: 50%;
@ -7,22 +6,18 @@
vertical-align: -5%; vertical-align: -5%;
} }
.legend-new .symbol .legend-new .symbol {
{
background-color: #93E929; background-color: #93E929;
} }
.legend-online .symbol .legend-online .symbol {
{
background-color: #1566A9; background-color: #1566A9;
} }
.legend-offline .symbol .legend-offline .symbol {
{
background-color: #D43E2A; background-color: #D43E2A;
} }
.legend-online, .legend-offline .legend-online, .legend-offline {
{
margin-left: 1em; margin-left: 1em;
} }

24
scss/_map.scss
View File

@ -35,13 +35,25 @@
} }
@-webkit-keyframes blink { @-webkit-keyframes blink {
0% { opacity: 1.0; } 0% {
80% { opacity: 1.0; } opacity: 1.0;
90% { opacity: 0.0; } }
80% {
opacity: 1.0;
}
90% {
opacity: 0.0;
}
} }
@keyframes blink { @keyframes blink {
0% { opacity: 1.0; } 0% {
80% { opacity: 1.0; } opacity: 1.0;
90% { opacity: 0.0; } }
80% {
opacity: 1.0;
}
90% {
opacity: 0.0;
}
} }

6
scss/_reset.scss
View File

@ -22,25 +22,31 @@ time, mark, audio, video {
font: inherit; font: inherit;
vertical-align: baseline; vertical-align: baseline;
} }
/* HTML5 display-role reset for older browsers */ /* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure, article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section { footer, header, hgroup, menu, nav, section {
display: block; display: block;
} }
body { body {
line-height: 1; line-height: 1;
} }
ol, ul { ol, ul {
list-style: none; list-style: none;
} }
blockquote, q { blockquote, q {
quotes: none; quotes: none;
} }
blockquote:before, blockquote:after, blockquote:before, blockquote:after,
q:before, q:after { q:before, q:after {
content: ''; content: '';
content: none; content: none;
} }
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;

24
scss/_shadow.scss
View File

@ -1,19 +1,15 @@
/* Original is in LESS and can be found here: https://gist.github.com/gefangenimnetz/3ef3e18364edf105c5af */ /* 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 { @if $level == 1 {
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);
} } @else if $level == 2 {
@else if $level == 2 { box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
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 == 3 { } @else if $level == 4 {
box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
} } @else if $level == 5 {
@else if $level == 4 { box-shadow: 0 19px 38px rgba(0, 0, 0, 0.30), 0 15px 12px rgba(0, 0, 0, 0.22);
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);
} }
} }

14
scss/main.scss
View File

@ -44,7 +44,7 @@ $buttondistance: 12pt;
margin: 0; margin: 0;
list-style: none; list-style: none;
display: flex; display: flex;
font-family: Roboto; font-family: Roboto, sans-serif;
@include shadow(1); @include shadow(1);
} }
@ -153,7 +153,7 @@ table.attributes td {
} }
input[type="text"], textarea { 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-radius: 5px;
border: none; border: none;
line-height: 1.67em; line-height: 1.67em;
@ -200,7 +200,7 @@ button:hover {
} }
button:active { 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 { button::-moz-focus-inner {
@ -405,9 +405,9 @@ table {
@media screen and (max-width: 80em) { @media screen and (max-width: 80em) {
.sidebar { .sidebar {
font-size: 0.8em; font-size: 0.8em;
top: 0pt; top: 0;
left: 0pt; left: 0;
margin: 0pt; margin: 0;
width: $sidebarwidthsmall; width: $sidebarwidthsmall;
min-height: 100vh; min-height: 100vh;
@include shadow(2); @include shadow(2);
@ -438,7 +438,7 @@ table {
.sidebar { .sidebar {
position: static; position: static;
margin: 0em !important; margin: 0 !important;
width: auto; width: auto;
height: auto; height: auto;
min-height: 0; min-height: 0;