From 5263583b742fd655f7a0174a557cdcf9389742a0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Jul 2020 23:45:34 +0200
Subject: [PATCH] gluon-config-mode-theme: clean up SCSS
Remove unused and obsolete code.
---
.../gluon/config-mode/www/static/gluon.css | 2 +-
.../gluon-config-mode-theme/sass/gluon.scss | 187 +++---------------
2 files changed, 33 insertions(+), 156 deletions(-)
diff --git a/package/gluon-config-mode-theme/files/lib/gluon/config-mode/www/static/gluon.css b/package/gluon-config-mode-theme/files/lib/gluon/config-mode/www/static/gluon.css
index 16f213e45..93646f2b9 100644
--- a/package/gluon-config-mode-theme/files/lib/gluon/config-mode/www/static/gluon.css
+++ b/package/gluon-config-mode-theme/files/lib/gluon/config-mode/www/static/gluon.css
@@ -1 +1 @@
-.lang_he{direction:RTL;unicode-bidi:embed}.hidden{display:none}html{min-height:100%;height:auto;position:relative}body,input,select,option{font-family:'Open Sans', Arial, sans-serif;font-size:12pt}body{color:#4d4e53;line-height:1.5em;margin:0;display:flex;flex-direction:column;min-height:100vh;background-color:#f3f3f3}a img{border:none;text-decoration:none}.tabmenu1{text-align:center}ul.tabmenu{list-style:none;padding:0;margin:2em 0;display:inline-flex}ul.tabmenu li{white-space:nowrap;margin:0 0.5em;padding:0;text-align:center}ul.tabmenu li a{display:block;text-decoration:none;padding:1em;margin:0;color:#333;border-radius:2em}ul.tabmenu li a:hover{background:#ffe9b3}ul.tabmenu li.active a{font-weight:bold;background:white;color:#333}abbr,acronym{font-style:normal;font-variant:normal}abbr[title],acronym[title]{border-bottom:1px dotted;cursor:help}a:link abbr[title],a:visited abbr[title],a:link acronym[title],a:visited acronym[title]{cursor:pointer}code{font-family:monospace;white-space:pre}#maincontent ul{margin-left:2em}.clear{clear:both}.error{color:#ff0000;background-color:white}#menubar{display:flex;background:#dc0067;color:#ffffff}#menubar a:link.topcat,#menubar a:visited.topcat{position:relative;display:block;padding:0.5em;text-decoration:none;font-size:80%;font-weight:normal;color:white}#menubar a:link.topcat:hover,#menubar a:link.topcat:focus,#menubar a:visited.topcat:hover,#menubar a:visited.topcat:focus{background:#ffb400;color:black}#menubar a:link.topcat.active,#menubar a:visited.topcat.active{background:#ffb400;color:black;font-weight:bold}#menubar div.hostinfo{position:relative;margin:0;padding:0.5em;flex:1;font-weight:bold;font-size:80%}#menubar div.hostinfo a:link,#menubar div.hostinfo a:visited{text-decoration:none;font-weight:bold;color:white}#menubar div.hostinfo a:link:hover,#menubar div.hostinfo a:link:focus,#menubar div.hostinfo a:visited:hover,#menubar div.hostinfo a:visited:focus{text-decoration:underline}#topmenu{list-style:none;margin:0;padding:0}#topmenu li{display:inline-block}#maincontent{padding:0 1em 2em;max-width:60em;min-width:40em;margin:1em auto}#maincontent p{margin-bottom:1em}.gluon-section{margin:0;padding:0;border:none;margin-bottom:1.3em}.gluon-section:last-child{margin-bottom:0.7em}.gluon-section legend{font-size:1.4em;font-weight:bold;position:relative;padding:0;margin-bottom:0.5em}.gluon-section h2{margin:0em 0 0.5em -0.5em !important}.gluon-section h3{text-decoration:none !important;font-weight:bold !important;color:#555555 !important;margin:0.25em !important;font-size:100% !important}.gluon-section-descr{margin-bottom:2em}.gluon-osm-map{width:100%;height:40em;margin-bottom:1em}input:placeholder{color:#aaaaaa}input:-webkit-input-placeholder{color:#aaaaaa}input:-moz-placeholder{color:#aaaaaa}input:-ms-input-placeholder{color:#aaaaaa}input[type=checkbox]{display:none}input[type=checkbox]+label{display:inline-block;position:relative;width:1em;height:1em;margin:0}input[type=checkbox]:checked+label:after{content:'✔';color:#dc0067;vertical-align:middle;position:absolute;top:50%;left:0;margin-top:-0.5em;width:100%;text-align:center;font-size:1.7em}input[type=radio]{display:none}input[type=radio]+label{display:inline-block;position:relative;width:0.8em;height:0.8em;padding:0.5em;margin:0.2em 0.2em 0.2em 0.1em;border:none;background:#ffe199;vertical-align:middle;border-radius:50%}input[type=radio]:checked+label:after{content:'•';color:#dc0067;vertical-align:middle;position:absolute;top:50%;left:0;margin-top:-0.4em;width:100%;text-align:center;font-size:2em}input[type=submit],input[type=reset],input[type=image],input[type=button]{cursor:pointer}select,input,textarea,input[type=checkbox]+label{color:#003247;border:none;background:#ffe199;border-radius:3pt;padding:0.5em;margin-top:1px;margin-bottom:2px;box-sizing:content-box;outline:0}option{color:#003247;background:#ffe199}input[type=image]{border:none}select,input[type=text],input[type=password]{min-width:20em}input.gluon-button{display:inline-block;zoom:1;line-height:normal;white-space:nowrap;vertical-align:baseline;text-align:center;cursor:pointer;user-select:none;font-size:100%;padding:0.5em 1em;color:rgba(0,0,0,0.8);border:none transparent;background-color:#E6E6E6;text-decoration:none;border-radius:2px;transition:0.1s linear box-shadow;margin-left:0.5em;background-repeat:no-repeat}input.gluon-button::-moz-focus-inner{padding:0;border:0}input.gluon-button:active{box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset,0 0 6px rgba(0,0,0,0.2) inset}input.gluon-button:focus{outline:0}input.gluon-button:hover,input.gluon-button:focus{background-image:linear-gradient(transparent, rgba(0,0,0,0.05) 40%, rgba(0,0,0,0.1))}input.gluon-button[disabled]{border:none;background-image:none;opacity:0.40;cursor:not-allowed;box-shadow:none}input.gluon-button-reset{background-color:#e30;color:#fff}input.gluon-button-submit{background-color:#009ee0;color:#fff}input.gluon-button-submit:active{background:grey}.gluon-input-invalid{background:#e30 !important;color:white}div.gluon-section-remove input{border-bottom:none}textarea{margin-left:-1px;margin-bottom:0.5em}.gluon-section .gluon-rowstyle-1 h3{background-color:#eeeeff;color:#555555}.gluon-rowstyle-2{color:#000000}div.gluon-value{display:flex;flex-direction:row;margin-bottom:0.5em}.gluon-section-node .gluon-value:last-child{margin-bottom:0}.gluon-value-title{flex:2;text-align:right;padding-top:0.39em;padding-right:1em;font-weight:bold}div.gluon-value-field{flex:3;position:relative}div.gluon-value-field input,div.gluon-value-field select,div.gluon-value-field input+label{position:relative}div.gluon-value-field-text{flex:3;padding-top:0.39em}div.gluon-value-field-long{flex:10;position:relative;margin-top:0.65em}div.gluon-value-field-long input,div.gluon-value-field-long select,div.gluon-value-field-long input+label{position:relative}div.gluon-value-field-long-after{flex:2}div.gluon-value-description{font-size:8pt}div.gluon-section-create{clear:left;white-space:nowrap;vertical-align:top}div.gluon-section-create .gluon-button{margin:0.25em}input.gluon-section-create-name{margin-right:-0.25em}div.gluon-form-descr{margin-bottom:1em}.gluon-form-descr:empty,.gluon-section-descr:empty{display:none}.gluon-form-descr,.gluon-section-descr,.gluon-page-actions{padding:1em;background:#ececec}.gluon-page-actions{text-align:right;display:flex;flex-flow:row-reverse}div.gluon-optionals{padding:0.25em;border-bottom:1px dotted #bbbbbb}div.gluon-section-remove{float:right}.gluon-section-node{clear:both;position:relative;border:none}.gluon-section-node-tabbed{border-top-left-radius:0}div.gluon-error{font-size:95%;font-weight:bold;color:#ff0000;background-color:#ffffff}.gluon-value-error input,.gluon-value-error select{background-color:#ffcccc}.gluon-value-field var{color:#2222FF}.gluon-add:after,.gluon-remove:after{cursor:pointer;display:inline-block;text-align:center;vertical-align:middle;font-size:180%;width:1.2em;height:1em}.gluon-add{color:#008000;position:relative;left:21em}input+.gluon-add{left:0;top:0.04em}.gluon-add:first-child{top:0.53em;left:-0.08em}.gluon-add:after{content:'+'}.gluon-remove{color:#800000;position:relative;top:-0.03em}.gluon-remove:after{content:'–'}.left{text-align:left !important}.right{text-align:right !important}.inline{display:inline}.error500{border:1px dotted #ff0000;background-color:#ffffff;color:#000000;padding:0.5em}.errorbox{border:1px solid #FF0000;background-color:#FFCCCC;padding:5px;margin-bottom:5px}.errorbox a{color:#000000 !important}.the-key{text-align:left;font-size:1.4em;background:#ffe9b3;border:3pt dashed #dc0067;margin-bottom:0.5em;padding:0.5em}
+html{min-height:100%;height:auto;position:relative}body,input,select,option{font-family:'Open Sans', Arial, sans-serif;font-size:12pt}body{color:#4d4e53;line-height:1.5em;margin:0;display:flex;flex-direction:column;min-height:100vh;background-color:#f3f3f3}.tabmenu1{text-align:center}ul.tabmenu{list-style:none;padding:0;margin:2em 0;display:inline-flex}ul.tabmenu li{white-space:nowrap;margin:0 0.5em;padding:0;text-align:center}ul.tabmenu li a{display:block;text-decoration:none;padding:1em;margin:0;color:#333;border-radius:2em}ul.tabmenu li a:hover{background:#ffe9b3}ul.tabmenu li.active a{font-weight:bold;background:white;color:#333}#maincontent ul{margin-left:2em}.error{color:#ff0000;background-color:white}#menubar{display:flex;background:#dc0067;color:#ffffff}#menubar a:link.topcat,#menubar a:visited.topcat{position:relative;display:block;padding:0.5em;text-decoration:none;font-size:80%;font-weight:normal;color:white}#menubar a:link.topcat:hover,#menubar a:link.topcat:focus,#menubar a:visited.topcat:hover,#menubar a:visited.topcat:focus{background:#ffb400;color:black}#menubar a:link.topcat.active,#menubar a:visited.topcat.active{background:#ffb400;color:black;font-weight:bold}#menubar .hostinfo{position:relative;margin:0;padding:0.5em;flex:1;font-weight:bold;font-size:80%}#menubar .hostinfo a:link,#menubar .hostinfo a:visited{text-decoration:none;font-weight:bold;color:white}#menubar .hostinfo a:link:hover,#menubar .hostinfo a:link:focus,#menubar .hostinfo a:visited:hover,#menubar .hostinfo a:visited:focus{text-decoration:underline}#topmenu{list-style:none;margin:0;padding:0}#topmenu li{display:inline-block}#maincontent{padding:0 1em 2em;max-width:60em;min-width:40em;margin:1em auto}#maincontent p{margin-bottom:1em}.gluon-section{margin:0;padding:0;border:none;margin-bottom:1.3em}.gluon-section:last-child{margin-bottom:0.7em}.gluon-section legend{font-size:1.4em;font-weight:bold;position:relative;padding:0;margin-bottom:0.5em}.gluon-section h2{margin:0em 0 0.5em -0.5em}.gluon-section h3{text-decoration:none;font-weight:bold;color:#555555;margin:0.25em;font-size:100%}.gluon-section-descr{margin-bottom:2em}.gluon-osm-map{width:100%;height:40em;margin-bottom:1em}input::placeholder{color:#aaaaaa}input::-webkit-input-placeholder{color:#aaaaaa}input[type=checkbox]{display:none}input[type=checkbox]+label{display:inline-block;position:relative;width:1em;height:1em;margin:0}input[type=checkbox]:checked+label::after{content:'✔';color:#dc0067;vertical-align:middle;position:absolute;top:50%;left:0;margin-top:-0.5em;width:100%;text-align:center;font-size:1.7em}input[type=radio]{display:none}input[type=radio]+label{display:inline-block;position:relative;width:0.8em;height:0.8em;padding:0.5em;margin:0.2em 0.2em 0.2em 0.1em;border:none;background:#ffe199;vertical-align:middle;border-radius:50%}input[type=radio]:checked+label::after{content:'•';color:#dc0067;vertical-align:middle;position:absolute;top:50%;left:0;margin-top:-0.4em;width:100%;text-align:center;font-size:2em}input[type=submit],input[type=reset],input[type=button]{cursor:pointer}select,input,textarea,input[type=checkbox]+label{color:#003247;border:none;background:#ffe199;border-radius:3pt;padding:0.5em;margin-top:1px;margin-bottom:2px;box-sizing:content-box;outline:0}option{color:#003247;background:#ffe199}select,input[type=text],input[type=password]{min-width:20em}.gluon-button{display:inline-block;line-height:normal;white-space:nowrap;vertical-align:baseline;text-align:center;cursor:pointer;user-select:none;font-size:100%;padding:0.5em 1em;color:rgba(0,0,0,0.8);background-color:#E6E6E6;border:none;text-decoration:none;border-radius:2px;transition:0.1s linear box-shadow;margin-left:0.5em;background-repeat:no-repeat}.gluon-button::-moz-focus-inner{padding:0;border:0}.gluon-button:active{box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset,0 0 6px rgba(0,0,0,0.2) inset}.gluon-button:focus{outline:0}.gluon-button:hover,.gluon-button:focus{background-image:linear-gradient(transparent, rgba(0,0,0,0.05) 40%, rgba(0,0,0,0.1))}.gluon-button[disabled]{border:none;background-image:none;opacity:0.40;cursor:not-allowed;box-shadow:none}.gluon-button-reset{background-color:#e30;color:#fff}.gluon-button-submit{background-color:#009ee0;color:#fff}.gluon-button-submit:active{background:grey}.gluon-input-invalid{background:#e30 !important;color:white}textarea{margin-left:-1px;margin-bottom:0.5em}.gluon-value{display:flex;flex-direction:row;margin-bottom:0.5em}.gluon-section-node .gluon-value:last-child{margin-bottom:0}.gluon-value-title{flex:2;text-align:right;padding-top:0.39em;padding-right:1em;font-weight:bold}.gluon-value-field{flex:3;position:relative}.gluon-value-field input,.gluon-value-field select,.gluon-value-field input+label{position:relative}.gluon-value-field-text{flex:3;padding-top:0.39em}.gluon-value-field-long{flex:10;position:relative;margin-top:0.65em}.gluon-value-field-long input,.gluon-value-field-long select,.gluon-value-field-long input+label{position:relative}.gluon-value-field-long-after{flex:2}.gluon-value-description{font-size:8pt}.gluon-form-descr{margin-bottom:1em}.gluon-form-descr:empty,.gluon-section-descr:empty{display:none}.gluon-form-descr,.gluon-section-descr,.gluon-page-actions{padding:1em;background:#ececec}.gluon-page-actions{text-align:right;display:flex;flex-flow:row-reverse}.gluon-section-node{clear:both;position:relative;border:none}.gluon-value-error input,.gluon-value-error select{background-color:#ffcccc}.gluon-add::after,.gluon-remove::after{cursor:pointer;display:inline-block;text-align:center;vertical-align:middle;font-size:180%;width:1.2em;height:1em}.gluon-add{color:#008000;position:relative;left:21em}input+.gluon-add{left:0;top:0.04em}.gluon-add:first-child{top:0.53em;left:-0.08em}.gluon-add::after{content:'+'}.gluon-remove{color:#800000;position:relative;top:-0.03em}.gluon-remove::after{content:'–'}.error500{border:1px dotted #ff0000;background-color:#ffffff;color:#000000;padding:0.5em}.errorbox{border:1px solid #FF0000;background-color:#FFCCCC;padding:5px;margin-bottom:5px}.errorbox a{color:#000000 !important}.the-key{text-align:left;font-size:1.4em;background:#ffe9b3;border:3pt dashed #dc0067;margin-bottom:0.5em;padding:0.5em}
diff --git a/package/gluon-config-mode-theme/sass/gluon.scss b/package/gluon-config-mode-theme/sass/gluon.scss
index e6172a8aa..597a908a5 100644
--- a/package/gluon-config-mode-theme/sass/gluon.scss
+++ b/package/gluon-config-mode-theme/sass/gluon.scss
@@ -24,7 +24,6 @@ $red: #ee3300;
}
display: inline-block;
- zoom: 1;
line-height: normal;
white-space: nowrap;
vertical-align: baseline;
@@ -36,8 +35,8 @@ $red: #ee3300;
font-size: 100%;
padding: 0.5em 1em;
color: rgba(0, 0, 0, 0.80);
- border: none rgba(0, 0, 0, 0);
background-color: #E6E6E6;
+ border: none;
text-decoration: none;
border-radius: 2px;
@@ -65,24 +64,10 @@ $red: #ee3300;
}
}
-@mixin button-primary {
- background-color: $ffzusatz;
- color: #fff;
-}
-
-.lang_he {
- direction: RTL;
- unicode-bidi: embed;
-}
-
-.hidden {
- display: none;
-}
-
html {
min-height: 100%;
height: auto;
- position:relative;
+ position: relative;
}
body, input, select, option {
@@ -100,11 +85,6 @@ body {
background-color: #f3f3f3;
}
-a img {
- border: none;
- text-decoration: none;
-}
-
.tabmenu1 {
text-align: center;
}
@@ -142,38 +122,10 @@ ul.tabmenu li {
}
}
-abbr,
-acronym {
- font-style: normal;
- font-variant: normal;
-}
-
-abbr[title],
-acronym[title] {
- border-bottom: 1px dotted;
- cursor: help;
-}
-
-a:link abbr[title],
-a:visited abbr[title],
-a:link acronym[title],
-a:visited acronym[title] {
- cursor: pointer;
-}
-
-code {
- font-family: monospace;
- white-space: pre;
-}
-
#maincontent ul {
margin-left: 2em;
}
-.clear {
- clear: both;
-}
-
.error {
color: #ff0000;
background-color: white;
@@ -207,7 +159,7 @@ code {
}
}
-#menubar div.hostinfo {
+#menubar .hostinfo {
position: relative;
margin: 0;
padding: 0.5em;
@@ -216,7 +168,7 @@ code {
font-size: 80%;
}
-#menubar div.hostinfo a {
+#menubar .hostinfo a {
&:link, &:visited {
text-decoration: none;
font-weight: bold;
@@ -269,15 +221,15 @@ code {
}
.gluon-section h2 {
- margin: 0em 0 0.5em -0.5em !important;
+ margin: 0em 0 0.5em -0.5em;
}
.gluon-section h3 {
- text-decoration: none !important;
- font-weight: bold !important;
- color: #555555 !important;
- margin: 0.25em !important;
- font-size: 100% !important;
+ text-decoration: none;
+ font-weight: bold;
+ color: #555555;
+ margin: 0.25em;
+ font-size: 100%;
}
.gluon-section-descr {
@@ -290,19 +242,11 @@ code {
margin-bottom: 1em;
}
-input:placeholder {
- color: #aaaaaa;
-}
-
-input:-webkit-input-placeholder {
+input::placeholder {
color: #aaaaaa;
}
-input:-moz-placeholder {
- color: #aaaaaa;
-}
-
-input:-ms-input-placeholder {
+input::-webkit-input-placeholder {
color: #aaaaaa;
}
@@ -317,7 +261,7 @@ input[type=checkbox] {
margin: 0;
}
- &:checked + label:after {
+ &:checked + label::after {
content: '✔';
color: $ffmagenta;
vertical-align: middle;
@@ -347,7 +291,7 @@ input[type=radio] {
border-radius: 50%;
}
- &:checked + label:after {
+ &:checked + label::after {
content: '•';
color: $ffmagenta;
vertical-align: middle;
@@ -363,7 +307,6 @@ input[type=radio] {
input[type=submit],
input[type=reset],
-input[type=image],
input[type=button] {
cursor: pointer;
}
@@ -388,33 +331,30 @@ option {
background: lighten($ffyellow, 30);
}
-input[type=image] {
- border: none;
-}
-
select,
input[type=text],
input[type=password] {
min-width: 20em;
}
-input.gluon-button {
+.gluon-button {
@include button;
margin-left: 0.5em;
background-repeat: no-repeat;
}
-input.gluon-button-reset {
+.gluon-button-reset {
background-color: $red;
color: #fff;
}
-input.gluon-button-submit {
- @include button-primary;
-}
-input.gluon-button-submit:active {
- background: grey;
+.gluon-button-submit {
+ background-color: $ffzusatz;
+ color: #fff;
+}
+.gluon-button-submit:active {
+ background: grey;
}
.gluon-input-invalid {
@@ -422,25 +362,12 @@ input.gluon-button-submit:active {
color: white;
}
-div.gluon-section-remove input {
- border-bottom: none;
-}
-
textarea {
margin-left: -1px;
margin-bottom: 0.5em;
}
-.gluon-section .gluon-rowstyle-1 h3 {
- background-color: #eeeeff;
- color: #555555;
-}
-
-.gluon-rowstyle-2 {
- color: #000000;
-}
-
-div.gluon-value {
+.gluon-value {
display: flex;
flex-direction: row;
margin-bottom: 0.5em;
@@ -458,7 +385,7 @@ div.gluon-value {
font-weight: bold;
}
-div.gluon-value-field {
+.gluon-value-field {
flex: 3;
position: relative;
@@ -467,12 +394,12 @@ div.gluon-value-field {
}
}
-div.gluon-value-field-text {
+.gluon-value-field-text {
flex: 3;
padding-top: 0.39em;
}
-div.gluon-value-field-long {
+.gluon-value-field-long {
flex: 10;
position: relative;
margin-top: 0.65em;
@@ -482,29 +409,15 @@ div.gluon-value-field-long {
}
}
-div.gluon-value-field-long-after {
+.gluon-value-field-long-after {
flex: 2;
}
-div.gluon-value-description {
+.gluon-value-description {
font-size: 8pt;
}
-div.gluon-section-create {
- clear: left;
- white-space: nowrap;
- vertical-align: top;
-}
-
-div.gluon-section-create .gluon-button {
- margin: 0.25em;
-}
-
-input.gluon-section-create-name {
- margin-right: -0.25em;
-}
-
-div.gluon-form-descr {
+.gluon-form-descr {
margin-bottom: 1em;
}
@@ -523,42 +436,18 @@ div.gluon-form-descr {
flex-flow: row-reverse;
}
-div.gluon-optionals {
- padding: 0.25em;
- border-bottom: 1px dotted #bbbbbb;
-}
-
-div.gluon-section-remove {
- float: right;
-}
-
.gluon-section-node {
clear: both;
position: relative;
border: none;
}
-.gluon-section-node-tabbed {
- border-top-left-radius: 0;
-}
-
-div.gluon-error {
- font-size: 95%;
- font-weight: bold;
- color: #ff0000;
- background-color: #ffffff;
-}
-
.gluon-value-error input,
.gluon-value-error select {
background-color: #ffcccc;
}
-.gluon-value-field var {
- color: #2222FF;
-}
-
-.gluon-add:after, .gluon-remove:after {
+.gluon-add::after, .gluon-remove::after {
cursor: pointer;
display: inline-block;
text-align: center;
@@ -584,7 +473,7 @@ div.gluon-error {
left: -0.08em;
}
- &:after {
+ &::after {
content: '+';
}
}
@@ -595,23 +484,11 @@ div.gluon-error {
position: relative;
top: -0.03em;
- &:after {
+ &::after {
content: '–';
}
}
-.left {
- text-align: left !important;
-}
-
-.right {
- text-align: right !important;
-}
-
-.inline {
- display: inline;
-}
-
.error500 {
border: 1px dotted #ff0000;
background-color: #ffffff;
--
GitLab