From bfe5d979f876e117616b0c6b7d79d8b865a99cf1 Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Mon, 27 Nov 2017 11:40:42 +0100 Subject: [PATCH] =?UTF-8?q?Refactoring:=20less-Regeln=20umsortiert=20und?= =?UTF-8?q?=20Altes=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relics/index_old.blade.php | 348 ---------- relics/style.css | 649 ------------------ resources/assets/js/results.js | 2 +- .../assets/less/metager/aufruf-winter.less | 45 ++ resources/assets/less/metager/base.less | 117 ---- resources/assets/less/metager/beitritt.less | 8 +- resources/assets/less/metager/footer.less | 2 + resources/assets/less/metager/general.less | 178 +++++ resources/assets/less/metager/metager.less | 8 +- resources/assets/less/metager/product.less | 42 ++ resources/assets/less/metager/quicktips.less | 117 +++- .../assets/less/metager/result-page.less | 510 +------------- resources/assets/less/metager/result.less | 187 +++++ resources/assets/less/metager/searchbar.less | 16 + resources/assets/less/metager/settings.less | 2 + resources/assets/less/metager/sidebar.less | 8 +- resources/assets/less/metager/specific.less | 223 ++++++ resources/assets/less/metager/start-page.less | 34 + .../assets/less/metager/static-pages.less | 449 ------------ resources/assets/less/metager/variables.less | 87 ++- resources/views/index.blade.php | 2 +- resources/views/layouts/ad.blade.php | 2 +- resources/views/layouts/products.blade.php | 2 +- .../views/layouts/staticPages_old.blade.php | 224 ------ resources/views/quicktip.blade.php | 78 --- resources/views/settings.blade.php | 2 +- 26 files changed, 946 insertions(+), 2396 deletions(-) delete mode 100644 relics/index_old.blade.php delete mode 100644 relics/style.css create mode 100644 resources/assets/less/metager/aufruf-winter.less delete mode 100644 resources/assets/less/metager/base.less create mode 100644 resources/assets/less/metager/general.less create mode 100644 resources/assets/less/metager/product.less create mode 100644 resources/assets/less/metager/result.less create mode 100644 resources/assets/less/metager/specific.less delete mode 100644 resources/assets/less/metager/static-pages.less delete mode 100644 resources/views/layouts/staticPages_old.blade.php delete mode 100644 resources/views/quicktip.blade.php diff --git a/relics/index_old.blade.php b/relics/index_old.blade.php deleted file mode 100644 index 5e24514c..00000000 --- a/relics/index_old.blade.php +++ /dev/null @@ -1,348 +0,0 @@ -@extends('layouts.indexPage') - -@section('title', $title ) - -@section('content') - - -

- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- {{-- Fix for older Versions --}} - @if ($focus === 'angepasst') -
- - -
- @endif -
- -
-
- - - -
-
-
-
-
-
- -
- - - - - - - - - - @foreach ($focusPages as $fp) - - @endforeach - -
- -
-
-
-
- - -@endsection - -@section('optionalContent') - -@endsection diff --git a/relics/style.css b/relics/style.css deleted file mode 100644 index b0a1c9f1..00000000 --- a/relics/style.css +++ /dev/null @@ -1,649 +0,0 @@ -/* - - - - - -By ID - - - - - -*/ - -#color-chooser { - padding: 0; -} - -#moreInformation { - box-shadow: none; - margin-top: 5%; - text-align: center; - -moz-box-shadow: none; -} - -#mglogo { - width: 100%; - text-align: center; -} - -#spruch { - margin-bottom: 20px; - padding: 5px; - line-height: 1.2; - color: #070; - border-left: 3px solid #070; - font-size: 16px; - font-family: Georgia, "Times New Roman", Palatino, Times, serif; -} - - -/* - - - - - -Mixed - - - - - -*/ - -#color-chooser #standard { - background-color: rgb(255, 194, 107); -} - -#color-chooser #standardHard { - background-color: rgb(255, 128, 0); -} - -#color-chooser #green { - background-color: rgb(177, 226, 163); -} - -#color-chooser #greenHard { - background-color: rgb(127, 175, 27); -} - -#color-chooser #blue { - background-color: rgb(164, 192, 230); -} - -#color-chooser #blueHard { - background-color: rgb(2, 93, 140); -} - -#color-chooser #red { - background-color: rgb(255, 92, 92); -} - -#color-chooser #redHard { - background-color: rgb(255, 0, 0); -} - -#color-chooser #pink { - background-color: rgb(255, 196, 246); -} - -#color-chooser #pinkHard { - background-color: rgb(254, 67, 101); -} - -#color-chooser #black { - background-color: rgb(238, 238, 238); -} - -#color-chooser #blackHard { - background-color: rgb(50, 50, 50); -} - -#mglogo > a { - display: block; - width: 200px; - text-decoration: none; - font-size: 1.1em; - font-family: Liberation Sans, sans-serif; - font-weight: bold; - font-style: italic; - font-size: 1.0em; - line-height: 1; - white-space: nowrap; - padding: 0.4em 0; - border-radius: .25em; - margin: 0 auto; -} - -#sponsors a { - font-size: 0.8em; -} - -#sponsors h2 { - font-size: 1.5em; -} - -#foki label > span { - margin-right: 5px; -} - -#foki label span { - background-color: transparent; -} - -#foki input { - visibility: hidden; -} - -#foki input:checked + label { - font-weight: bold; - background-color: #e3e3e3; -} - -#foki input + label { - border-radius: 4px; - padding: 7px 20px; - font-weight: normal; -} - -#foki input + label:hover { - cursor: pointer; - background-color: #f6f6f6; -} - -#color-chooser a { - display: block; - width: 50px; - height: 50px; -} - -#color-chooser li { - width: 50px; - margin: 0; -} - -#moreInformation ul { - padding: 0; -} - -#moreInformation ul li { - color: grey; -} - -#moreInformation > div { - font-size: 15px; -} - -#moreInformation h2 { - color: grey; - font-size: 25px; -} - -#moreInformation a:hover { - text-decoration: underline; -} - -#searchForm button { - width: 50px; - line-height: 100%; - height: 28px; - border: 0; - background-color: transparent; - padding: 0; -} - -li#info { - white-space: pre-line; -} - -main fieldset#foki { - margin: 5px 0; - text-align: center; -} - -div#right { - background-color: #FFDCC1; - border-radius: 5px; - padding: 20px; - padding-top: 0; -} - -div#right p { - white-space: normal; - border-bottom: 1px solid black; - margin-bottom: 15px; - padding-bottom: 15px; -} - -div#left { - padding-right: 35px; -} - -textarea#message { - height: 200px; -} - -#anpassen-label a.content { - color: inherit; -} - -#plugin-modal ol > li { - margin-bottom: 5px; -} - - -/* - - - - - -By Class - - - - - -*/ - -.quicktip { - margin-bottom: 15px; - padding: 10px; - line-height: 1.2 !important; - font-family: Georgia, "Times New Roman", Palatino, Times, serif; - color: #000; - border-left: 3px solid #FB0; - font-size: 14px; -} - -.wikiqtextract { - font-family: Georgia, "Times New Roman", Palatino, Times, serif; -} - -.qtheader { - font-family: verdana, arial, helvetica, sans-serif; -} - -.author { - float: right !important; -} - -.language-textarea { - resize: none; - overflow: hidden; -} - -.language-name { - white-space: pre; -} - -.navbar-default { - background-color: white; - border-radius: 0; -} - -.row { - margin-left: 0; - margin-right: 0; -} - -.mg-panel { - text-align: left; - margin: 0 auto; - margin-top: 20px; - padding: 10px 20px; - margin-bottom: 0; - /*! background-color: white; */ - -webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); - box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); -} - -.input-group-addon { - padding: 0; -} - -.form-group { - font-family: sans-serif; - font-size: 16px; - color: black; - background-color: transparent; - text-align: center; -} - -.kontakt-form-group { - text-align: left; - font-size: 14px; -} - -.metager-searchinput { - height: 30px; - padding: 6px 12px; - font-size: 14px; - line-height: 1.42857; - color: #555; - background-color: #FFF; - background-image: none; - border: 1px solid #CCC; - border-right: 0px none; - border-radius: 4px; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; - margin: 0px; -} - -.metager-searchbutton { - height: 30px; - width: 100px; - border-left: 0px none; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; - border: 1px solid #CCC; - padding: 6px 12px; - margin: 0px; - font-size: 14px; - font-weight: normal; - line-height: 1; - white-space: nowrap; - color: #555; - text-align: center; - background-color: #EEE; -} - -.metager-logo { - height: 30px; - float: left; - top: -2px; - margin-right: 3px; -} - -.mutelink { - color: inherit; -} - -.dotlist { - list-style-type: disc; - text-align: left; -} - -.well-sm { - margin: 10px 0px; -} - -.subheading { - font-size: 20px; - margin: 20px 0px; - white-space: pre-wrap; -} - -.donation-form-group { - text-align: left; - font-size: 12px; -} - -.beitritt-form-group { - text-align: left; -} - -.modal-content { - border-radius: 0; - -webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); - box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); -} - -.bold { - font-weight: bold; -} - -.settings-btn { - margin-top: 25px; -} - -.fokus-category { - font-size: 20px; -} - -.settings-form-control { - width: 200px; - margin-top: 10px; -} - -.bitcoins { - text-align: center; -} - -.checkbox { - margin-top: 5px; - margin-bottom: 5px; -} - -.non-bold { - font-weight: normal; -} - - -/* - - - - - -Mixed - - - - - -*/ - -.quicktip.aufruf { - border-left: 3px solid #FF4000; - color: #FF4000; -} - -.settings-checkbox .settings-glyphicon { - margin-left: 5px; - font-size: 12px; -} - -.settings-btn + .settings-btn { - margin-left: 10px; -} - -.wikiqtextract p { - margin-bottom: 0; -} - -footer ul.list-inline { - width: 100%; -} - -span.glyphicon { - background-color: transparent; -} - -a.content.hidden-xs { - color: #333; -} - -a.navbar-brand { - line-height: 100%!important; - padding: 0; -} - -nav .navbar-brand > div.logo { - height: 100%; -} - -.dotlist li { - margin-bottom: 5px; -} - -form.contact { - max-width: 500px; -} - -label.select-label { - margin-bottom: 0; - margin-top: 10px; -} - -@media print { - .noprint { - display: none!important; - } -} - -.donation-form-group label { - font-weight: bold; -} - -.quicktip h1 { - font-size: 22px; - margin-top: 0px; -} - - -/* - - - - - -By Element - - - - - -*/ - -* { - font-family: Liberation Sans, sans-serif; -} - -section { - padding: 10px; - box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55); - -moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55); - -moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55); -} - -footer { - margin-top: 8%; - bottom: 0; - width: 100%; -} - -body { - margin: 0; -} - -header { - position: fixed; - background-color: white; - z-index: 500; - width: 100%; - height: 50px; -} - -address { - white-space: pre; -} - -p { - white-space: pre-wrap; -} - -form { - margin: 10px 0px; -} - -code { - white-space: pre-wrap; - overflow-wrap: break-word; - word-break: break-word; -} - - -/* - - - - - -Mixed - - - - - -*/ - -label a { - color: inherit; -} - -label a:hover { - text-decoration: none; - color: inherit; -} - -footer li { - width: 33%; - text-align: center; -} - -footer img { - max-width: 100%; -} - -main ul li { - margin: 0 10px; -} - -body ul { - list-style-type: none; - text-align: center; - margin-left: 0!important; - margin-top: 10px; -} - -fieldset input[type=text] { - width: 100%; - padding-left: 10px; - padding-right: 10px; - border-width: 1px; - overflow: visible; -} - -main fieldset { - border: 0; -} - -nav h1 { - margin: 0; - height: 100%; - padding-left: 20px; - padding-top: 8px; - font-family: sans-serif; - font-style: italic; - margin: 0; - font-weight: bold; - line-height: 1; - white-space: nowrap; -} - -body > div { - /*! background-color: transparent; */ - padding-top: 70px; -} - -a:hover { - cursor: pointer; -} \ No newline at end of file diff --git a/resources/assets/js/results.js b/resources/assets/js/results.js index 98300d45..c551d583 100644 --- a/resources/assets/js/results.js +++ b/resources/assets/js/results.js @@ -251,7 +251,7 @@ Result.prototype.toHtml = function(){
\
\
\ -
\ +
\
\

\ \ diff --git a/resources/assets/less/metager/aufruf-winter.less b/resources/assets/less/metager/aufruf-winter.less new file mode 100644 index 00000000..6c82ff6a --- /dev/null +++ b/resources/assets/less/metager/aufruf-winter.less @@ -0,0 +1,45 @@ +/* Winter-Spendenaufruf */ + +.aufruf-winter { + h1 { + font-size: 32px; + @media(max-width: @screen-md-max) { + .aufruf-winter h1 { + font-size: 27px; + } + } + } + a, + a:visited { + color: @aufruf-winter-a-normal-or-visited; + } + .aufruf-action-btn { + color: @aufruf-winter-aufruf-action-btn-color; + background-color: @aufruf-winter-aufruf-action-btn-background-color; + border-color: @aufruf-winter-aufruf-action-btn-border-color; + } + .aufruf-action-btn:hover { + background-color: @aufruf-winter-aufruf-action-btn-hover-background-color; + border-color: @aufruf-winter-aufruf-action-btn-hover-border-color; + } + &.mg-panel { + background-image: url("/img/snowflake.svg"); + background-repeat: no-repeat; + background-position: right top; + background-size: 100px 100px; + @media(max-width: @screen-sm-max) { + background-size: 60px 60px; + } + @media(min-width: @screen-lg) { + width: 940px; + } + } + &.quicktip { + border-left: 3px solid @aufruf-winter-quicktip-border-color; + } + @media(max-width: @screen-md-max) { + .lead { + font-size: 18px; + } + } +} \ No newline at end of file diff --git a/resources/assets/less/metager/base.less b/resources/assets/less/metager/base.less deleted file mode 100644 index f5fbf54b..00000000 --- a/resources/assets/less/metager/base.less +++ /dev/null @@ -1,117 +0,0 @@ -@body-background-color: @base-body-backround-color; -@aufruf-winter-a-normal-or-visited: @base-aufruf-winter-color; -@aufruf-winter-aufruf-action-btn-color: @base-aufruf-winter-btn-color!important; -@aufruf-winter-aufruf-action-btn-background-color: @base-aufruf-winter-color!important; -@aufruf-winter-aufruf-action-btn-border-color: @base-aufruf-winter-border-color; -@aufruf-winter-aufruf-action-btn-hover-background-color: @base-aufruf-winter-btn-hover-background-color !important; -@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; - display: flex; -} - -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; -} - -.wrapper { - flex-grow: 1; - display: flex; - flex-direction: column; - justify-content: center; - margin: 50px 0px; -} - -.logo h1, h1.mg-logo { - color: rgb(255, 128, 0); - font-weight: bold; -} - -summary { - cursor: pointer; - &::-webkit-details-marker { - display: none; - } - &::-moz-details-marker { - display: none; - } - &::-ms-details-marker { - display: none; - } - &::-o-details-marker { - display: none; - } - &::details-marker { - display: none; - } -} - -.aufruf-winter { - h1 { - font-size: 32px; - @media(max-width: @screen-md-max) { - .aufruf-winter h1 { - font-size: 27px; - } - } - } - a, - a:visited { - color: @aufruf-winter-a-normal-or-visited; - } - .aufruf-action-btn { - color: @aufruf-winter-aufruf-action-btn-color; - background-color: @aufruf-winter-aufruf-action-btn-background-color; - border-color: @aufruf-winter-aufruf-action-btn-border-color; - } - .aufruf-action-btn:hover { - background-color: @aufruf-winter-aufruf-action-btn-hover-background-color; - border-color: @aufruf-winter-aufruf-action-btn-hover-border-color; - } - &.mg-panel { - background-image: url("/img/snowflake.svg"); - background-repeat: no-repeat; - background-position: right top; - background-size: 100px 100px; - @media(max-width: @screen-sm-max) { - background-size: 60px 60px; - } - @media(min-width: @screen-lg) { - width: 940px; - } - } - &.quicktip { - border-left: 3px solid @aufruf-winter-quicktip-border-color; - } - @media(max-width: @screen-md-max) { - .lead { - font-size: 18px; - } - } -} - -.new-feature.badge { - background-color: @new-feature-badge-background-color; -} - -.imagebox { - display: flex; - a { - display: flex; - } -} \ No newline at end of file diff --git a/resources/assets/less/metager/beitritt.less b/resources/assets/less/metager/beitritt.less index 63ec36df..c82ffb54 100644 --- a/resources/assets/less/metager/beitritt.less +++ b/resources/assets/less/metager/beitritt.less @@ -1,3 +1,5 @@ +/* Style für die Druckversion des Beitrittsformulars */ + @media print { header { display: none !important; @@ -12,7 +14,8 @@ hr { display: none !important; } - input[type=text], input[type=email] { + input[type=text], + input[type=email] { margin: 0px !important; padding: 0px !important; height: initial !important; @@ -74,4 +77,7 @@ #spendenaufruf { display: none !important; } + .beitritt-formular-info * { + font-size: 7pt !important; + } } \ No newline at end of file diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/footer.less index 094b607a..e1dae268 100644 --- a/resources/assets/less/metager/footer.less +++ b/resources/assets/less/metager/footer.less @@ -1,3 +1,5 @@ +/* Footer bar with logos and general links */ + footer { padding: 5px 5px 15px 5px; width: 100%; diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less new file mode 100644 index 00000000..f7e41981 --- /dev/null +++ b/resources/assets/less/metager/general.less @@ -0,0 +1,178 @@ +/* Default Font */ + +* { + font-family: Liberation Sans, sans-serif; +} + + +/* Main Containers */ + +html, +body, +.content-wrapper { + width: 100%; +} + +html { + min-height: 100%; + height: auto; + display: flex; +} + +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; +} + +.wrapper { + flex-grow: 1; + display: flex; + flex-direction: column; + justify-content: center; + margin: 50px 0px; +} + + +/* Logo */ + +.logo h1, +h1.mg-logo { + color: rgb(255, 128, 0); + font-weight: bold; +} + +#mglogo { + color: rgb(255, 128, 0); + text-align: center; + &>a { + display: block; + text-decoration: none; + font-size: 1.1em; + font-family: Liberation Sans, sans-serif; + font-weight: bold; + font-style: italic; + font-size: 1.0em; + line-height: 1; + white-space: nowrap; + border-radius: .25em; + margin: 0 auto; + } +} + +.metager-logo { + height: 30px; + float: left; + top: -2px; + margin-right: 3px; +} + +.logo { + height: 30px!important; + &>h1 { + font-size: 30px; + } +} + + +/* Links that look like text */ + +.mutelink { + &, + &:focus, + &:active, + &:visited { + color: inherit; + } +} + + +/* Summary Elements */ + +summary { + cursor: pointer; + &::-webkit-details-marker { + display: none; + } + &::-moz-details-marker { + display: none; + } + &::-ms-details-marker { + display: none; + } + &::-o-details-marker { + display: none; + } + &::details-marker { + display: none; + } +} + + +/* New Feature Badge */ + +.new-feature.badge { + background-color: @new-feature-badge-background-color; +} + + +/* Box to match Image size */ + +.imagebox { + display: flex; + a { + display: flex; + } +} + + +/* Unsorted */ + +.bold { + font-weight: bold; +} + +@media print { + .noprint { + display: none!important; + } +} + +nav { + h1 { + margin: 0; + height: 100%; + padding-left: 20px; + padding-top: 8px; + font-family: sans-serif; + font-style: italic; + margin: 0; + font-weight: bold; + line-height: 1; + white-space: nowrap; + } + .navbar-brand>div.logo { + height: 100%; + } +} + +.modal-content { + border-radius: 0; + -webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; + -moz-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; + box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; +} + +label a { + color: inherit; + &:hover { + text-decoration: none; + color: inherit; + } +} \ No newline at end of file diff --git a/resources/assets/less/metager/metager.less b/resources/assets/less/metager/metager.less index 70fb8159..03eba70f 100644 --- a/resources/assets/less/metager/metager.less +++ b/resources/assets/less/metager/metager.less @@ -1,10 +1,10 @@ -@import "./base.less"; -@import "./static-pages.less"; +@import "./general.less"; +@import "./specific.less"; @import "./result-page.less"; -@import "./quicktips.less"; @import "./start-page.less"; @import "./settings.less"; @import "./variables.less"; @import "./sidebar.less"; @import "./footer.less"; -@import "./searchbar.less"; \ No newline at end of file +@import "./searchbar.less"; +@import "./aufruf-winter.less"; \ No newline at end of file diff --git a/resources/assets/less/metager/product.less b/resources/assets/less/metager/product.less new file mode 100644 index 00000000..2ab7ac88 --- /dev/null +++ b/resources/assets/less/metager/product.less @@ -0,0 +1,42 @@ +/* Produktergebnisse */ + +.product { + text-align: center; + border: 1px dotted @product-border-color; + padding: 5px; + max-width: 150px; + height: 210px; + a { + color: @product-a-color; + } + img { + max-width: 100px; + } + .price { + position: relative; + top: 20px; + color: @product-price-color; + background-color: @product-price-background-color; + text-align: left; + width: 80px; + font-weight: bold; + } + .title { + font-size: 12px; + font-weight: bold; + text-align: left; + max-height: 31px; + overflow: hidden; + margin-bottom: 4px; + } + .shop { + font-size: 10px; + text-align: left; + color: @product-shop-color; + margin-bottom: 6px; + } + .shipping { + font-size: 10px; + text-align: left; + } +} \ No newline at end of file diff --git a/resources/assets/less/metager/quicktips.less b/resources/assets/less/metager/quicktips.less index b4a7a352..60951b99 100644 --- a/resources/assets/less/metager/quicktips.less +++ b/resources/assets/less/metager/quicktips.less @@ -1,15 +1,108 @@ -.qt-header { - font-size: 16px; - margin: 0px; - font-weight: bold; -} +/* Quicktips */ -.qt-icon { - height: 60px; -} -.detail-short { - font-weight: bold; - font-size: 18px; - line-height: 30px; +/* + *

+ *
+ *
+ * + *

TITLE + *

SUMMARY + *

+ *

DETAILTITLE + *

DETAILSUMMARY + * GEFVON + * + */ + +#quicktips { + display: flex; + flex-direction: column; + details[open=""] .quicktip-extender { + animation-name: quicktip-extender-turn; + animation-fill-mode: forwards; + } + .quicktip { + margin: 10px 0px; + padding: 10px 0px 10px 10px; + border-left: 3px solid #fb0; + details:not([open=""]) { + .quicktip-summary p { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + .quicktip-summary { + h1 { + margin: 0px 0px 5px 0px; + font-size: 18px; + font-weight: bold; + display: flex; + justify-content: space-between; + .quicktip-extender { + margin-left: 10px; + color: #777; + font-size: 20px; + } + } + p { + font-size: 16px; + } + } + .quicktip-detail { + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + h2 { + margin: 10px 0px; + font-size: 16px; + font-weight: bold; + } + p { + display: none; + font-size: 14px; + } + } + .gefVon { + float: right; + font-size: 15px; + } + &[type=spruch] { + border-left: 3px solid #070; + p { + color: #070; + .author { + color: #404040; + font-style: italic; + } + } + } + &[type=spendenaufruf] { + border-left: #ddd; + color: #ff8000; + .quicktip-summary { + display: flex; + justify-content: space-between; + align-items: center; + h1 { + margin: 0px; + } + p { + margin: 5px; + .spendenaufruf-btn { + color: white; + background-color: #ff8000; + font-size: 16px; + } + } + } + } + &[type=dictCC] { + .quicktip-summary { + p { + font-weight: bold; + } + } + } + } } \ No newline at end of file diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less index 9146a6ae..32b06000 100644 --- a/resources/assets/less/metager/result-page.less +++ b/resources/assets/less/metager/result-page.less @@ -1,37 +1,9 @@ -@body-background-color: @result-page-body-background-color; -@hostlabel-a-link-or-visited-color: @result-page-color-white; -@hostlabel-background-color: @result-page-color-strong-grey; -@navbar-resultpage-background-color: @result-page-color-white; -@navbar-resultpage-ul-li-a-not-metager-navbar-toggle-color: @result-page-color-grey; -@navbar-resultpage-ul-li-a-metager-dropdown-toggle-hover-or-focus-background-color: @result-page-color-almost-white; -@research-a-color: @result-page-color-black; -@content-wrapper-background-color: @result-page-color-white; -@a-visited-color: @result-page-a-visited-color; -@a-hover-color: @result-page-a-hover-color; -@a-donation-normal-or-visited-color: inherit; -@a-donation-hover-color: @result-page-a-hover-color; -@resultpage-foki-or-foki-background-color: @result-page-color-white; -@resultpage-foki-or-foki-li-a-color: @result-page-color-grey; -@resultpage-foki-or-foki-li-active-a-color: @result-page-color-black; -@resultpage-foki-or-foki-li-active-a-background-color: @result-page-color-white; -@spruch-author-color: @result-page-color-strong-grey; -@result-title-color: @result-page-color-black; -@result-link-options-color: @result-page-color-strong-grey; -@result-link-options-a-color: @result-page-color-strong-grey; -@result-description-color: @result-page-color-black; -@result-description-img-border-color: @result-page-color-almost-white; -@result-hoster-color: @result-page-color-grey; -@result-hoster-a-color: @result-page-color-strong-grey; -@options-list-li-hover-background-color: @result-page-color-almost-white; -@options-list-li-a-color: @result-page-color-strong-grey; -@image-item-img-box-shadow-color: fade(@result-page-color-black, 30%); -@searchplugin-a-color: @result-page-color-white; -@product-border-color: @result-page-color-almost-white; -@product-a-color: @result-page-color-strong-grey; -@product-price-color: @result-page-color-strong-grey; -@product-price-background-color: fade(@result-page-color-white, 90%); -@product-shop-color: @result-page-product-shop-color; -@lsprev-or-lsnext-i-background-color: @result-page-color-black; +/* Ergebnisseite */ + +@import "./quicktips.less"; +@import "./result.less"; +@import "./product.less"; +// body { &#resultBody { background-image: inherit; @@ -100,47 +72,6 @@ body { padding-left: 49px; } -.navbar-resultpage { - background-color: @navbar-resultpage-background-color; - position: absolute; - border-bottom: 2px solid #ff8000; - padding-bottom: 10px; - &>ul>li { - padding-left: 0; - padding-right: 0; - &>a:not(.metager-navbar-toggle) { - display: block; - padding: 10px; - color: @navbar-resultpage-ul-li-a-not-metager-navbar-toggle-color; - } - &.active>a, - a.metager-dropdown-toggle:hover, - a.metager-dropdown-toggle:focus { - background-color: @navbar-resultpage-ul-li-a-metager-dropdown-toggle-hover-or-focus-background-color; - } - } - &>ul.list-inline { - margin-bottom: 0; - } - @media (max-width: @screen-xs-max) { - right: 0px!important; - left: 0px!important; - } - right: initial; - left: initial; - margin-bottom: 0px; - .container { - padding: 0px; - margin: 0px; - } - .logo { - padding-top: 0px; - } - .input-group { - margin: 0px 5px; - } -} - .fa.fa-twitter { color: #6faedc } @@ -172,34 +103,6 @@ nav .input-group { padding: 5px 0; } -#research { - nav { - ul>li { - width: 20%; - vertical-align: middle; - padding-left: 15px; - padding-right: 15px; - } - ul>li.visible-xs { - width: 10%; - padding-left: 15px; - padding-right: 15px; - } - } - ul.list-inline { - margin-left: 0; - width: 100%; - } - a { - color: @research-a-color; - } - .visible-xs { - @media (max-width: 767px) { - display: inline-block!important; - } - } -} - .logo h1 { font-family: Liberation Sans, sans-serif; font-style: italic; @@ -239,34 +142,6 @@ a { } } -.resultpage-foki, -.foki { - background-color: @resultpage-foki-or-foki-background-color; - li { - margin: 0px; - margin-bottom: -1px; - a { - color: @resultpage-foki-or-foki-li-a-color; - padding: 8px 12px; - i+span { - margin-left: 5px; - } - } - span { - margin-left: 3px; - } - &.active { - i+span { - display: inline!important; - } - a { - color: @resultpage-foki-or-foki-li-active-a-color; - background-color: @resultpage-foki-or-foki-li-active-a-background-color; - } - } - } -} - #spenden { white-space: nowrap; overflow: hidden; @@ -317,169 +192,6 @@ a { flex-grow: 1; } -.result { - margin-top: 20px; - margin-bottom: 40px; - width: 100%; - &>.resultInformation { - border-radius: 5px; - padding-left: 0px; - &>.save { - position: absolute; - top: 0; - right: 10px; - cursor: pointer; - } - } - &>.remover { - cursor: pointer; - text-align: right; - color: #777; - } - .title { - color: @result-title-color; - text-decoration: none; - font-size: 18px; - font-weight: bold; - margin-bottom: 0; - white-space: nowrap; - line-height: 1.1; - max-width: 115ch; - overflow: hidden; - text-overflow: ellipsis; - } - .link { - font-size: 16px; - margin: 0; - line-height: 1.5; - &>div { - white-space: nowrap; - } - &>span { - white-space: nowrap; - margin: 0 5px; - } - .options { - color: @result-link-options-color; - float: left; - } - .options>a { - color: @result-link-options-a-color; - display: block; - padding-left: 8px; - padding-right: 5px; - } - } - .link-link { - white-space: nowrap; - max-width: 60%; - overflow: hidden; - text-overflow: ellipsis; - float: left; - } - .description { - margin-bottom: 3px; - color: @result-description-color; - font-size: 16px; - line-height: 1.3; - clear: both; - .date { - font-weight: bold; - } - p { - margin: 0; - margin-bottom: 4px; - } - img { - margin: 5px; - margin-left: 0px; - margin-right: 15px; - height: auto; - width: auto; - max-width: 120px; - max-height: 200px; - border: solid 1px @result-description-img-border-color; - } - } - &.ad { - .ad-label { - border: green solid 1px; - padding: 1px; - color: green; - border-radius: 4px; - } - .description { - max-width: 115ch; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - } - .hoster { - font-size: 13px; - margin: 0; - color: @result-hoster-color; - margin-right: 10px; - white-space: nowrap; - a { - color: @result-hoster-a-color; - } - } - .options { - .option-opener-icon { - display: block; - font-size: 16px; - color: #2A2ADE; - } - .option-content { - background-color: white; - z-index: 1000; - position: absolute; - border: grey solid 1px; - color: black; - font-size: 16px; - border-radius: 5px; - hr { - margin: 5px; - } - li { - padding: 5px - } - li:not(.option-title):hover { - background-color: #e0e0e0; - } - a, - a:hover, - a:focus, - a:visited { - color: black; - display: block; - } - } - } - .proxy { - font-size: 13px; - margin-top: 0; - white-space: nowrap; - img { - margin-bottom: 0px; - margin-right: 2px - } - } - .partnershop-info { - font-size: 13px; - margin-top: 0; - margin-left: 10px; - } - .result-image>img { - height: 100px; - padding: 10px; - } - .image>img { - max-width: 100%; - } -} - .description-container { margin: 0!important; } @@ -582,47 +294,6 @@ a { } } -.product { - text-align: center; - border: 1px dotted @product-border-color; - padding: 5px; - max-width: 150px; - height: 210px; - a { - color: @product-a-color; - } - img { - max-width: 100px; - } - .price { - position: relative; - top: 20px; - color: @product-price-color; - background-color: @product-price-background-color; - text-align: left; - width: 80px; - font-weight: bold; - } - .title { - font-size: 12px; - font-weight: bold; - text-align: left; - max-height: 31px; - overflow: hidden; - margin-bottom: 4px; - } - .shop { - font-size: 10px; - text-align: left; - color: @product-shop-color; - margin-bottom: 6px; - } - .shipping { - font-size: 10px; - text-align: left; - } -} - .lightslider { overflow: visible!important; } @@ -648,14 +319,6 @@ a { } } -.resultContainer { - margin: 0px; - padding: 20px 0px; - @media(max-width: @screen-xs-max) { - padding-right: 0px; - } -} - @keyframes quicktip-extender-turn { from { transform: rotate(0deg); @@ -666,123 +329,8 @@ a { } -/* - *

- *
- *
- * - *

TITLE - *

SUMMARY - *

- *

DETAILTITLE - *

DETAILSUMMARY - * GEFVON - * - */ - -#quicktips { - display: flex; - flex-direction: column; - details[open=""] .quicktip-extender { - animation-name: quicktip-extender-turn; - animation-fill-mode: forwards; - } - .quicktip { - margin: 10px 0px; - padding: 10px 0px 10px 10px; - border-left: 3px solid #fb0; - details:not([open=""]) { - .quicktip-summary p { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - .quicktip-summary { - h1 { - margin: 0px 0px 5px 0px; - font-size: 18px; - font-weight: bold; - display: flex; - justify-content: space-between; - .quicktip-extender { - margin-left: 10px; - color: #777; - font-size: 20px; - } - } - p { - font-size: 16px; - } - } - .quicktip-detail { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - h2 { - margin: 10px 0px; - font-size: 16px; - font-weight: bold; - } - p { - display: none; - font-size: 14px; - } - } - .gefVon { - float: right; - font-size: 15px; - } - &[type=spruch] { - border-left: 3px solid #070; - p { - color: #070; - .author { - color: #404040; - font-style: italic; - } - } - } - &[type=spendenaufruf] { - border-left: #ddd; - color: #ff8000; - .quicktip-summary { - display: flex; - justify-content: space-between; - align-items: center; - h1 { - margin: 0px; - } - p { - margin: 5px; - .spendenaufruf-btn { - color: white; - background-color: #ff8000; - font-size: 16px; - } - } - } - } - &[type=dictCC] { - .quicktip-summary { - p { - font-weight: bold; - } - } - } - } -} - - /* New result style */ -@result-width: 700px; -@quicktip-width: 500px; -html, -body, -.content-wrapper { - width: 100%; -} - .content-wrapper { display: flex; flex-direction: column; @@ -792,20 +340,8 @@ body, margin: 0px; } -#research-bar { - padding: 10px 60px 0px 10px; - border-bottom: 2px solid rgb(255, 128, 0); - display: flex; - justify-content: center; - #header-searchbar { - margin-left: 10px; - } - @media (max-width: @screen-xs-max) { - flex-direction: column; - padding-right: 10px; - } -} - +@result-width: 700px; +@quicktip-width: 500px; .resultpage-container { width: @result-width + @quicktip-width; align-self: center; @@ -828,34 +364,4 @@ body, padding-left: 50px; width: @quicktip-width; } -} - -.result { - .result-title a { - color: black; - font-size: 18px; - font-weight: bold; - } - .result-header { - display: flex; - >* { - white-space: nowrap; - } - >*:not(:first-child) { - margin-left: 5px; - } - .result-link { - overflow: auto; - a { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - display: block; - } - } - } -} - -@media (max-width: @screen-xs-max) { - // mobile } \ No newline at end of file diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less new file mode 100644 index 00000000..91efaf64 --- /dev/null +++ b/resources/assets/less/metager/result.less @@ -0,0 +1,187 @@ +/* Ergebnis */ + +.result { + margin-top: 20px; + margin-bottom: 40px; + width: 100%; + .result-title a { + color: black; + font-size: 18px; + font-weight: bold; + } + .result-header { + display: flex; + >* { + white-space: nowrap; + } + >*:not(:first-child) { + margin-left: 5px; + } + .result-link { + overflow: auto; + a { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: block; + } + } + } + .result-information { + border-radius: 5px; + padding-left: 0px; + &>.save { + position: absolute; + top: 0; + right: 10px; + cursor: pointer; + } + } + &>.remover { + cursor: pointer; + text-align: right; + color: #777; + } + .title { + color: @result-title-color; + text-decoration: none; + font-size: 18px; + font-weight: bold; + margin-bottom: 0; + white-space: nowrap; + line-height: 1.1; + max-width: 115ch; + overflow: hidden; + text-overflow: ellipsis; + } + .link { + font-size: 16px; + margin: 0; + line-height: 1.5; + &>div { + white-space: nowrap; + } + &>span { + white-space: nowrap; + margin: 0 5px; + } + .options { + color: @result-link-options-color; + float: left; + } + .options>a { + color: @result-link-options-a-color; + display: block; + padding-left: 8px; + padding-right: 5px; + } + } + .link-link { + white-space: nowrap; + max-width: 60%; + overflow: hidden; + text-overflow: ellipsis; + float: left; + } + .description { + margin-bottom: 3px; + color: @result-description-color; + font-size: 16px; + line-height: 1.3; + clear: both; + .date { + font-weight: bold; + } + p { + margin: 0; + margin-bottom: 4px; + } + img { + margin: 5px; + margin-left: 0px; + margin-right: 15px; + height: auto; + width: auto; + max-width: 120px; + max-height: 200px; + border: solid 1px @result-description-img-border-color; + } + } + &.ad { + .ad-label { + border: green solid 1px; + padding: 1px; + color: green; + border-radius: 4px; + } + .description { + max-width: 115ch; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + .hoster { + font-size: 13px; + margin: 0; + color: @result-hoster-color; + margin-right: 10px; + white-space: nowrap; + a { + color: @result-hoster-a-color; + } + } + .options { + .option-opener-icon { + display: block; + font-size: 16px; + color: #2A2ADE; + } + .option-content { + background-color: white; + z-index: 1000; + position: absolute; + border: grey solid 1px; + color: black; + font-size: 16px; + border-radius: 5px; + hr { + margin: 5px; + } + li { + padding: 5px + } + li:not(.option-title):hover { + background-color: #e0e0e0; + } + a, + a:hover, + a:focus, + a:visited { + color: black; + display: block; + } + } + } + .proxy { + font-size: 13px; + margin-top: 0; + white-space: nowrap; + img { + margin-bottom: 0px; + margin-right: 2px + } + } + .partnershop-info { + font-size: 13px; + margin-top: 0; + margin-left: 10px; + } + .result-image>img { + height: 100px; + padding: 10px; + } + .image>img { + max-width: 100%; + } +} \ No newline at end of file diff --git a/resources/assets/less/metager/searchbar.less b/resources/assets/less/metager/searchbar.less index e342914a..1739d447 100644 --- a/resources/assets/less/metager/searchbar.less +++ b/resources/assets/less/metager/searchbar.less @@ -1,3 +1,5 @@ +/* Suchleiste */ + .searchbar { display: flex; align-items: stretch; @@ -210,4 +212,18 @@ div:hover>.searchbar-tooltip { width: 100%; } } +} + +#research-bar { + padding: 10px 60px 0px 10px; + border-bottom: 2px solid rgb(255, 128, 0); + display: flex; + justify-content: center; + #header-searchbar { + margin-left: 10px; + } + @media (max-width: @screen-xs-max) { + flex-direction: column; + padding-right: 10px; + } } \ No newline at end of file diff --git a/resources/assets/less/metager/settings.less b/resources/assets/less/metager/settings.less index 5ea4a824..c4979db2 100644 --- a/resources/assets/less/metager/settings.less +++ b/resources/assets/less/metager/settings.less @@ -1,3 +1,5 @@ +/* Einstellungen */ + #settings-buttons { margin-top: 10px; display: flex; diff --git a/resources/assets/less/metager/sidebar.less b/resources/assets/less/metager/sidebar.less index 93a46ba1..c26823cb 100644 --- a/resources/assets/less/metager/sidebar.less +++ b/resources/assets/less/metager/sidebar.less @@ -1,9 +1,5 @@ -@metager-dropdown-toggle-hover-or-focus-color: fade(@static-pages-color-black, 15%); -@metager-dropdown-menu-background-color: @static-pages-color-white; -@metager-dropdown-menu-box-shadow-color: fade(@static-pages-color-black, 17.5%); -@metager-dropdown-menu-li-a-color: @static-pages-color-almost-black; -@metager-dropdown-menu-li-a-hover-color: @static-pages-color-strong-grey; -@metager-dropdown-menu-li-a-hover-background-color: @static-pages-color-almost-white; +/* Navigations-Seitenleiste */ + .sideBar { position: fixed; display: block; diff --git a/resources/assets/less/metager/specific.less b/resources/assets/less/metager/specific.less new file mode 100644 index 00000000..c0d76dd6 --- /dev/null +++ b/resources/assets/less/metager/specific.less @@ -0,0 +1,223 @@ +/* Rules for specific elements */ + +ul.startpage { + list-style-type: none; +} + +li#info { + white-space: pre-line; +} + +div#top { + padding-right: 35px; +} + +div#expand { + max-height: 0px; + overflow: hidden; + -webkit-transition: max-height 0.5s; + -moz-transition: max-height 0.5s; + -o-transition: max-height 0.5s; + transition: max-height 0.5s; +} + +textarea#message { + height: 200px; +} + +#plugin-modal ol>li { + margin-bottom: 5px; +} + +.wikiqtextract { + font-family: Georgia, "Times New Roman", Palatino, Times, serif; +} + +.language-textarea { + resize: none; + overflow: hidden; +} + +.language-name { + white-space: pre; +} + +.navbar-default { + background-color: @navbar-default-background-color; + border-radius: 0; +} + +.row { + margin-left: 0; + margin-right: 0; +} + +.form-group { + font-family: sans-serif; + font-size: 16px; + color: @form-group-color; + background-color: transparent; + text-align: center; +} + +.kontakt-form-group { + text-align: left; + font-size: 14px; +} + +.dotlist { + list-style-type: disc; + text-align: left; +} + +.well-sm { + margin: 10px 0px; +} + +.subheading { + font-size: 20px; + margin: 20px 0px; + white-space: pre-wrap; +} + +.donation-form-group { + text-align: left; + font-size: 12px; +} + +.beitritt-form-group { + text-align: left; +} + +.fokus-category { + font-size: 20px; +} + +.bitcoins { + text-align: center; + padding: 30px; +} + +.checkbox { + margin-top: 5px; + margin-bottom: 5px; +} + +.non-bold { + font-weight: normal; +} + +.settings-checkbox .settings-icon { + margin-left: 5px; + font-size: 12px; +} + +.wikiqtextract p { + margin-bottom: 0; +} + +i.fa { + background-color: transparent; +} + +a.content.hidden-xs { + color: @a-content-hidden-xs-color; +} + +a.navbar-brand { + line-height: 100%!important; + padding: 0; + position: absolute; + z-index: 5; + left: 10px; +} + +.dotlist li { + margin-bottom: 5px; +} + +form.contact { + max-width: 500px; +} + +label.select-label { + margin-bottom: 0; + margin-top: 10px; +} + +.donation-form-group label { + font-weight: bold; +} + +section { + padding: 10px; + box-shadow: 5px 5px 10px 0px @section-box-shadow-color; + -moz-box-shadow: 5px 5px 10px 0px @section-box-shadow-color; + -moz-box-shadow: 5px 5px 10px 0px @section-box-shadow-color; +} + +address { + white-space: pre; +} + +code { + white-space: pre-wrap; + overflow-wrap: break-word; + word-break: break-word; +} + +input[name=eingabe] { + border-right: 0; + box-shadow: inset 0 1px 0px rgba(0, 0, 0, 0.075); +} + +input#toggle { + display: none; + visibility: hidden; + &:checked { + &~#expand { + max-height: 900px; + } + ~label::after { + content: "▲"; + } + } +} + +fieldset input[type=text] { + width: 100%; + padding-left: 10px; + padding-right: 10px; + border-width: 1px; + overflow: visible; +} + +main { + ul li:not(.lslide) { + margin: 0 10px; + } + div#foki { + margin: 5px 0; + text-align: center; + } + fieldset { + border: 0; + } +} + +.searchform-bonus { + list-style-type: none; + text-align: center; + margin-left: 0!important; + margin-top: 10px; +} + +.panel-title { + font-weight: bold; +} + +.signature { + border-top: 1px dashed black; + width: 50%; + margin-top: 16px; +} \ No newline at end of file diff --git a/resources/assets/less/metager/start-page.less b/resources/assets/less/metager/start-page.less index 41a6e3bb..d37b49dd 100644 --- a/resources/assets/less/metager/start-page.less +++ b/resources/assets/less/metager/start-page.less @@ -1,3 +1,5 @@ +/* Startseite */ + @search-bar-width: 1000px; .mg-panel { @media(max-width: @search-bar-width) { @@ -73,4 +75,36 @@ #about-us a:visited { color: @link-color; +} + +#sponsors { + a { + font-size: 0.8em; + } + h2 { + font-size: 1.5em; + } +} + +#more-information { + box-shadow: none; + margin-top: 5%; + text-align: center; + -moz-box-shadow: none; + ul { + padding: 0; + } + ul li { + color: @more-information-ul-li-color; + } + &>div { + font-size: 15px; + } + h2 { + color: @more-information-h2-color; + font-size: 25px; + } + a:hover { + text-decoration: underline; + } } \ No newline at end of file diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less deleted file mode 100644 index 35070d9f..00000000 --- a/resources/assets/less/metager/static-pages.less +++ /dev/null @@ -1,449 +0,0 @@ -@quicktip-background-color: @static-pages-color-white; -@spruch-color: @static-pages-spruch-color; -@spruch-border-left-color: @spruch-color; -@spruch-author-color: @static-pages-color-grey; -@metager-navbar-toggle-color: @static-pages-color-grey; -@metager-navbar-toggle-background-color: @static-pages-color-white; -@metager-navbar-toggle-border-color: @static-pages-color-almost-white; -@metager-navbar-toggle-visited-color: @static-pages-color-grey; -@metager-navbar-toggle-hover-background-color: @static-pages-color-almost-white; -@toggle-nav-hide-or-metager-navbar-toggle-background-color: rgb(255, 128, 0); -@more-information-ul-li-color: @static-pages-color-grey; -@more-information-h2-color: @static-pages-color-grey; -@div-right-background-color: @static-pages-color-almost-white; -@div-right-p-border-bottom-color: @static-pages-color-black; -@quicktip-color: @static-pages-color-black; -@quicktip-border-left-color: @static-pages-quicktip-aufruf-color; -@quicktip-aufruf-color: @static-pages-quicktip-aufruf-background; -@quicktip-aufruf-border-left-color: @quicktip-aufruf-color; -@navbar-default-background-color: @static-pages-color-white; -@mg-panel-background-color: @static-pages-color-white; -@form-group-color: @static-pages-color-black; -@metager-searchinput-color: @static-pages-color-strong-grey; -@metager-searchinput-background-color: @static-pages-color-white; -@metager-searchinput-border-color: @static-pages-color-almost-white; -@metager-searchbutton-color: @static-pages-color-strong-grey; -@metager-searchbutton-background-color: @static-pages-color-almost-white; -@metager-searchbutton-border-color: @static-pages-color-almost-white; -@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%); -ul.startpage { - list-style-type: none; -} - -nav { - h1 { - margin: 0; - height: 100%; - padding-left: 20px; - padding-top: 8px; - font-family: sans-serif; - font-style: italic; - margin: 0; - font-weight: bold; - line-height: 1; - white-space: nowrap; - } - .navbar-brand>div.logo { - height: 100%; - } -} - -#mglogo { - color: rgb(255, 128, 0); - text-align: center; - &>a { - display: block; - text-decoration: none; - font-size: 1.1em; - font-family: Liberation Sans, sans-serif; - font-weight: bold; - font-style: italic; - font-size: 1.0em; - line-height: 1; - white-space: nowrap; - border-radius: .25em; - margin: 0 auto; - } -} - -#spruch { - margin-bottom: 20px; - padding: 5px; - line-height: 1.2; - color: @spruch-color; - border-left: 3px solid @spruch-border-left-color; - font-size: 16px; - font-family: Georgia, "Times New Roman", Palatino, Times, serif; - .author { - font-size: 14px; - color: @spruch-author-color; - } -} - -.metager-navbar-toggle { - color: @metager-navbar-toggle-color; - background-color: @metager-navbar-toggle-background-color; - padding: 5px 10px; - margin: 5px 8px 5px 0; - border-radius: 7px; - border: 1px solid @metager-navbar-toggle-border-color; - display: block; - width: 36px; - height: 30px; - &:visited { - color: @metager-navbar-toggle-visited-color; - } -} - -#toggle-nav-hide .metager-navbar-toggle { - background-color: @toggle-nav-hide-or-metager-navbar-toggle-background-color; -} - -#sponsors { - a { - font-size: 0.8em; - } - h2 { - font-size: 1.5em; - } -} - -#moreInformation { - box-shadow: none; - margin-top: 5%; - text-align: center; - -moz-box-shadow: none; - ul { - padding: 0; - } - ul li { - color: @more-information-ul-li-color; - } - &>div { - font-size: 15px; - } - h2 { - color: @more-information-h2-color; - font-size: 25px; - } - a:hover { - text-decoration: underline; - } -} - -li#info { - white-space: pre-line; -} - -div#top { - padding-right: 35px; -} - -div#expand { - max-height: 0px; - overflow: hidden; - -webkit-transition: max-height 0.5s; - -moz-transition: max-height 0.5s; - -o-transition: max-height 0.5s; - transition: max-height 0.5s; -} - -textarea#message { - height: 200px; -} - -#plugin-modal ol>li { - margin-bottom: 5px; -} - -.wikiqtextract { - font-family: Georgia, "Times New Roman", Palatino, Times, serif; -} - -.qt-header { - font-family: verdana, arial, helvetica, sans-serif; -} - -.author { - float: right !important; -} - -.language-textarea { - resize: none; - overflow: hidden; -} - -.language-name { - white-space: pre; -} - -.navbar-default { - background-color: @navbar-default-background-color; - border-radius: 0; -} - -.row { - margin-left: 0; - margin-right: 0; -} - -.input-group-addon { - padding: 0; -} - -.form-group { - font-family: sans-serif; - font-size: 16px; - color: @form-group-color; - background-color: transparent; - text-align: center; -} - -.kontakt-form-group { - text-align: left; - font-size: 14px; -} - -.metager-searchinput { - height: 30px; - padding: 6px 12px; - font-size: 14px; - line-height: 1.42857; - color: @metager-searchinput-color; - background-color: @metager-searchinput-background-color; - background-image: none; - border: 1px solid @metager-searchinput-border-color; - border-right: 0px none; - border-radius: 4px; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; - margin: 0px; -} - -.metager-searchbutton { - height: 30px; - width: 100px; - border-left: 0px none; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; - color: @metager-searchbutton-color; - background-color: @metager-searchbutton-background-color; - border: 1px solid @metager-searchbutton-border-color; - padding: 6px 12px; - margin: 0px; - font-size: 14px; - font-weight: normal; - line-height: 1; - white-space: nowrap; - text-align: center; -} - -.metager-logo { - height: 30px; - float: left; - top: -2px; - margin-right: 3px; -} - -.mutelink { - color: inherit; - &:visited { - color: inherit; - } -} - -.dotlist { - list-style-type: disc; - text-align: left; -} - -.well-sm { - margin: 10px 0px; -} - -.subheading { - font-size: 20px; - margin: 20px 0px; - white-space: pre-wrap; -} - -.donation-form-group { - text-align: left; - font-size: 12px; -} - -.beitritt-form-group { - text-align: left; -} - -.modal-content { - border-radius: 0; - -webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; - -moz-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; - box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; -} - -.bold { - font-weight: bold; -} - -.fokus-category { - font-size: 20px; -} - -.bitcoins { - text-align: center; - padding: 30px; -} - -.checkbox { - margin-top: 5px; - margin-bottom: 5px; -} - -.non-bold { - font-weight: normal; -} - -.settings-checkbox .settings-icon { - margin-left: 5px; - font-size: 12px; -} - -.wikiqtextract p { - margin-bottom: 0; -} - -i.fa { - background-color: transparent; -} - -a.content.hidden-xs { - color: @a-content-hidden-xs-color; -} - -a.navbar-brand { - line-height: 100%!important; - padding: 0; - position: absolute; - z-index: 5; - left: 10px; -} - -.logo { - height: 30px!important; - &>h1 { - font-size: 30px; - } -} - -.dotlist li { - margin-bottom: 5px; -} - -form.contact { - max-width: 500px; -} - -label.select-label { - margin-bottom: 0; - margin-top: 10px; -} - -.donation-form-group label { - font-weight: bold; -} - -section { - padding: 10px; - box-shadow: 5px 5px 10px 0px @section-box-shadow-color; - -moz-box-shadow: 5px 5px 10px 0px @section-box-shadow-color; - -moz-box-shadow: 5px 5px 10px 0px @section-box-shadow-color; -} - -address { - white-space: pre; -} - -code { - white-space: pre-wrap; - overflow-wrap: break-word; - word-break: break-word; -} - -label a { - color: inherit; - &:hover { - text-decoration: none; - color: inherit; - } -} - -input[name=eingabe] { - border-right: 0; - box-shadow: inset 0 1px 0px rgba(0, 0, 0, 0.075); -} - -input#toggle { - display: none; - visibility: hidden; - &:checked { - &~#expand { - max-height: 900px; - } - ~label::after { - content: "▲"; - } - } -} - -fieldset input[type=text] { - width: 100%; - padding-left: 10px; - padding-right: 10px; - border-width: 1px; - overflow: visible; -} - -main { - ul li:not(.lslide) { - margin: 0 10px; - } - div#foki { - margin: 5px 0; - text-align: center; - } - fieldset { - border: 0; - } -} - -.searchform-bonus { - list-style-type: none; - text-align: center; - margin-left: 0!important; - margin-top: 10px; -} - -.panel-title { - font-weight: bold; -} - -.signature { - border-top: 1px dashed black; - width: 50%; - margin-top: 16px; -} - -@media print { - .noprint { - display: none!important; - } - .beitritt-formular-info * { - font-size: 7pt !important; - } -} \ No newline at end of file diff --git a/resources/assets/less/metager/variables.less b/resources/assets/less/metager/variables.less index bdca9c86..503a4b18 100644 --- a/resources/assets/less/metager/variables.less +++ b/resources/assets/less/metager/variables.less @@ -59,4 +59,89 @@ sans-serif; @base-aufruf-winter-border-color: #953535; @base-aufruf-winter-btn-color: white; @base-aufruf-winter-btn-hover-background-color: #bd0d0d; -@base-new-feature-badge-background-color: #f80; \ No newline at end of file +@base-new-feature-badge-background-color: #f80; + +/* Unsorted */ + +@quicktip-background-color: @static-pages-color-white; +@spruch-color: @static-pages-spruch-color; +@spruch-border-left-color: @spruch-color; +@spruch-author-color: @static-pages-color-grey; +@metager-navbar-toggle-color: @static-pages-color-grey; +@metager-navbar-toggle-background-color: @static-pages-color-white; +@metager-navbar-toggle-border-color: @static-pages-color-almost-white; +@metager-navbar-toggle-visited-color: @static-pages-color-grey; +@metager-navbar-toggle-hover-background-color: @static-pages-color-almost-white; +@toggle-nav-hide-or-metager-navbar-toggle-background-color: rgb(255, 128, 0); +@more-information-ul-li-color: @static-pages-color-grey; +@more-information-h2-color: @static-pages-color-grey; +@div-right-background-color: @static-pages-color-almost-white; +@div-right-p-border-bottom-color: @static-pages-color-black; +@quicktip-color: @static-pages-color-black; +@quicktip-border-left-color: @static-pages-quicktip-aufruf-color; +@quicktip-aufruf-color: @static-pages-quicktip-aufruf-background; +@quicktip-aufruf-border-left-color: @quicktip-aufruf-color; +@navbar-default-background-color: @static-pages-color-white; +@mg-panel-background-color: @static-pages-color-white; +@form-group-color: @static-pages-color-black; +@metager-searchinput-color: @static-pages-color-strong-grey; +@metager-searchinput-background-color: @static-pages-color-white; +@metager-searchinput-border-color: @static-pages-color-almost-white; +@metager-searchbutton-color: @static-pages-color-strong-grey; +@metager-searchbutton-background-color: @static-pages-color-almost-white; +@metager-searchbutton-border-color: @static-pages-color-almost-white; +@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%); +// +@body-background-color: @base-body-backround-color; +@aufruf-winter-a-normal-or-visited: @base-aufruf-winter-color; +@aufruf-winter-aufruf-action-btn-color: @base-aufruf-winter-btn-color!important; +@aufruf-winter-aufruf-action-btn-background-color: @base-aufruf-winter-color!important; +@aufruf-winter-aufruf-action-btn-border-color: @base-aufruf-winter-border-color; +@aufruf-winter-aufruf-action-btn-hover-background-color: @base-aufruf-winter-btn-hover-background-color !important; +@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; +// +@body-background-color: @result-page-body-background-color; +@hostlabel-a-link-or-visited-color: @result-page-color-white; +@hostlabel-background-color: @result-page-color-strong-grey; +@navbar-resultpage-background-color: @result-page-color-white; +@navbar-resultpage-ul-li-a-not-metager-navbar-toggle-color: @result-page-color-grey; +@navbar-resultpage-ul-li-a-metager-dropdown-toggle-hover-or-focus-background-color: @result-page-color-almost-white; +@research-a-color: @result-page-color-black; +@content-wrapper-background-color: @result-page-color-white; +@a-visited-color: @result-page-a-visited-color; +@a-hover-color: @result-page-a-hover-color; +@a-donation-normal-or-visited-color: inherit; +@a-donation-hover-color: @result-page-a-hover-color; +@resultpage-foki-or-foki-background-color: @result-page-color-white; +@resultpage-foki-or-foki-li-a-color: @result-page-color-grey; +@resultpage-foki-or-foki-li-active-a-color: @result-page-color-black; +@resultpage-foki-or-foki-li-active-a-background-color: @result-page-color-white; +@spruch-author-color: @result-page-color-strong-grey; +@result-title-color: @result-page-color-black; +@result-link-options-color: @result-page-color-strong-grey; +@result-link-options-a-color: @result-page-color-strong-grey; +@result-description-color: @result-page-color-black; +@result-description-img-border-color: @result-page-color-almost-white; +@result-hoster-color: @result-page-color-grey; +@result-hoster-a-color: @result-page-color-strong-grey; +@options-list-li-hover-background-color: @result-page-color-almost-white; +@options-list-li-a-color: @result-page-color-strong-grey; +@image-item-img-box-shadow-color: fade(@result-page-color-black, 30%); +@searchplugin-a-color: @result-page-color-white; +@product-border-color: @result-page-color-almost-white; +@product-a-color: @result-page-color-strong-grey; +@product-price-color: @result-page-color-strong-grey; +@product-price-background-color: fade(@result-page-color-white, 90%); +@product-shop-color: @result-page-product-shop-color; +@lsprev-or-lsnext-i-background-color: @result-page-color-black; +// +@metager-dropdown-toggle-hover-or-focus-color: fade(@static-pages-color-black, 15%); +@metager-dropdown-menu-background-color: @static-pages-color-white; +@metager-dropdown-menu-box-shadow-color: fade(@static-pages-color-black, 17.5%); +@metager-dropdown-menu-li-a-color: @static-pages-color-almost-black; +@metager-dropdown-menu-li-a-hover-color: @static-pages-color-strong-grey; +@metager-dropdown-menu-li-a-hover-background-color: @static-pages-color-almost-white; \ No newline at end of file diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b26cf97e..a1b3e0ed 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -12,7 +12,7 @@ @endsection @section('optionalContent') -