Commit 31aad2b4 authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Refactoring: Styles zusammengefasst und relikte gesammelt

parent c35fa634
...@@ -11,19 +11,18 @@ require('laravel-elixir-vue-2') ...@@ -11,19 +11,18 @@ require('laravel-elixir-vue-2')
| |
*/ */
elixir(function (mix) { elixir(function (mix) {
// less
mix.less('default.less', 'public/css/themes/default.css') mix.less('default.less', 'public/css/themes/default.css')
/* mix.less('metager/beitritt.less', 'public/css/beitritt.css')
lib JS files not mixed (specific pages only) // 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(['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(['scriptStartPage.js', 'results.js'], 'public/js/scriptStartPage.js');
mix.scripts(['scriptResultPage.js', 'results.js'], 'public/js/scriptResultPage.js'); mix.scripts(['scriptResultPage.js', 'results.js'], 'public/js/scriptResultPage.js');
mix.scripts(['searchbar.js'], 'public/js/searchbar.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 // utility
mix.scripts(['utility.js'], 'public/js/utility.js'); mix.scripts(['utility.js'], 'public/js/utility.js');
mix.less('utility.less', 'public/css/utility.css'); 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']); 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']);
}) })
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
@aufruf-winter-aufruf-action-btn-hover-border-color: @base-aufruf-winter-border-color; @aufruf-winter-aufruf-action-btn-hover-border-color: @base-aufruf-winter-border-color;
@aufruf-winter-quicktip-border-color: @base-aufruf-winter-color!important; @aufruf-winter-quicktip-border-color: @base-aufruf-winter-color!important;
@new-feature-badge-background-color: @base-new-feature-badge-background-color; @new-feature-badge-background-color: @base-new-feature-badge-background-color;
* {
font-family: Liberation Sans, sans-serif;
}
html { html {
min-height: 100%; min-height: 100%;
height: auto; height: auto;
...@@ -15,12 +19,17 @@ html { ...@@ -15,12 +19,17 @@ html {
body { body {
flex-grow: 1; flex-grow: 1;
background-image: inherit;
background-color: @body-background-color; background-color: @body-background-color;
background-attachment: fixed; background-attachment: fixed;
min-height: 100%; min-height: 100%;
height: auto; height: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 0;
&>div {
padding-top: 50px;
}
} }
.wrapper { .wrapper {
...@@ -30,10 +39,6 @@ body { ...@@ -30,10 +39,6 @@ body {
justify-content: space-between; justify-content: space-between;
} }
body#resultBody {
background-image: inherit;
}
summary { summary {
cursor: pointer; cursor: pointer;
&::-webkit-details-marker { &::-webkit-details-marker {
...@@ -99,4 +104,4 @@ summary { ...@@ -99,4 +104,4 @@ summary {
.new-feature.badge { .new-feature.badge {
background-color: @new-feature-badge-background-color; background-color: @new-feature-badge-background-color;
} }
\ No newline at end of file
...@@ -33,14 +33,11 @@ ...@@ -33,14 +33,11 @@
@product-shop-color: @result-page-product-shop-color; @product-shop-color: @result-page-product-shop-color;
@lsprev-or-lsnext-i-background-color: @result-page-color-black; @lsprev-or-lsnext-i-background-color: @result-page-color-black;
body { body {
background-image: inherit; &#resultBody {
background-color: white; background-image: inherit;
} }
&.quicktips {
.sideBar { background-color: @quicktip-background-color;
border-left: none;
input#nav0:checked~& {
border-left: 1px solid LightGray;
} }
} }
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
z-index: 999; z-index: 999;
background-color: white; background-color: white;
transition: 0.5s; transition: 0.5s;
border-left: none;
&>label#closeSidebar { &>label#closeSidebar {
position: absolute; position: absolute;
font-size: 36px; font-size: 36px;
...@@ -138,6 +139,9 @@ ...@@ -138,6 +139,9 @@
} }
} }
} }
input#nav0:checked~& {
border-left: 1px solid LightGray;
}
} }
input#sideBarToggle:checked { input#sideBarToggle:checked {
......
...@@ -69,19 +69,4 @@ ...@@ -69,19 +69,4 @@
#about-us a:visited { #about-us a:visited {
color: @link-color; 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
...@@ -28,19 +28,6 @@ ...@@ -28,19 +28,6 @@
@modal-content-box-shadow-color: fade(@static-pages-color-black, 30%); @modal-content-box-shadow-color: fade(@static-pages-color-black, 30%);
@a-content-hidden-xs-color: @static-pages-color-almost-black; @a-content-hidden-xs-color: @static-pages-color-almost-black;
@section-box-shadow-color: fade(@static-pages-color-black, 55%); @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 { ul.startpage {
list-style-type: none; list-style-type: none;
...@@ -272,10 +259,6 @@ textarea#message { ...@@ -272,10 +259,6 @@ textarea#message {
height: 200px; height: 200px;
} }
#anpassen-label a.content {
color: inherit;
}
#plugin-modal ol>li { #plugin-modal ol>li {
margin-bottom: 5px; margin-bottom: 5px;
} }
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
// start-page.less // start-page.less
@focus-hover-focus-edit-background-color: #e3e3e3; @focus-hover-focus-edit-background-color: #e3e3e3;
@focus-radio-checked-focus-label-focus-edit-background-color: #e3e3e3; @focus-radio-checked-focus-label-focus-edit-background-color: #e3e3e3;
@anpassen-label-color: #333;
@foki-edge-rounding: 7px; @foki-edge-rounding: 7px;
// settings.less // settings.less
@settings-abort-btn-color: white; @settings-abort-btn-color: white;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment