Refactoring: Styles zusammengefasst und relikte gesammelt

gulpfile.js

@@ -11,19 +11,18 @@ require('laravel-elixir-vue-2')
  |
  */
 elixir(function (mix) {
+  // less
   mix.less('default.less', 'public/css/themes/default.css')
-  /*
-   lib JS files not mixed (specific pages only)
-  */
+  mix.less('metager/beitritt.less', 'public/css/beitritt.css')
+  // js
   mix.scripts(['lib/jquery.js', 'lib/jquery-ui.min.js', 'lib/bootstrap.js', 'lib/lightslider.js', 'lib/masonry.js', 'lib/imagesloaded.js', 'lib/openpgp.min.js', 'lib/iframeResizer.min.js', 'lib/md5.js'], 'public/js/lib.js')
   mix.scripts(['scriptStartPage.js', 'results.js'], 'public/js/scriptStartPage.js');
   mix.scripts(['scriptResultPage.js', 'results.js'], 'public/js/scriptResultPage.js');
   mix.scripts(['searchbar.js'], 'public/js/searchbar.js');
-  //mix.scripts(['scriptSubpages.js'], 'public/js/scriptSubpages.js');
-  mix.less('metager/beitritt.less', 'public/css/beitritt.css')
   // utility
   mix.scripts(['utility.js'], 'public/js/utility.js');
   mix.less('utility.less', 'public/css/utility.css');
+  // Versioning
   mix.version(['css/themes/default.css', 'js/lib.js', 'js/utility.js', 'css/utility.css', 'js/widgets.js', 'js/editLanguage.js', 'js/kontakt.js', 'js/scriptResultPage.js', 'js/scriptStartPage.js', 'js/settings.js', 'css/beitritt.css']);
 
 })

resources/assets/less/metager/base.less

@@ -7,6 +7,10 @@
 @aufruf-winter-aufruf-action-btn-hover-border-color: @base-aufruf-winter-border-color;
 @aufruf-winter-quicktip-border-color: @base-aufruf-winter-color!important;
 @new-feature-badge-background-color: @base-new-feature-badge-background-color;
+* {
+    font-family: Liberation Sans, sans-serif;
+}
+
 html {
     min-height: 100%;
     height: auto;
@@ -15,12 +19,17 @@ html {
 
 body {
     flex-grow: 1;
+    background-image: inherit;
     background-color: @body-background-color;
     background-attachment: fixed;
     min-height: 100%;
     height: auto;
     display: flex;
     flex-direction: column;
+    margin: 0;
+    &>div {
+        padding-top: 50px;
+    }
 }
 
 .wrapper {
@@ -30,10 +39,6 @@ body {
     justify-content: space-between;
 }
 
-body#resultBody {
-    background-image: inherit;
-}
-
 summary {
     cursor: pointer;
     &::-webkit-details-marker {
@@ -99,4 +104,4 @@ summary {
 
 .new-feature.badge {
     background-color: @new-feature-badge-background-color;
-}
+}
\ No newline at end of file

resources/assets/less/metager/result-page.less

@@ -33,14 +33,11 @@
 @product-shop-color: @result-page-product-shop-color;
 @lsprev-or-lsnext-i-background-color: @result-page-color-black;
 body {
-    background-image: inherit;
-    background-color: white;
-}
-
-.sideBar {
-    border-left: none;
-    input#nav0:checked~& {
-        border-left: 1px solid LightGray;
+    &#resultBody {
+        background-image: inherit;
+    }
+    &.quicktips {
+        background-color: @quicktip-background-color;
     }
 }
 

resources/assets/less/metager/sidebar.less

@@ -17,6 +17,7 @@
     z-index: 999;
     background-color: white;
     transition: 0.5s;
+    border-left: none;
     &>label#closeSidebar {
         position: absolute;
         font-size: 36px;
@@ -138,6 +139,9 @@
             }
         }
     }
+    input#nav0:checked~& {
+        border-left: 1px solid LightGray;
+    }
 }
 
 input#sideBarToggle:checked {

resources/assets/less/metager/start-page.less

@@ -69,19 +69,4 @@
 
 #about-us a:visited {
     color: @link-color;
-}
-
-#anpassen-label a {
-    color: @anpassen-label-color;
-}
-
-#addFocusBtnDiv {
-    margin-left: 10px;
-}
-
-#settingsBtnDiv {
-    margin-left: 10px;
-    &>* {
-        vertical-align: middle;
-    }
 }
\ No newline at end of file

resources/assets/less/metager/static-pages.less

@@ -28,19 +28,6 @@
 @modal-content-box-shadow-color: fade(@static-pages-color-black, 30%);
 @a-content-hidden-xs-color: @static-pages-color-almost-black;
 @section-box-shadow-color: fade(@static-pages-color-black, 55%);
-* {
-    font-family: Liberation Sans, sans-serif;
-}
-
-body {
-    margin: 0;
-    &>div {
-        padding-top: 50px;
-    }
-    &.quicktips {
-        background-color: @quicktip-background-color;
-    }
-}
 
 ul.startpage {
     list-style-type: none;
@@ -272,10 +259,6 @@ textarea#message {
     height: 200px;
 }
 
-#anpassen-label a.content {
-    color: inherit;
-}
-
 #plugin-modal ol>li {
     margin-bottom: 5px;
 }

resources/assets/less/metager/variables.less

@@ -36,7 +36,6 @@
 // start-page.less
 @focus-hover-focus-edit-background-color: #e3e3e3;
 @focus-radio-checked-focus-label-focus-edit-background-color: #e3e3e3;
-@anpassen-label-color: #333;
 @foki-edge-rounding: 7px;
 // settings.less
 @settings-abort-btn-color: white;