diff --git a/gulpfile.js b/gulpfile.js
index eab976cd79397febef9712e39d2a24542d531e44..1cf337858cd35faa2b9a2fcd363522c122d96580 100644
--- a/gulpfile.js
+++ b/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']);
})
diff --git a/public/css/style.css b/public/css/style.css
deleted file mode 100644
index b0a1c9f104c90a71ed57b5a26bc324de27068cd3..0000000000000000000000000000000000000000
--- a/public/css/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 98300d45bc1f52db2045c46ab194faa934056369..c551d583efab42a9337fbcd52b2fbf46d299677b 100644
--- a/resources/assets/js/results.js
+++ b/resources/assets/js/results.js
@@ -251,7 +251,7 @@ Result.prototype.toHtml = function(){
<div class="result row">\
<div class="col-sm-1 glyphicon glyphicon-trash remover" title="Ergebnis aus dem Speicher löschen">\
</div>\
- <div class="resultInformation col-xs-12 col-sm-11">\
+ <div class="result-information col-xs-12 col-sm-11">\
<div class="col-xs-10 col-sm-11" style="padding:0; ">\
<p class="title">\
<a class="title" href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="1" rel="noopener">\
diff --git a/resources/assets/less/default.less b/resources/assets/less/default.less
index f64afa38051446a6c28c7ff29bc1a6d0cc3d7ee1..1b94f65debf1c89e6c658dc2571493b23ae75c16 100644
--- a/resources/assets/less/default.less
+++ b/resources/assets/less/default.less
@@ -1,48 +1,2 @@
@import "./bootstrap/bootstrap.less";
-@import "./metager/metager.less";
-@import "./variables-default.less";
-
-#mglogo>a {
-}
-
-.logo h1 {
- color: rgb(255, 128, 0);
-}
-
-.pagination {
- &>.active {
- &>a,
- &>span,
- &>a:hover,
- &>span:hover,
- &>a:focus,
- &>span:focus {
- background-color: rgb(255, 128, 0);
- border-color: rgb(255, 128, 0);
- }
- }
- &>li {
- &>a,
- &>span,
- &>a:hover,
- &>span:hover,
- &>a:focus,
- &>span:focus {
- color: rgb(255, 128, 0);
- }
- }
-}
-
-.navbar {
- border-bottom: 3px solid rgb(255, 128, 0);
- box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
- &.navbar-resultpage {
- border-bottom: 2px solid rgb(255, 128, 0);
- box-shadow: none;
- }
-}
-
-.lSPrev>span,
-.lSNext>span {
- color: rgb(255, 128, 0);
-}
\ No newline at end of file
+@import "./metager/metager.less";
\ No newline at end of file
diff --git a/resources/assets/less/metager/aufruf-winter.less b/resources/assets/less/metager/aufruf-winter.less
new file mode 100644
index 0000000000000000000000000000000000000000..6c82ff6ac1a04c40fce071d325cb658ffab36377
--- /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 34630089f1daba99df4650f35b616d3f15db367d..0000000000000000000000000000000000000000
--- a/resources/assets/less/metager/base.less
+++ /dev/null
@@ -1,102 +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;
-html {
- min-height: 100%;
- height: auto;
- display: flex;
-}
-
-body {
- flex-grow: 1;
- background-color: @body-background-color;
- background-attachment: fixed;
- min-height: 100%;
- height: auto;
- display: flex;
- flex-direction: column;
-}
-
-.wrapper {
- flex-grow: 1;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-}
-
-body#resultBody {
- background-image: inherit;
-}
-
-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;
-}
diff --git a/resources/assets/less/metager/beitritt.less b/resources/assets/less/metager/beitritt.less
index 63ec36dfd1dda5efafcfde4a8cbc0dcd1f53b74e..c82ffb54ab3588e10b1c2d80cf705da787258dc5 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 ce59c2053fe6a8981ceaf49a45ca95a358d5693e..e1dae268f5d69c170da29f8aa913ef5f345bdcff 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%;
@@ -5,7 +7,7 @@ footer {
display: flex;
justify-content: space-around;
white-space: pre-line;
- align-items: flex-end;
+ align-items: center;
div {
text-align: center;
margin-left: 10px;
@@ -27,4 +29,8 @@ footer {
display: none;
}
}
+ #info {
+ display: flex;
+ flex-direction: column;
+ }
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less
new file mode 100644
index 0000000000000000000000000000000000000000..f7e4198193eaa5bc2bcc0c040d8e163572b0ab40
--- /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 70fb8159af0e80d601212220134711cb4ec894b2..03eba70fb3afd77163bbde834e7f5c4e15dfd95b 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 0000000000000000000000000000000000000000..2ab7ac88b60f0dfaa78a76bdae86cb7442859f28
--- /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 a1e0a076aea380d2e46f72b452935801a2188cbb..60951b998e0d961d000ae59a91b8905a02f0d36c 100644
--- a/resources/assets/less/metager/quicktips.less
+++ b/resources/assets/less/metager/quicktips.less
@@ -1,15 +1,108 @@
-.qtheader {
- font-size: 16px;
- margin: 0px;
- font-weight: bold;
-}
+/* Quicktips */
-.qt-icon {
- height: 60px;
-}
-.detail-short {
- font-weight: bold;
- font-size: 18px;
- line-height: 30px;
+/*
+ * <div id="quicktips">
+ * <div class="quicktip" type="TYPE">
+ * <details>
+ * <summary>
+ * <h1><a href="URL">TITLE
+ * <p>SUMMARY
+ * <div class="quicktip-detail">
+ * <h1><a href="DETAILURL">DETAILTITLE
+ * <p>DETAILSUMMARY
+ * <span>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 ddc217ad23c3febd1f84ea0d4395388aa169d045..32b060005ba0a8acc887489dfaa25f5666d9b386 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -1,49 +1,32 @@
-@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 {
- background-image: inherit;
- background-color: white;
+ &#resultBody {
+ background-image: inherit;
+ }
+ &.quicktips {
+ background-color: @quicktip-background-color;
+ }
}
-.sideBar {
- border-left: none;
- input#nav0:checked~& {
- border-left: 1px solid LightGray;
+.navbar {
+ border-bottom: 3px solid rgb(255, 128, 0);
+ box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
+ &.navbar-resultpage {
+ border-bottom: 2px solid rgb(255, 128, 0);
+ box-shadow: none;
}
}
+.lSPrev>span,
+.lSNext>span {
+ color: rgb(255, 128, 0);
+}
+
#map,
#map div {
display: flex;
@@ -89,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
}
@@ -161,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;
@@ -205,12 +119,6 @@ nav .input-group {
height: 100%;
}
-.content-wrapper {
- padding: 0px;
- padding-top: 52px;
- background-color: white;
-}
-
#helpButton {
color: black;
}
@@ -234,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;
@@ -298,181 +178,20 @@ a {
#logo-searchbar-container {
display: flex;
+ @media (max-width: @screen-xs-max) {
+ flex-direction: column;
+ }
}
.mg-logo {
color: #ff8000;
font-family: Liberation Sans, sans-serif;
- padding: 5px 30px 0px 0px;
}
#header-searchbar {
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;
}
@@ -547,7 +266,8 @@ a {
}
}
-.disabled, .disabled * {
+.disabled,
+.disabled * {
color: #aaa !important;
cursor: not-allowed !important;
}
@@ -574,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;
}
@@ -640,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);
@@ -658,108 +329,39 @@ a {
}
-/*
- * <div id="quicktips">
- * <div class="quicktip" type="TYPE">
- * <details>
- * <summary>
- * <h1><a href="URL">TITLE
- * <p>SUMMARY
- * <div class="quicktip-detail">
- * <h1><a href="DETAILURL">DETAILTITLE
- * <p>DETAILSUMMARY
- * <span>GEFVON
- * </...>
- */
+/* New result style */
-#quicktips {
+.content-wrapper {
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: 17px;
- font-weight: bold;
- }
- p {
- display: none;
- font-size: 15px;
- }
- }
- .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;
- }
- }
+}
+
+#header-logo a h1 {
+ margin: 0px;
+}
+
+@result-width: 700px;
+@quicktip-width: 500px;
+.resultpage-container {
+ width: @result-width + @quicktip-width;
+ align-self: center;
+ @media (max-width: (@result-width + @quicktip-width - 1px)) {
+ width: @result-width;
+ #quicktips {
+ display: none;
}
}
+ @media (max-width: @result-width) {
+ width: 100%;
+ }
+ display: flex;
+ justify-content: center;
+ #results {
+ max-width: @result-width;
+ width: 100%;
+ }
+ #quicktips {
+ padding-left: 50px;
+ width: @quicktip-width;
+ }
}
\ 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 0000000000000000000000000000000000000000..33a367c37cc0a662ceccc4be0e7e16245808b561
--- /dev/null
+++ b/resources/assets/less/metager/result.less
@@ -0,0 +1,144 @@
+/* Ergebnis */
+
+.result {
+ margin-top: 30px;
+ margin-bottom: 30px;
+ padding-bottom: 30px;
+ width: 100%;
+ .result-title {
+ margin: 0px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ a,
+ a:active,
+ a:focus,
+ a:visited {
+ color: black;
+ font-size: 18px;
+ font-weight: bold;
+ text-decoration: none;
+ }
+ }
+ .result-header {
+ display: flex;
+ >*:not(:first-child) {
+ margin-left: 10px;
+ }
+ .result-link {
+ overflow: auto;
+ a {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block;
+ }
+ }
+ .result-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;
+ }
+ }
+ }
+ .result-hoster {
+ font-size: 13px;
+ color: @result-hoster-color;
+ white-space: nowrap;
+ a {
+ color: @result-hoster-a-color;
+ }
+ }
+ .partnershop-info {
+ font-size: 13px;
+ margin-top: 0;
+ margin-left: 10px;
+ }
+ .result-proxy {
+ font-size: 13px;
+ margin-top: 0;
+ white-space: nowrap;
+ img {
+ margin-bottom: 0px;
+ margin-right: 2px
+ }
+ }
+ }
+ .result-body {
+ .result-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;
+ }
+ }
+ .result-image>img {
+ height: 100px;
+ padding: 10px;
+ max-width: 100%;
+ }
+ }
+ &.ad .ad-label {
+ border: green solid 1px;
+ padding: 1px;
+ color: green;
+ border-radius: 4px;
+ }
+ .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;
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/searchbar.less b/resources/assets/less/metager/searchbar.less
index 0b7b38a64c9a957cbf18ecc93f51929847bc4172..7d26270aa966bb87b5d9b1f75caac931851c5ff7 100644
--- a/resources/assets/less/metager/searchbar.less
+++ b/resources/assets/less/metager/searchbar.less
@@ -1,11 +1,13 @@
+/* Suchleiste */
+
.searchbar {
display: flex;
align-items: stretch;
+ justify-content: center;
font-size: 16px;
background-color: white;
-
+ color: #333;
.search-focus-selector {
- background-color: transparent;
border-radius: 5px 0px 0px 5px;
display: flex;
align-items: center;
@@ -20,12 +22,27 @@
select {
width: 100%;
- color: #777;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
background-color: transparent;
- padding-right: 35px;
+ padding: 0px 35px 0px 5px;
+ font-family: FontAwesome, sans-serif;
+ border: none;
+ &>option {
+ font-family: FontAwesome, sans-serif;
+ }
+ }
+ &:after {
+ content: "\f078";
+ font: 15px "FontAwesome", sans-serif; //text-align: center;
+ line-height: 30px;
+ background-color: transparent;
+ right: 8px;
+ top: 2px;
+ padding: 2px 2px 2px 5px;
+ position: absolute;
+ pointer-events: none;
}
}
@@ -96,6 +113,10 @@
.search-input-submit {
flex-grow: 1;
display: flex;
+ max-width: 600px;
+ @media (max-width: @screen-xs-max) {
+ max-width: initial;
+ }
}
.search-input {
flex-grow: 1;
@@ -127,15 +148,40 @@
.search-custom-hidden {
display: none;
}
+ .searchbar-tooltip {
+ display: none;
+ position: absolute;
+ margin-top: 40px;
+ &>.searchbar-tooltip-arrow {
+ width: 0;
+ height: 0;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-bottom: 5px solid #ff8000;
+ margin-left: 5%;
+ }
+ &>.searchbar-tooltip-content {
+ position: relative;
+ margin-left: -45%;
+ &>p {
+ display: inline-block;
+ background: #ff8000;
+ border-radius: .25em;
+ font-size: 16px;
+ color: white;
+ padding: 5px 10px;
+ }
+ }
+ }
@media (max-width: @screen-xs-max) {
flex-direction: column-reverse;
}
}
-
-.searchform-bonus {
- li {
- margin: 5px;
+div:hover>.searchbar-tooltip {
+ display: inline-block;
+ @media (max-width: @screen-xs-max) {
+ display: none;
}
}
@@ -162,8 +208,6 @@
border: 1px solid #aaa;
border-radius: 5px;
}
- }
- @media (max-width: @screen-xs-max) {
>* {
border: 1px solid #aaa;
border-radius: 5px;
@@ -179,10 +223,32 @@
}
.resultpage-searchbar {
- margin: 5px 0px 0px 5px;
- :first-child {
+ padding: 5px;
+ :first-child {
border-left: none;
}
+ @media (max-width: @screen-xs-max) {
+ .search-focus-selector {
+ border: 1px solid #aaa;
+ border-top: none;
+ border-radius: 5px;
+ }
+ .search-input-submit {
+ border: 1px solid #aaa;
+ border-radius: 5px;
+ }
+ >* {
+ border: 1px solid #aaa;
+ border-radius: 5px;
+ min-height: 40px;
+ &:not(:first-child) {
+ border-left: 1px solid #aaa;
+ }
+ }
+ *:not(.search-submit) {
+ width: 100%;
+ }
+ }
}
.searchbar-tooltip {
@@ -214,10 +280,14 @@
}
}
-div:hover>.searchbar-tooltip {
- display: inline-block;
-
+#research-bar {
+ padding: 10px 60px 0px 10px;
+ background-color: white;
+ border-bottom: 2px solid rgb(255, 128, 0);
+ display: flex;
+ justify-content: center;
@media (max-width: @screen-xs-max) {
- display: none;
+ 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 6f57d539dbcc5c2b6816ab3a09dbab2909817cca..c4979db26e7cafb04a673803c3f7aa94b02d48a7 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;
@@ -11,8 +13,10 @@
#settings-selectors {
display: flex;
flex-wrap: wrap;
+ align-items: end;
>* {
- margin: 10px;
+ padding: 10px;
+ width: 33%;
}
}
@@ -28,6 +32,11 @@
#settings-buttons {
width: 100%;
}
+ #settings-buttons>* {
+ width: 100%;
+ margin: 10px 0px;
+ overflow: auto;
+ }
#settings-selectors {
justify-content: stretch;
>* {
@@ -38,9 +47,4 @@
justify-content: end;
}
}
- #settings-buttons>* {
- width: 100%;
- margin: 10px 0px;
- overflow: auto;
- }
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/sidebar.less b/resources/assets/less/metager/sidebar.less
index 46ba9002ca297ca7861577873ac897f99a44d2b8..1fab8fd1df3b783f2138fa5322720610eb9523e0 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;
@@ -17,6 +13,7 @@
z-index: 999;
background-color: white;
transition: 0.5s;
+ border-left: none;
&>label#closeSidebar {
position: absolute;
font-size: 36px;
@@ -138,6 +135,9 @@
}
}
}
+ input#nav0:checked~& {
+ border-left: 1px solid LightGray;
+ }
}
input#sideBarToggle:checked {
@@ -148,11 +148,11 @@ input#sideBarToggle:checked {
label#openSidebar {
position: fixed;
- top: 5px;
+ top: 15px;
right: 20px;
z-index: 998;
font-size: 36px;
- line-height: 36px;
+ line-height: 23px;
border-radius: 5px;
color: grey;
background-color: white;
@@ -164,7 +164,7 @@ label#openSidebar {
}
}
-@media (max-width: 979px) {
+@media (max-width: @screen-xs-max) {
.sideBar {
right: -90%;
width: 90%;
diff --git a/resources/assets/less/metager/specific.less b/resources/assets/less/metager/specific.less
new file mode 100644
index 0000000000000000000000000000000000000000..c0d76dd67fd302e1f9e9103e07c152abde14f94d
--- /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 321b93044024fb2c1a7733649cde7abad9ba2c71..d37b49ddd71b1582105aabe1edde827a34207514 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) {
@@ -8,6 +10,10 @@
}
}
+#mglogo {
+ margin: 0px 0px 30px 0px;
+}
+
.settings-modal-buttons {
padding: 5px;
button {
@@ -71,17 +77,34 @@
color: @link-color;
}
-#anpassen-label a {
- color: @anpassen-label-color;
-}
-
-#addFocusBtnDiv {
- margin-left: 10px;
+#sponsors {
+ a {
+ font-size: 0.8em;
+ }
+ h2 {
+ font-size: 1.5em;
+ }
}
-#settingsBtnDiv {
- margin-left: 10px;
- &>* {
- vertical-align: middle;
+#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 0a86cd2e37c9562f93c723e6ee4dccee2954c28e..0000000000000000000000000000000000000000
--- a/resources/assets/less/metager/static-pages.less
+++ /dev/null
@@ -1,567 +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%);
-* {
- 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;
-}
-
-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-shadow: 2px 2px 10px rgba(150, 150, 150, 1);
- text-align: center;
-}
-
-#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;
-}
-
-#color-chooser {
- padding: 0;
- a {
- display: block;
- width: 50px;
- height: 50px;
- }
- li {
- width: 50px;
- margin: 0;
- }
- #standard {
- background-color: rgb(255, 194, 107);
- }
- #standardHard {
- background-color: rgb(255, 128, 0);
- }
- #green {
- background-color: rgb(177, 226, 163);
- }
- #greenHard {
- background-color: rgb(127, 175, 27);
- }
- #blue {
- background-color: rgb(164, 192, 230);
- }
- #blueHard {
- background-color: rgb(2, 93, 140);
- }
- #red {
- background-color: rgb(255, 92, 92);
- }
- #redHard {
- background-color: rgb(255, 0, 0);
- }
- #pink {
- background-color: rgb(255, 196, 246);
- }
- #pinkHard {
- background-color: rgb(254, 67, 101);
- }
- #black {
- background-color: rgb(238, 238, 238);
- }
- #blackHard {
- background-color: rgb(50, 50, 50);
- }
-}
-
-#mglogo>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;
- padding: 0.4em 0;
- border-radius: .25em;
- margin: 0 auto;
-}
-
-#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;
-}
-
-main div#foki {
- margin: 5px 0;
- text-align: center;
-}
-
-div#top {
- padding-right: 35px;
-}
-
-div#bottom {
- background-color: @div-right-background-color;
- width: 100%;
- margin-right: auto;
- border-radius: 5px;
- padding: 20px;
- padding-top: 5px;
- p {
- white-space: normal;
- border-bottom: 1px solid @div-right-p-border-bottom-color;
- margin-bottom: 15px;
- padding-bottom: 15px;
- }
-}
-
-div#bottom label {
- display: block;
- vertical-align: middle;
- text-align: center;
- font-size: 18px;
- color: #666;
-}
-
-div#bottom label:hover {
- color: #000;
-}
-
-div#bottom label::after {
- font-size: 18px;
- content: "â–¼";
- width: 20px;
- height: 20px;
- margin-left: 3px;
-}
-
-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;
-}
-
-input#toggle:checked~#expand {
- max-height: 900px;
-}
-
-input#toggle {
- display: none;
- visibility: hidden;
-}
-
-input#toggle:checked~label::after {
- content: "â–²";
-}
-
-textarea#message {
- height: 200px;
-}
-
-#anpassen-label a.content {
- color: inherit;
-}
-
-#plugin-modal ol>li {
- margin-bottom: 5px;
-}
-
-.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: @navbar-default-background-color;
- border-radius: 0;
-}
-
-.row {
- margin-left: 0;
- margin-right: 0;
-}
-
-select[name=focus] {
- font-family: FontAwesome, sans-serif;
- padding: 0.5em;
- border: 0;
- border-radius: 0;
-}
-
-select[name=focus]>option {
- font-family: FontAwesome, sans-serif;
-}
-
-.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;
-}
-
-.beitritt-input {}
-
-.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;
-}
-
-@media print {
- .noprint {
- display: none!important;
- }
- .beitritt-formular-info * {
- font-size: 7pt !important;
- }
-}
-
-.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);
-}
-
-main ul li:not(.lslide) {
- margin: 0 10px;
-}
-
-.searchform-bonus {
- 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;
-}
-
-.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/variables.less b/resources/assets/less/metager/variables.less
index 3cec9f7edac4b504fbddd5a9b9206551b57f447a..503a4b18c6747de41f14e377ce6a7def2a8bb09f 100644
--- a/resources/assets/less/metager/variables.less
+++ b/resources/assets/less/metager/variables.less
@@ -8,6 +8,20 @@
@color-black: black;
//
@background-color: rgba(2, 93, 140, 3%);
+//
+@brand-success: #5cb85c;
+@brand-info: #FB0;
+@brand-warning: #f0ad4e;
+@brand-danger: #d9534f;
+@body-bg: rgb(250, 250, 250);
+@input-border-focus: rgb(255, 128, 0);
+@font-family-sans-serif: "Liberation Sans",
+"Helvetica Neue",
+Helvetica,
+Arial,
+sans-serif;
+// Global textual link color.
+@link-color: #2A2ADE;
// static-pages.less
@static-pages-color-white: @color-white;
@static-pages-color-almost-white: @color-almost-white;
@@ -36,7 +50,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;
@@ -47,13 +60,88 @@
@base-aufruf-winter-btn-color: white;
@base-aufruf-winter-btn-hover-background-color: #bd0d0d;
@base-new-feature-badge-background-color: #f80;
-// Bootstrap Ersatz
-/*
-@screen-sm-min: 768px;
-@screen-md-min: 992px;
-@screen-lg-min: 1200px;
-@screen-xs-max: (@screen-sm-min - 1);
-@screen-sm-max: (@screen-md-min - 1);
-@screen-md-max: (@screen-lg-min - 1);
-@grid-gutter-width: 30px;
-*/
\ No newline at end of file
+
+/* 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/assets/less/variables-default.less b/resources/assets/less/variables-default.less
deleted file mode 100644
index d7466d4fd4387c26a58af1d96a94e295b595919b..0000000000000000000000000000000000000000
--- a/resources/assets/less/variables-default.less
+++ /dev/null
@@ -1,29 +0,0 @@
-//@brand-primary: rgb(255, 128, 0);
-@brand-success: #5cb85c;
-@brand-info: #FB0;
-@brand-warning: #f0ad4e;
-@brand-danger: #d9534f;
-@body-bg: rgb(250, 250, 250);
-@input-border-focus: rgb(255, 128, 0);
-@font-family-sans-serif: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-//** Global textual link color.
-@link-color: #2A2ADE;
-//@link-color: rgb(255, 128, 0);
-//** Link hover color set via `darken()` function.
-@link-hover-color: darken(@link-color, 15%);
-//** Link hover decoration.
-@link-hover-decoration: underline;
-
-
-@font-size-base: 14px;
-
-
-@screen-md: 992px;
-@container-desktop: (920px + @grid-gutter-width);
-
-@screen-lg: 1440px;
-@container-large-desktop: (1370px + @grid-gutter-width);
-
-//** Point at which the navbar becomes uncollapsed.
-@grid-float-breakpoint: 865px;
\ No newline at end of file
diff --git a/resources/lang/de/ad.php b/resources/lang/de/ad.php
index 45514ae2502449a84d518587086920fe53d175df..41637b613951b1f207d148045b0490afb9b51832 100644
--- a/resources/lang/de/ad.php
+++ b/resources/lang/de/ad.php
@@ -2,5 +2,5 @@
return [
'werbung' => 'Werbung',
- 'von' => 'Werbung von',
+ 'von' => 'von',
];
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 3eaa61b5379ac71470ee47525925f9ddbacaffbb..a1b3e0ed4d45dda736ddadff7e11496a4f7d59f5 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -7,26 +7,12 @@
@include('modals.plugin-modal')
<h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
@include('parts.searchbar', ['class' => 'startpage-searchbar'])
- <ul class="list-inline searchform-bonus hidden">
- <li id="plug"
- @unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
- class="hidden"
- @endunless>
- <a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a></li>
- @if (LaravelLocalization::getCurrentLocale() == "de")
- <li>
- <a href="https://suma-ev.de/presse/Werbefreie-Suche-mit-MetaGer.html" target="_blank" class="btn btn-default mutelink">
- Werbefreie Suche mit MetaGer
- </a>
- </li>
- @endif
- </ul>
<script type="text/javascript" src="{{ elixir('js/scriptStartPage.js') }}"></script>
<script type="text/javascript" src="{{ elixir('js/searchbar.js') }}"></script>
@endsection
@section('optionalContent')
- <section id="moreInformation" class="hidden-xs hidden">
+ <section id="more-information" class="hidden-xs hidden">
<h1 class="hidden">{{ trans('index.sponsors.head.1') }}</h1>
<div class="row">
<div id="sponsors" class="col-sm-6">
diff --git a/resources/views/index_old.blade.php b/resources/views/index_old.blade.php
deleted file mode 100644
index 5e24514c5b3ba7c2a018a4db57cd621a0a8490ea..0000000000000000000000000000000000000000
--- a/resources/views/index_old.blade.php
+++ /dev/null
@@ -1,348 +0,0 @@
-@extends('layouts.indexPage')
-
-@section('title', $title )
-
-@section('content')
- <div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
- <div class="modal-dialog ">
- <div class="content modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
- <span aria-hidden="true">×</span>
- </button>
- <h4>
- @if ($browser === 'Firefox' || $browser === 'Mozilla')
- {{ trans('index.plugin.head.1') }}
- @elseif ($browser === 'Chrome')
- {{ trans('index.plugin.head.2') }}
- @elseif ($browser === 'Opera')
- {{ trans('index.plugin.head.3') }}
- @elseif ($browser === 'IE')
- {{ trans('index.plugin.head.4') }}
- @elseif ($browser === 'Edge')
- {{ trans('index.plugin.head.5') }}
- @elseif ($browser === 'Safari')
- {{ trans('index.plugin.head.6') }}
- @elseif ($browser === 'Vivaldi')
- {{ trans('index.plugin.head.6') }}
- @else
- $(".seperator").addClass("hidden");
- @endif
- </h4>
- <p class="text-muted">{{ trans('index.plugin.head.info') }}</p>
- </div>
- <div class="modal-body">
- @if ($browser === 'Firefox' || $browser === 'Mozilla')
- <ol>
- <li>{{ trans('index.plugin.firefox.1') }}<img src="/img/Firefox.png" width="100%" /></li>
- <li>{{ trans('index.plugin.firefox.2') }}<img src="/img/Firefox_Standard.png" width="100%" /></li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.firefox.3', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.firefox.4') !!}</li>
- <li>{!! trans('index.plugin.firefox.5') !!}</li>
- </ol>
- @elseif ($browser === 'Chrome')
- <ol>
- <li>{!! trans('index.plugin.chrome.1') !!}</li>
- <li>{!! trans('index.plugin.chrome.2') !!}</li>
- <li>{{ trans('index.plugin.chrome.3') }}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.chrome.4', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.chrome.5') !!}</li>
- <li>{!! trans('index.plugin.chrome.6') !!}</li>
- <li>{!! trans('index.plugin.chrome.7') !!}</li>
- <li>{!! trans('index.plugin.chrome.8') !!}</li>
- </ol>
- @elseif ($browser === 'Opera')
- <ol>
- <li>{!! trans('index.plugin.opera.1') !!}</li>
- <li>{!! trans('index.plugin.opera.2') !!}</li>
- <li>{!! trans('index.plugin.opera.3') !!}</li>
- <li>{!! trans('index.plugin.opera.4') !!}</li>
- <li><small>{!! trans('index.plugin.opera.5') !!}</small>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.opera.6', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.opera.7') !!}</li>
- <li>{!! trans('index.plugin.opera.8') !!}</li>
- <li>{!! trans('index.plugin.opera.9') !!}</li>
- <li>{!! trans('index.plugin.opera.10') !!}</li>
- </ol>
- @elseif ($browser === 'IE')
- <ol>
- <li>{!! trans('index.plugin.IE.1') !!}</li>
- <li>{!! trans('index.plugin.IE.4') !!} (<i class="fa fa-cog" aria-hidden="true"></i>)</li>
- <li>{!! trans('index.plugin.IE.5') !!}</li>
- <li>{!! trans('index.plugin.IE.6') !!}</li>
- <li>{!! trans('index.plugin.IE.7') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.IE.8', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.IE.9') !!}</li>
- <li>{!! trans('index.plugin.IE.10') !!}</li>
- <li>{!! trans('index.plugin.IE.11') !!}</li>
- </ol>
- @elseif ($browser === 'Edge')
- <ol>
- <li>{!! trans('index.plugin.edge.1') !!}<i class="fa fa-ellipsis-h" aria-hidden="true"></i>{!! trans('index.plugin.edge.2') !!}</li>
- <li>{!! trans('index.plugin.edge.3') !!}</li>
- <li>{!! trans('index.plugin.edge.4') !!}</li>
- <li>{!! trans('index.plugin.edge.5') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.edge.6', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.edge.7') !!}</li>
- <li>{!! trans('index.plugin.edge.8') !!}</li>
- <li>{!! trans('index.plugin.edge.9') !!}</li>
- <li>{!! trans('index.plugin.edge.10') !!}</li>
- <li>{!! trans('index.plugin.edge.11') !!}</li>
- </ol>
- @elseif ($browser === 'Safari')
- <ol>
- <li>{!! trans('index.plugin.safari.1') !!}</li>
- <li>{!! trans('index.plugin.safari.2') !!}</li>
- <li>{!! trans('index.plugin.safari.3') !!}</li>
- <li>{!! trans('index.plugin.safari.4') !!}</li>
- </ol>
- @elseif ($browser === 'Vivaldi')
- <ol>
- <li>{!! trans('index.plugin.vivaldi.1') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.2') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.3') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.4') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.5') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.6') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.7') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.vivaldi.8', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.vivaldi.9') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.10') !!}</li>
- </ol>
- @endif
- <hr>
- <p>@lang('index.plugin.faq.1')<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq#mg-plugin") }}">@lang('index.plugin.faq.2')</a></p>
- </div>
- </div>
- </div>
- </div>
- <div id="create-focus-modal" class="modal fade" tab-index="-1" role="dialog">
- <div class="modal-dialog modal-lg">
- <div class="content modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
- <span aria-hidden="true">×</span>
- </button>
- <h4>
- @lang("index.focus-creator.head")
- </h4>
- <p class="text-muted">@lang("index.focus-creator.description")</p>
- </div>
- <div class="modal-body">
- <div class="clearfix">
- <div class="pull-left">
- <label for="focus-name">@lang('index.focus-creator.focusname')</label>
- <input id="focus-name" type="text" name="focus-name" placeholder="@lang('index.focus-creator.name-placeholder')">
- <input id="original-id" type="hidden" name="original-id" value="">
- </div>
- <div class="settings-modal-buttons pull-right">
- <button class="delete-focus-btn btn btn-danger">
- @lang('index.focus-creator.delete')
- </button>
- <button class="save-focus-btn btn btn-primary">
- @lang('index.focus-creator.save')
- </button>
- </div>
- </div>
- {{--
- <h2>{!! trans('settings.suchmaschinen.1') !!} <small><button type="button" class="btn btn-link allUnchecker hide">{!! trans('settings.suchmaschinen.2') !!}</button></small></h2>
- --}}
- @foreach( $foki as $fokus => $sumas )
- <div class="headingGroup {{ $fokus }}">
- <h3 class="focus-category">
- @lang("settings.foki." . $fokus)
- {{--
- <small>
- <button type="button" class="checker btn btn-link hide" data-type="{{ $fokus }}">{!! trans('settings.suchmaschinen.3') !!}</button>
- </small>
- --}}
- </h3>
- <div class="row">
- @foreach( $sumas as $name => $data )
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox settings-checkbox">
- <label>
- <input type="checkbox" name="engine_{{ $name }}" class="focusCheckbox" @if ($fokus == 'web') checked @endif >{{ $data['displayName'] }}
- <a class="settings-icon" target="_blank" rel="noopener" href="{{ $data['url'] }}"><i class="fa fa-link" aria-hidden="true"></i></a>
- </label>
- </div>
- </div>
- @endforeach
- </div>
- </div>
- @endforeach
- <div class="clearfix">
- <div class="settings-modal-buttons pull-right">
- <button class="delete-focus-btn btn btn-danger">
- @lang('index.focus-creator.delete')
- </button>
- <button class="save-focus-btn btn btn-primary">
- @lang('index.focus-creator.save')
- </button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
- <!-- Create the focus selection and options -->
- <div id="foki" class="startpage-foki">
- <div class="focus">
- <input id="web" class="focus-radio hide" type="radio" name="focus" value="web" form="searchForm" @if ($focus === 'web') checked @endif required="">
- <label id="web-label" class="focus-label" for="web">
- <i class="fa fa-globe" aria-hidden="true"></i>
- <span class="content">{{ trans('index.foki.web') }}</span>
- </label>
- </div>
- <div class="focus">
- <input id="nachrichten" class="focus-radio hide" type="radio" name="focus" value="nachrichten" form="searchForm" @if ($focus === 'nachrichten') checked @endif required="">
- <label id="nachrichten-label" class="focus-label" for="nachrichten">
- <i class="fa fa-bullhorn" aria-hidden="true"></i>
- <span class="content">{{ trans('index.foki.nachrichten') }}</span>
- </label>
- </div>
- <div class="focus">
- <input id="wissenschaft" class="focus-radio hide" type="radio" name="focus" value="wissenschaft" form="searchForm" @if ($focus === 'wissenschaft') checked @endif required="">
- <label id="wissenschaft-label" class="focus-label" for="wissenschaft">
- <i class="fa fa-file-text" aria-hidden="true"></i>
- <span class="content">{{ trans('index.foki.wissenschaft') }}</span>
- </label>
- </div>
- <div class="focus">
- <input id="produkte" class="focus-radio hide" type="radio" name="focus" value="produktsuche" form="searchForm" @if ($focus === 'produkte') checked @endif required="">
- <label id="produkte-label" class="focus-label" for="produkte">
- <i class="fa fa-shopping-cart" aria-hidden="true"></i>
- <span class="content">{{ trans('index.foki.produkte') }}</span>
- </label>
- </div>
- <div class="focus">
- <input id="maps" class="focus-radio hide" type="radio" name="focus" value="maps" form="searchForm" @if ($focus === 'maps') checked @endif required="">
- <label id="maps-label" class="focus-label" for="maps">
- <i class="fa fa-map" aria-hidden="true"></i>
- <span class="content">{{ trans('index.foki.maps') }}</span>
- </label>
- </div>
- {{-- Fix for older Versions --}}
- @if ($focus === 'angepasst')
- <div class="focus">
- <input id="angepasst" class="focus-radio hide" type="radio" name="focus" value="angepasst" form="searchForm" checked required="">
- <label id="anpassen-label" class="focus-label" for="angepasst">
- <i class="fa fa-cog" aria-hidden="true"></i>
- <span class="content">{{ trans('index.foki.angepasst') }}</span>
- </label>
- </div>
- @endif
- <div id="addFocusBtnDiv">
- <button id="addFocusBtn" class="btn btn-default hide">
- <i class="fa fa-plus" aria-hidden="true"></i>
- </button>
- </div>
- <div id="settingsBtnDiv">
- <a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
- <i class="fa fa-cog" aria-hidden="true"></i>
- </a>
- </div>
- </div>
- <fieldset>
- <form id="searchForm" @if(Request::has('request') && Request::input('request') === "POST") method="POST" @elseif(Request::has('request') && Request::input('request') === "GET") method="GET" @else method="GET" @endif action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
- <div class="input-group">
- <div class="input-group-addon">
- <button type="button" data-toggle="popover" data-html="true" data-container="body" title="{{ trans('index.design') }}" data-content='<ul id="color-chooser" class="list-inline list-unstyled">
- <li ><a id="standard" data-rgba="255,194,107,1" href="#"></a></li>
- <li ><a id="standardHard" data-rgba="255,128,0,1" href="#"></a></li>
- <li ><a id="blue" data-rgba="164,192,230,1" href="#"></a></li>
- <li ><a id="blueHard" data-rgba="2,93,140,1" href="#"></a></li>
- <li ><a id="green" data-rgba="177,226,163,1" href="#"></a></li>
- <li ><a id="greenHard" data-rgba="127,175,27,1" href="#"></a></li>
- <li ><a id="red" data-rgba="255,92,92,1" href="#"></a></li>
- <li ><a id="redHard" data-rgba="255,0,0,1" href="#"></a></li>
- <li ><a id="pink" data-rgba="255,196,246,1" href="#"></a></li>
- <li ><a id="pinkHard" data-rgba="254,67,101,1" href="#"></a></li>
- <li ><a id="black" data-rgba="238,238,238,1" href="#"></a></li>
- <li ><a id="blackHard" data-rgba="50,50,50,1" href="#"></a></li>
- </ul>'>
- <i class="fa fa-tint" aria-hidden="true"></i>
- </button>
- </div>
- <input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
- <input type="hidden" name="encoding" value="utf8">
- <input type="hidden" name="lang" value={{ $lang }} >
- <input type="hidden" name="resultCount" value={{ $resultCount }} >
- <input type="hidden" name="time" value={{ $time }} >
- <input type="hidden" name="sprueche" value={{ $sprueche }} >
- <input type="hidden" name="newtab" value={{ $newtab }} >
- <input type="hidden" name="maps" value={{ $maps }} >
- <input type="hidden" name="key" value={{ $key }} >
- @foreach ($focusPages as $fp)
- <input type="hidden" name={{ $fp }} value="on">
- @endforeach
- <input type="hidden" name="theme" value={{ $theme }}>
- <div class="input-group-addon">
- <button type="submit">
- <i class="fa fa-search" aria-hidden="true"></i>
- </button>
- </div>
- </div>
- </form>
- </fieldset>
- <ul class="list-inline searchform-bonus">
- <li id="plug"
- @unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
- class="hidden"
- @endunless>
- <a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a></li>
- @if (LaravelLocalization::getCurrentLocale() == "de")
- <li>
- <a href="https://suma-ev.de/presse/Werbefreie-Suche-mit-MetaGer.html" target="_blank" class="btn btn-default mutelink">
- Werbefreie Suche mit MetaGer
- </a>
- </li>
- @endif
- </ul>
- <script src="{{ elixir('js/scriptStartPage.js') }}"></script>
-@endsection
-
-@section('optionalContent')
- <section id="moreInformation" class="hidden-xs">
- <h1 class="hidden">{{ trans('index.sponsors.head.1') }}</h1>
- <div class="row">
- <div id="sponsors" class="col-sm-6">
- <h2>{{ trans('index.sponsors.head.2') }}</h2>
- <ul class="startpage">
- <li>{!! trans('index.sponsors.woxikon') !!}</li>
- <li>{!! trans('index.sponsors.gutscheine') !!}</li>
- <li>{!! trans('index.sponsors.kredite') !!}</li>
- </ul>
- </div>
- <div id="about-us" class="col-sm-6">
- <h2>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "about") }}">{{ trans('index.about.title') }}</a>
- </h2>
- <ul class="startpage">
- <li>{!! trans('index.about.1.1') !!}</li>
- <li>{!! trans('index.about.2.1') !!}</li>
- <li>@lang('index.about.3.1')</li>
- </ul>
- </div>
- </div>
- </section>
-@endsection
diff --git a/resources/views/layouts/ad.blade.php b/resources/views/layouts/ad.blade.php
index 79a11634e7402fc1f4951b4da6cda79fa6bd0675..ddcf960348dcd18c7dab279f70cf68b32890cc6f 100644
--- a/resources/views/layouts/ad.blade.php
+++ b/resources/views/layouts/ad.blade.php
@@ -1,22 +1,22 @@
@if(isset($ad) && !$apiAuthorized)
- <div class="result ad row">
- <div class="resultInformation col-sm-10">
- <p class="title">
- <a class="title" href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad->gefVon }}" data-count="0">
- {{ $ad->titel }}
- </a>
- </p>
- <p class="link">
+ <div class="result ad">
+ <h2 class="result-title">
+ <a class="title" href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad->gefVon }}" data-count="0">
+ {{ $ad->titel }}
+ </a>
+ </h2>
+ <div class="result-header">
+ <div class="result-link">
<a href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad->gefVon }}" data-count="0">
{{ $ad->anzeigeLink }}
</a>
- <span class="hoster">
- <span class="ad-label">{!! trans('ad.werbung') !!}</span> {!! trans('ad.von') !!} {!! $ad->gefVon !!}
- </span>
- </p>
- <p class="description">
- {{ $ad->descr }}
- </p>
+ </div>
+ <span class="result-hoster">
+ <span class="ad-label">{!! trans('ad.werbung') !!}</span> {!! trans('ad.von') !!} {!! $ad->gefVon !!}
+ </span>
+ </div>
+ <div class="result-description">
+ {{ $ad->descr }}
</div>
</div>
@endif
diff --git a/resources/views/layouts/products.blade.php b/resources/views/layouts/products.blade.php
index c34ef8e45d31e29024bc179d6ba503e9049837a8..9ac072aa41a70141953c34a759f86e130e3e8b3c 100644
--- a/resources/views/layouts/products.blade.php
+++ b/resources/views/layouts/products.blade.php
@@ -1,6 +1,6 @@
<div class="row lightSliderContainer hidden">
<div class="col-sm-1 hidden-xs"></div>
- <div class="resultInformation col-xs-12 col-sm-11">
+ <div class="result-information col-xs-12 col-sm-11">
<span id="mark">Produktanzeigen:</span>
<ul id="products" class="lightSlider" >
@foreach($products as $product)
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 700683813371ef013f97fa6b5d63c41f22606870..bfebfcc57bedba2b742f4b704b88e89c58791752 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -8,26 +8,18 @@
</div>
</div>
@endif
-<div class="content-wrapper container">
- <header id="research" class="row">
- <nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
- <div class="container">
- <div class="row" id="logo-searchbar-container">
- <div id="header-logo">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1 class="mg-logo">M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
- </div>
- <div id="header-searchbar">
- @include('parts.searchbar', ['class' => 'resultpage-searchbar', 'request' => Request::method()])
- </div>
- </div>
- </div>
- </nav>
- </header>
- <main id="main-content-tabs" class="row">
- <div>
- <div class="row">
- @yield('results')
- </div>
+<div class="content-wrapper">
+ <header id="research-bar">
+ <div id="header-logo">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1 class="mg-logo">MetaGer</h1></a>
+ </div>
+ <div id="header-searchbar">
+ @include('parts.searchbar', ['class' => 'resultpage-searchbar', 'request' => Request::method()])
</div>
+ </header>
+ <div id="research-bar-placeholder">
+ </div>
+ <main class="resultpage-container">
+ @yield('results')
</main>
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 60ebca5dfd809cec58c656b86ad89b0112f04405..7daf17c7315d38441cad5a2cea1346f64346a947 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -1,80 +1,76 @@
-<div class="result row" data-count="{{ $result->number }}">
- <div class="resultInformation col-xs-12 col-sm-11">
- <div class="col-xs-10 col-sm-11" style="padding:0; ">
- <p class="title">
- <a class="title" href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
- {!! $result->titel !!}
- </a>
- </p>
- <div class="link">
- <div>
- <div class="link-link">
- <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
- {{ $result->anzeigeLink }}
+<div class="result" data-count="{{ $result->number }}">
+ <h2 class="result-title">
+ <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
+ {!! $result->titel !!}
+ </a>
+ </h2>
+ <div class="result-header">
+ <div class="result-link">
+ <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
+ {{ $result->anzeigeLink }}
+ </a>
+ </div>
+ <div class="result-options">
+ <a class="dropdown-opener" href="javascript:void(0);">
+ <i class="fa fa-caret-down option-opener-icon" aria-hidden="true"></i>
+ </a>
+ <div class="dropdown-content option-content">
+ <ul class="option-list list-unstyled small">
+ <li class="option-title">
+ <i class="fa fa-cog"></i> {!! trans('result.options.headline') !!}
+ </li>
+ <hr>
+ <li class="js-only">
+ <a href="javascript:resultSaver({{ $result->number }});" class="saver" data-counter="{{ $result->number }}">
+ <i class="fa fa-floppy-disk"></i> {!! trans('result.options.savetab') !!}
</a>
- </div>
- <div class="options">
- <a class="dropdown-opener" href="javascript:void(0);">
- <i class="fa fa-caret-down option-opener-icon" aria-hidden="true"></i>
+ </li>
+ @if(strlen($metager->getSite()) === 0)
+ <li>
+ <a href="{{ $metager->generateSiteSearchLink($result->strippedHost) }}">
+ {!! trans('result.options.1') !!}
</a>
- <div class="dropdown-content option-content">
- <ul class="option-list list-unstyled small">
- <li class="option-title">
- <i class="fa fa-cog"></i> {!! trans('result.options.headline') !!}
- </li>
- <hr>
- <li class="js-only">
- <a href="javascript:resultSaver({{ $result->number }});" class="saver" data-counter="{{ $result->number }}">
- <i class="fa fa-floppy-disk"></i> {!! trans('result.options.savetab') !!}
- </a>
- </li>
- @if(strlen($metager->getSite()) === 0)
- <li>
- <a href="{{ $metager->generateSiteSearchLink($result->strippedHost) }}">
- {!! trans('result.options.1') !!}
- </a>
- </li>
- @endif
- <li>
- <a href="{{ $metager->generateRemovedHostLink($result->strippedHost) }}">
- {!! trans('result.options.2', ['host' => $result->strippedHost]) !!}
- </a>
- </li>
- @if( $result->strippedHost !== $result->strippedDomain )
- <li>
- <a href="{{ $metager->generateRemovedDomainLink($result->strippedDomain) }}">
- {!! trans('result.options.3', ['domain' => $result->strippedDomain]) !!}
- </a>
- </li>
- @endif
- </ul>
- </div>
- </div>
- </div>
- <span class="hoster">
- von {!! $result->gefVon !!}
- </span>
- @if( isset($result->partnershop) && $result->partnershop === TRUE )
- <span class="partnershop-info">
- <img src="/img/boosticon.png" height="13" alt="">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
- </span>
- @endif
- <a class="proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
- <img src="/img/proxyicon.png" alt="" />
- {!! trans('result.options.5') !!}
- </a>
+ </li>
+ @endif
+ <li>
+ <a href="{{ $metager->generateRemovedHostLink($result->strippedHost) }}">
+ {!! trans('result.options.2', ['host' => $result->strippedHost]) !!}
+ </a>
+ </li>
+ @if( $result->strippedHost !== $result->strippedDomain )
+ <li>
+ <a href="{{ $metager->generateRemovedDomainLink($result->strippedDomain) }}">
+ {!! trans('result.options.3', ['domain' => $result->strippedDomain]) !!}
+ </a>
+ </li>
+ @endif
+ </ul>
</div>
</div>
+ <span class="result-hoster">
+ <span>von {!! $result->gefVon !!}</span>
+ </span>
+ @if( isset($result->partnershop) && $result->partnershop === TRUE )
+ <span class="partnershop-info">
+ <img src="/img/boosticon.png" height="13" alt="">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
+ </span>
+ @endif
+ <a class="result-proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
+ <img src="/img/proxyicon.png" alt="" />
+ <span>{!! trans('result.options.5') !!}</span>
+ </a>
+ </div>
+ <div class="result-body">
@if( isset($result->logo) )
- <div class="col-xs-2 col-sm-1" style="padding: 0;">
+ <div class="result-logo">
<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}">
<img src="{{ $metager->getImageProxyLink($result->logo) }}" alt="" />
</a>
</div>
@endif
@if( $result->image !== "" )
- <div class="description">
+ <div class="result-image result-description">
<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
<img src="{{ $metager->getImageProxyLink($result->image) }}" align="left" width="120px" height="60px" alt="" />
</a>
@@ -82,11 +78,14 @@
</div>
@else
@if( $metager->getFokus() == "nachrichten" )
- <div class="description"><span class="date">{{ isset($result->additionalInformation["date"])?date("Y-m-d H:i:s", $result->additionalInformation["date"]):"" }}</span> {{ $result->descr }}</div>
+ <div class="result-description">
+ <span class="date">{{ isset($result->additionalInformation["date"])?date("Y-m-d H:i:s", $result->additionalInformation["date"]):"" }}</span> {{ $result->descr }}
+ </div>
@else
- <div class="description">{{ $result->descr }}</div>
+ <div class="result-description">
+ {{ $result->descr }}
+ </div>
@endif
@endif
</div>
-
</div>
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 2ec5f8b38f554211b4ffb484d25617d061a1f840..095e907e36e468231fdfe1819c45c451edb21826 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -25,15 +25,15 @@
@include('modals.create-focus-modal')
@include('layouts.researchandtabs')
@else
- <div class="tab-content container-fluid">
+ <div class="resultpage-container">
@yield('results')
</div>
@endif
<div id="feedback" style="width:50%;margin-left:25%;position: relative; top:10px;" class="alert alert-danger alert-dismissable">
<a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
- <strong> {!! trans('metaGer.feedback') !!}<a href="{{URL::to('')}}/kontakt/{{base64_encode(Request::fullUrl())}}/" target="_blank">
- {!! trans('kontakt.form.1') !!}</a>
- </strong>
+ <strong> {!! trans('metaGer.feedback') !!}<a href="{{URL::to('')}}/kontakt/{{base64_encode(Request::fullUrl())}}/" target="_blank">
+ {!! trans('kontakt.form.1') !!}</a>
+ </strong>
</div>
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
diff --git a/resources/views/layouts/staticPages_old.blade.php b/resources/views/layouts/staticPages_old.blade.php
deleted file mode 100644
index cdbf6492d440db5e7ca34c143b6876abfd9b91f7..0000000000000000000000000000000000000000
--- a/resources/views/layouts/staticPages_old.blade.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE html>
-<html lang="{!! trans('staticPages.meta.language') !!}">
- <head>
- <meta charset="utf-8" />
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <title>@yield('title')</title>
- <meta name="description" content="{!! trans('staticPages.meta.Description') !!}" />
- <meta name="keywords" content="{!! trans('staticPages.meta.Keywords') !!}" />
- <meta name="page-topic" content="Dienstleistung" />
- <meta name="robots" content="index,follow" />
- <meta name="revisit-after" content="7 days" />
- <meta name="audience" content="all" />
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
- <meta rel="icon" type="image/x-icon" href="/favicon.ico" />
- <meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
- <link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
- <link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" />
- <link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
- <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
- <script src="{{ elixir('js/scriptSubPages.js') }}"></script>
- <script src="{{ elixir('js/lib.js') }}"></script>
- @if (isset($css))
- @if(is_array($css))
- @foreach($css as $el)
- <link href="/css/{{ $el }}" rel="stylesheet" />
- @endforeach
- @else
- <link href="/css/{{ $css }}" rel="stylesheet" />
- @endif
- @endif
- </head>
- <body>
- <header>
- @yield('homeIcon')
- <nav id="navbar-static-pages" class="navbar-resultpage">
-
-
- <ul id="metager-static-nav-list" class="list-inline pull-right">
- <li id="toggle-nav-hide" class="hidden">
- <a class="metager-navbar-toggle pull-right" href="#" data-original-title="" title="">
- <span class="sr-only">Navigation anzeigen</span>
- <i class="fa fa-bars" aria-hidden="true"></i>
- </a>
- <div class="clearfix"></div>
- </li>
- <li id="toggle-nav-show">
- <a class="metager-navbar-toggle pull-right" href="#metager-static-nav-list" data-original-title="" title="">
- <span class="sr-only">Navigation anzeigen</span>
- <i class="fa fa-bars" aria-hidden="true"></i>
- </a>
- <div class="clearfix"></div>
- </li>
- <li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="200" id="navigationSuche">{{ trans('staticPages.nav1') }}</a>
- </li>
- <li @if (isset($navbarFocus) && $navbarFocus === 'foerdern') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- <a class="metager-dropdown-toggle" role="button" aria-expanded="false" tabindex="201">{{ trans('staticPages.nav16') }}
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" tabindex="202">{{ trans('staticPages.nav2') }}</a>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}" tabindex="203">{{ trans('staticPages.nav23') }}</a>
- </li>
- <li>
- <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" tabindex="204">{{ trans('staticPages.nav17') }}</a>
- </li>
- </ul>
- </li>
- @if(LaravelLocalization::getCurrentLocale() === "de")
- <li id="gutscheine"@if (isset($navbarFocus) && $navbarFocus === 'gutscheine') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- <a href="https://metager.de/gutscheine/">{!! trans('staticPages.gutscheineToggle') !!}</a>
- <a class="metager-dropdown-toggle" data-role="button" aria-expanded="false" tabindex="205"><span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="https://metager.de/gutscheine/congstar/" tabindex="206" >{{ trans('staticPages.gutscheine.2') }}</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/check24/" tabindex="207" >{{ trans('staticPages.gutscheine.3') }}</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/handyflash/" tabindex="208" >{{ trans('staticPages.gutscheine.4') }}</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/groupon/" tabindex="209" >{{ trans('staticPages.gutscheine.5') }}</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/medion/" tabindex="210" >{{ trans('staticPages.gutscheine.6') }}</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/navabi/" tabindex="211" >{{ trans('staticPages.gutscheine.7') }}</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/netcologne/" tabindex="212" >{{ trans('staticPages.gutscheine.8') }}</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/teufel/" tabindex="213" >{{ trans('staticPages.gutscheine.9') }}</a>
- </li>
- <li role="separator" class="divider"></li>
- <li>
- <a href="https://metager.de/gutscheine/alle-gutscheine/" tabindex="214" >{{ trans('staticPages.gutscheine.10') }}</a>
- </li>
- </ul>
- </li>
- @endif
- <li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy" tabindex="215">{{ trans('staticPages.nav3') }}</a>
- </li>
- <li @if (isset($navbarFocus) && $navbarFocus === 'hilfe') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- <a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe" tabindex="216">{{ trans('staticPages.nav20') }}
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}" tabindex="217">{{ trans('staticPages.nav20') }}</a>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}" tabindex="218">{{ trans('staticPages.nav21') }}</a>
- </li>
- </ul>
- </li>
- <li @if (isset($navbarFocus) && $navbarFocus === 'kontakt') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- <a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt" tabindex="219">{{ trans('staticPages.nav18') }}
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="http://forum.suma-ev.de/" tabindex="220">{{ trans('staticPages.nav4') }}</a>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}" tabindex="221">{{ trans('staticPages.nav5') }}</a>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}" tabindex="222">{{ trans('staticPages.nav6') }}</a>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" tabindex="223">{{ trans('staticPages.nav7') }}</a>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}" tabindex="224">{{ trans('staticPages.nav8') }}</a>
- </li>
- </ul>
- </li>
- <li @if (isset($navbarFocus) && $navbarFocus === 'dienste') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- <a class="metager-dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" tabindex="225">{{ trans('staticPages.nav15') }}
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}" tabindex="226">{{ trans('staticPages.nav10') }}</a>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" tabindex="227">{{ trans('staticPages.nav22') }}</a>
- </li>
- <li>
- <a href="https://metager.de/klassik/asso/" tabindex="228">{{ trans('staticPages.nav11') }}</a>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/app/") }}" tabindex="230">@lang('staticPages.nav25')</a>
- </li>
- <li>
- <a href="https://metager.to/" tabindex="231">{{ trans('staticPages.nav13') }}</a>
- </li>
- <li>
- <a href="https://maps.metager.de" target="_blank" tabindex="232">Maps.MetaGer.de</a>
- </li>
- <li>
- <a href="https://gitlab.metager3.de/open-source/MetaGer" tabindex="233">{{ trans('staticPages.nav24') }}</a>
- </li>
- <li>
- <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" tabindex="234">{{ trans('staticPages.nav14') }}</a>
- </li>
- </ul>
- </li>
- <li class="metager-dropdown">
- <a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache" tabindex="235">{{ trans('staticPages.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- @foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
- <li>
- <a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}" tabindex="{{235 + $loop->index}}">{{{ $properties['native'] }}}</a>
- </li>
- @endforeach
- </ul>
- </li>
- </ul>
- </nav>
-
- </header>
- <div class="wrapper">
- <main class="mg-panel container">
- @if (isset($success))
- <div class="alert alert-success" role="alert">{{ $success }}</div>
- @endif
- @if (isset($info))
- <div class="alert alert-info" role="alert">{{ $info }}</div>
- @endif
- @if (isset($warning))
- <div class="alert alert-warning" role="alert">{{ $warning }}</div>
- @endif
- @if (isset($error))
- <div class="alert alert-danger" role="alert">{{ $error }}</div>
- @endif
- @yield('content')
- </main>
- @yield('optionalContent')
- <footer class="noprint">
- <ul class="list-inline hidden-xs">
- <li>
- <a href="https://www.suma-ev.de/" >
- <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
- </li>
- <li id="info">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
- {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
- </li>
- <li>
- <a href="https://www.uni-hannover.de/" >
- <img src="/img/luh_metager.png" alt="LUH Logo"></a>
- </li>
- </ul>
- </footer>
- <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
- </div>
- </body>
-</html>
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index e718409255db2013fbd25d53d81dcf14a6c0a700..3bbad8cb1f36d53480c51d41dc1239c5d55d86bc 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -1,6 +1,7 @@
@extends('layouts.resultPage')
@section('results')
+ {{-- Show all errors --}}
@if(sizeof($errors) > 0)
<div class="alert alert-danger">
<ul>
@@ -10,6 +11,7 @@
</ul>
</div>
@endif
+ {{-- Show all warnings --}}
@if(sizeof($warnings) > 0)
<div class="alert alert-warning">
<ul>
@@ -19,40 +21,41 @@
</ul>
</div>
@endif
- @if($metager->showQuicktips())
- <div class="col-xs-12 col-md-8 resultContainer">
- @else
- <div class="col-xs-12 col-md-12 resultContainer">
- @endif
+ <div id="results">
+ {{-- Show initial products or ads --}}
@if($metager->hasProducts())
- @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
- @include('layouts.products', ['products' => $metager->getProducts()])
- @endif
-
+ @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
+ @include('layouts.products', ['products' => $metager->getProducts()])
+ @endif
@else
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
+ {{-- Show map --}}
@if($metager->getMaps())
- <div class="result row" id="map">
- <div class="resultInformation col-xs-12 col-sm-11">
+ <div class="result" id="map">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
</div>
- </div>
@endif
+ {{-- Create results and ongoing ads --}}
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endif
@include('layouts.result', ['result' => $result])
@endforeach
+ {{-- Show pagination --}}
<nav class="mg-pager" aria-label="...">
- <div @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></div>
- <div @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></div>
+ <div @if($metager->getPage() === 1) class="disabled" @endif>
+ <a @if($metager->getPage() !== 1) href="javascript:history.back()" @endif>{{ trans('results.zurueck') }}</a>
+ </div>
+ <div @if($metager->nextSearchLink() === "#") class="disabled" @endif>
+ <a @if($metager->nextSearchLink() !== "#") href="{{ $metager->nextSearchLink() }}" @endif>{{ trans('results.weiter') }}</a>
+ </div>
</nav>
</div>
@if( $metager->showQuicktips() )
- <div class="col-md-4 hidden-xs hidden-sm" id="quicktips"></div>
+ <div id="quicktips"></div>
@endif
@endsection
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index 8dee0601cd6bfa4872299a0b7715c326d11ab797..68480ab987ffd3fc1587635278020dabb78f49ac 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -1,4 +1,5 @@
-@if( sizeof($errors) > 0 )
+{{-- Show all errors --}}
+@if(sizeof($errors) > 0)
<div class="alert alert-danger">
<ul>
@foreach($errors as $error)
@@ -7,7 +8,8 @@
</ul>
</div>
@endif
-@if( sizeof($warnings) > 0)
+{{-- Show all warnings --}}
+@if(sizeof($warnings) > 0)
<div class="alert alert-warning">
<ul>
@foreach($warnings as $warning)
@@ -16,37 +18,40 @@
</ul>
</div>
@endif
-<div class="col-xs-12 col-md-8">
+<div id="results">
+ {{-- Show initial products or ads --}}
@if($metager->hasProducts())
- @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
- @include('layouts.products', ['products' => $metager->getProducts()])
+ @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
+ @include('layouts.products', ['products' => $metager->getProducts()])
@endif
@else
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
+ {{-- Show map --}}
@if($metager->getMaps())
- <div class="result row" id="map">
- <div class="resultInformation col-xs-12 col-sm-11">
- <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
- </div>
+ <div class="result" id="map">
+ <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
</div>
@endif
+ {{-- Create results and ongoing ads --}}
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endif
@include('layouts.result', ['result' => $result])
@endforeach
- <nav aria-label="...">
- <ul class="pager">
- <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
- <li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
- </ul>
+ {{-- Show pagination --}}
+ <nav class="mg-pager" aria-label="...">
+ <div @if($metager->getPage() === 1) class="disabled" @endif>
+ <a @if($metager->getPage() !== 1) href="javascript:history.back()" @endif>{{ trans('results.zurueck') }}</a>
+ </div>
+ <div @if($metager->nextSearchLink() === "#") class="disabled" @endif>
+ <a @if($metager->nextSearchLink() !== "#") href="{{ $metager->nextSearchLink() }}" @endif>{{ trans('results.weiter') }}</a>
+ </div>
</nav>
</div>
@if( $metager->showQuicktips() )
- <div class="col-md-4 hidden-xs hidden-sm" id="quicktips"></div>
-@endif
-</div>
+ <div id="quicktips"></div>
+@endif
\ No newline at end of file
diff --git a/resources/views/parts/footer.blade.php b/resources/views/parts/footer.blade.php
index ce85506444590a6d124310c9a2aa63fd98b0d2d9..470d1d5192336b76983dbb880fa190348bfb4312 100644
--- a/resources/views/parts/footer.blade.php
+++ b/resources/views/parts/footer.blade.php
@@ -1,16 +1,18 @@
@if ($type === 'startpage' || $type === 'subpage')
<footer class="{{ $id }} noprint">
- <div>
+ <div class="imagebox">
<a href="https://www.suma-ev.de/" >
- <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
+ <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo">
+ </a>
</div>
<div id="info">
<span><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a></span>
<span class="hidden-xs">{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a></span>
</div>
- <div>
+ <div class="imagebox">
<a href="https://www.uni-hannover.de/">
- <img src="/img/luh_metager.png" alt="LUH Logo"></a>
+ <img src="/img/luh_metager.png" alt="LUH Logo">
+ </a>
</div>
</footer>
@elseif ($type === 'resultpage')
diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php
index 087a62485b3cc77601a9bc52d7e9da54d2d55552..0c9bdc6a9d89867f4cc86fb5dca9d24d65a38dcf 100644
--- a/resources/views/parts/sidebar.blade.php
+++ b/resources/views/parts/sidebar.blade.php
@@ -1,18 +1,24 @@
<input id="sideBarToggle" style="display: none;" type="checkbox">
- <label id="openSidebar" role="button" for="sideBarToggle"></label>
- <div class="sideBar">
+<label id="openSidebar" role="button" for="sideBarToggle"></label>
+<div class="sideBar">
<label id="closeSidebar" role="button" for="sideBarToggle"></label>
- <p><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></p>
+ <p>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a>
+ </p>
<ul id="metager-static-nav-list" class="list-inline pull-right">
<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="200" id="navigationSuche"><i class="fa fa-search" aria-hidden="true"></i>
-{{ trans('staticPages.nav1') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="200" id="navigationSuche">
+ <i class="fa fa-search" aria-hidden="true"></i>
+ <span> {{ trans('staticPages.nav1') }}</span>
+ </a>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'dienste') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- <input id="servicesToggle" class="sideBarCheckbox" type="checkbox">
- <label for="servicesToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" tabindex="225"><i class="fa fa-wrench" aria-hidden="true"></i>
- {{ trans('staticPages.nav15') }}
- <span class="caret"></span></label>
+ <input id="servicesToggle" class="sideBarCheckbox" type="checkbox">
+ <label for="servicesToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" tabindex="225">
+ <i class="fa fa-wrench" aria-hidden="true"></i>
+ <span> {{ trans('staticPages.nav15') }}</span>
+ <span class="caret"></span>
+ </label>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}" tabindex="226">{{ trans('staticPages.nav10') }}</a>
@@ -41,14 +47,18 @@
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy" tabindex="215"><i class="fa fa-user-secret" aria-hidden="true"></i>
-{{ trans('staticPages.nav3') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy" tabindex="215">
+ <i class="fa fa-user-secret" aria-hidden="true"></i>
+ <span> {{ trans('staticPages.nav3') }}</span>
+ </a>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'hilfe') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- <input id="helpToggle" class="sideBarCheckbox" type="checkbox">
- <label for="helpToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe" tabindex="216"><i class="fa fa-info-circle" aria-hidden="true"></i>
-{{ trans('staticPages.nav20') }}
- <span class="caret"></span></label>
+ <input id="helpToggle" class="sideBarCheckbox" type="checkbox">
+ <label for="helpToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe" tabindex="216">
+ <i class="fa fa-info-circle" aria-hidden="true"></i>
+ <span> {{ trans('staticPages.nav20') }}</span>
+ <span class="caret"></span>
+ </label>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}" tabindex="217">{{ trans('staticPages.nav20') }}</a>
@@ -60,9 +70,11 @@
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'foerdern') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<input id="donationToggle" class="sideBarCheckbox" type="checkbox">
- <label for="donationToggle" class="metager-dropdown-toggle" role="button" aria-expanded="false" tabindex="201"><i class="fa fa-money" aria-hidden="true"></i>
- {{ trans('staticPages.nav16') }}
- <span class="caret"></span></label>
+ <label for="donationToggle" class="metager-dropdown-toggle" role="button" aria-expanded="false" tabindex="201">
+ <i class="fa fa-money" aria-hidden="true"></i>
+ <span> {{ trans('staticPages.nav16') }}</span>
+ <span class="caret"></span>
+ </label>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" tabindex="202">{{ trans('staticPages.nav2') }}</a>
@@ -75,12 +87,13 @@
</li>
</ul>
</li>
-
<li @if (isset($navbarFocus) && $navbarFocus === 'kontakt') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- <input id="contactToggle" class="sideBarCheckbox" type="checkbox">
- <label for="contactToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt" tabindex="219"><i class="fa fa-comments-o" aria-hidden="true"></i>
-{{ trans('staticPages.nav18') }}
- <span class="caret"></span></label>
+ <input id="contactToggle" class="sideBarCheckbox" type="checkbox">
+ <label for="contactToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt" tabindex="219">
+ <i class="fa fa-comments-o" aria-hidden="true"></i>
+ <span> {{ trans('staticPages.nav18') }}</span>
+ <span class="caret"></span>
+ </label>
<ul class="metager-dropdown-menu">
<li>
<a href="http://forum.suma-ev.de/" tabindex="220">{{ trans('staticPages.nav4') }}</a>
@@ -100,10 +113,12 @@
</ul>
</li>
<li class="metager-dropdown">
- <input id="languagesToggle" class="sideBarCheckbox" type="checkbox">
- <label for="languagesToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache" tabindex="235"><i class="fa fa-globe" aria-hidden="true"></i>
-{{ trans('staticPages.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})
- <span class="caret"></span></label>
+ <input id="languagesToggle" class="sideBarCheckbox" type="checkbox">
+ <label for="languagesToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache" tabindex="235">
+ <i class="fa fa-globe" aria-hidden="true"></i>
+ <span> {{ trans('staticPages.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})</span>
+ <span class="caret"></span>
+ </label>
<ul class="metager-dropdown-menu">
@foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
<li>
diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php
deleted file mode 100644
index 206373f5868bd5ec0da995f1ddfd313d13221f83..0000000000000000000000000000000000000000
--- a/resources/views/quicktip.blade.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html lang="{!! trans('staticPages.meta.language') !!}">
- <head>
- <title>{!! trans('quicktip.title') !!}</title>
- <link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
- </head>
- <body class="quicktips">
- @if(App::isLocale("de"))
- <div class="quicktip aufruf-winter">
- <div class="media">
- <div class="media-body">
- <h2 class="qtheader"><a href="@lang('spendenaufruf.link')" target="_blank">@lang('spendenaufruf.heading')</a></h2>
- <div>@lang('spendenaufruf.text')</div>
- <br>
- <a href="@lang('spendenaufruf.link')" class="btn btn-primary btn-block aufruf-action-btn" target="_blank">@lang('spendenaufruf.button')</a>
- </div>
- </div>
- </div>
- @endif
- @if( $spruch !== "" )
- <blockquote id="spruch">{!! $spruch !!}</blockquote>
- @endif
- @foreach($mqs as $mq)
- <div class="quicktip">
- @if(isset($mq['details']))
- <details>
- <summary>
- <div class="media">
- @if( isset($mq['image']) && isset($mq['image-alt'] ))
- <div class="media-left">
- <img class="qt-icon" src="{!! $mq['image'] !!}" alt="{!! $mq['image-alt'] !!}">
- </div>
- @endif
- <div class="media-body">
- <h2 class="qtheader"><a href="{{ $mq['URL'] }}" target="_blank" rel="noopener">{{ $mq['title'] }}</a></h2>
- <div>{!! $mq['summary'] !!}</div>
- </div>
- <div class="media-right">
- <i class="fa fa-info-circle info-details-available" aria-hidden="true"></i>
- </div>
- </div>
- </summary>
- {!! $mq['details'] !!}
- </details>
- @else
- <div class="media">
- @if( isset($mq['image']) && isset($mq['image-alt'] ))
- <div class="media-left">
- <img class="qt-icon" src="{!! $mq['image'] !!}" alt="{!! $mq['image-alt'] !!}">
- </div>
- @endif
- <div class="media-body">
- <h2 class="qtheader"><a href="{{ $mq['URL'] }}" target="_blank" rel="noopener">{{ $mq['title'] }}</a></h2>
- <div>{!! $mq['summary'] !!}</div>
- </div>
- </div>
- @endif
- @if( isset($mq['gefVon']) )
- <div class="pull-right">{!! $mq['gefVon'] !!}</div>
- @endif
- </div>
- @endforeach
- <div class="quicktip">
- <div class="media">
- <div class="media-body">
- <div>
- @if( Request::input('lang') === "all")
- {!! trans('results.filter.default', ['langName' => LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native']]) !!}
- @else
- {!! trans('results.filter', ['langName' => LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'], 'link' => base64_decode(Request::input('unfilteredLink','')), 'filter' => Request::input('lang')]) !!}
- @endif
- </div>
- </div>
- </div>
- </div>
- <script src="{{ elixir('js/quicktips.js') }}"></script>
- </body>
-</html>
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 66f03bcd1f6fc425d1daf59486af6adfda250525..986669c4bb501f3bc732c5b9063dbc711843d7b5 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -59,7 +59,7 @@
<div id="settings-buttons">
<a id="settings-abort-btn" class="btn btn-danger mutelink" href="{{ URL::previous() }}">@lang('settings.abort') <i class="fa fa-times" aria-hidden="true"></i></a>
<input id="unten" class="btn btn-primary" type="submit" value="{!! trans('settings.speichern.1') !!}">
- <input id="save" class="btn btn-primary hidden" type="button" data-href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" value="{!! trans('settings.speichern.2') !!}">
+ <input id="save" class="btn btn-primary hidden" type="button" data-href="{{ URL::previous() }}" value="{!! trans('settings.speichern.2') !!}">
<input id="plugin" class="btn btn-primary" type="submit" value="{!! trans('settings.speichern.3') !!}">
</div>
</form>