diff --git a/resources/assets/js/scriptResultPage.js b/resources/assets/js/scriptResultPage.js
index 686f1cbc34e73e0f224b006c16f9821dc83f6c89..ba732e700ac0addec75b2bce7fae3ee54faa158b 100644
--- a/resources/assets/js/scriptResultPage.js
+++ b/resources/assets/js/scriptResultPage.js
@@ -77,7 +77,7 @@ function getDocumentReadyForUse(fokus, custom) {
// pagination()
tabs();
fokiChanger();
- pluginInfo();
+ //pluginInfo();
$('iframe:not(.resized)').iFrameResize();
$('iframe').addClass('resized');
addListeners();
@@ -91,6 +91,7 @@ function resetSearchbar() {
$('.search-input input').val('').focus();
}
+/*
function pluginInfo() {
if (localStorage) {
if (localStorage.getItem('pluginInfo') == 'off') $('#searchplugin').css('display', 'none');
@@ -103,6 +104,7 @@ function pluginInfo() {
});
}
}
+*/
function botProtection() {
$('.result').find('a').click(function () {
diff --git a/resources/assets/less/default.less b/resources/assets/less/default.less
deleted file mode 100644
index faac8a6b8b986569820af01ad0c94a7db59ce6db..0000000000000000000000000000000000000000
--- a/resources/assets/less/default.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "./metager/metager.less";
\ No newline at end of file
diff --git a/resources/assets/less/metager/cards.less b/resources/assets/less/metager/general/cards.less
similarity index 100%
rename from resources/assets/less/metager/cards.less
rename to resources/assets/less/metager/general/cards.less
diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general/general.less
similarity index 68%
rename from resources/assets/less/metager/general.less
rename to resources/assets/less/metager/general/general.less
index 180c0132b409ccc3c517edc7f5f4cb50ac33e0bf..061360579e8b462fd16fa974de7220b95293b1e9 100644
--- a/resources/assets/less/metager/general.less
+++ b/resources/assets/less/metager/general/general.less
@@ -1,7 +1,10 @@
/* Default Font */
+@modal-content-box-shadow-color: fade(@color-black, 30%);
+@body-background-color: @background-color;
+@a-hover-color: red;
body {
- font-family: Arimo, Liberation Sans, sans-serif;
+ font-family: @metager-font;
}
/* Main Containers */
@@ -45,6 +48,46 @@ body {
}
}
+.navbar,
+#navbar-static-pages {
+ box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
+}
+
+/* Scrollbox Style */
+
+@scrollfade-color: white;
+.scrollbox {
+ position: relative;
+ width: 100%;
+ max-width: @results-width-max;
+ .scrollfade- {
+ &left,
+ &right {
+ position: absolute;
+ width: 20px;
+ height: 40px;
+ top: 1px;
+ pointer-events: none;
+ }
+ &left {
+ background: -webkit-gradient(linear, left top, right top, from(@scrollfade-color), color-stop(fade(@scrollfade-color, 80%)), to(fade(@scrollfade-color, 0%)));
+ background: linear-gradient(to right, @scrollfade-color, fade(@scrollfade-color, 80%), fade(@scrollfade-color, 0%));
+ left: 1px;
+ }
+ &right {
+ background: -webkit-gradient(linear, right top, left top, from(@scrollfade-color), color-stop(fade(@scrollfade-color, 80%)), to(fade(@scrollfade-color, 0%)));
+ background: linear-gradient(to left, @scrollfade-color, fade(@scrollfade-color, 80%), fade(@scrollfade-color, 0%));
+ right: 1px;
+ }
+ }
+ .search-option-frame {
+ position: relative;
+ }
+}
+
+/* General font sizing */
+
+@default-font-size: 15px;
.first-last-child-margin-fix() {
&:first-child {
margin-top: 0px;
@@ -54,14 +97,6 @@ body {
}
}
-.navbar,
-#navbar-static-pages {
- box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
-}
-
-/* General font sizing */
-
-@default-font-size: 15px;
h1 {
font-size: (@default-font-size * 1.6);
.first-last-child-margin-fix;
@@ -97,8 +132,26 @@ body {
text-align: center;
}
+.subheading {
+ font-size: 20px;
+ margin: 20px 0px;
+ white-space: center;
+}
+
a {
font-size: 100%;
+ color: @link-color;
+ &:visited {
+ color: @link-color;
+ }
+ &:hover {
+ text-decoration: none;
+ color: @a-hover-color;
+ }
+}
+
+i.fa {
+ background-color: transparent;
}
/* Logo */
@@ -124,7 +177,7 @@ a {
width: fit-content;
text-decoration: none;
font-size: 75px;
- @media(max-width: @screen-xs-max) {
+ @media(max-width: @screen-mobile) {
font-size: 50px;
}
}
@@ -132,10 +185,18 @@ a {
#subpage-logo {
padding: 5px 0;
- a h1 {
- .logo;
- font-size: 30px;
- margin: 0;
+ .navbar-brand {
+ .noprint;
+ line-height: 100% !important;
+ padding: 0;
+ position: absolute;
+ z-index: 5;
+ left: 10px;
+ h1 {
+ .logo;
+ font-size: 30px;
+ margin: 0;
+ }
}
}
@@ -177,8 +238,8 @@ summary {
/* Tooltips
*
- * Für alle Elemente mit einem "data-tooltip"-Attribut wird ein
- * Tooltip mit entsprechendem Inhalt unterhalb des Elements angezeigt
+ * All elements with a "data-tooltip" attribute show a
+ * tooltip below on hover
*/
*[data-tooltip] {
@@ -234,7 +295,7 @@ summary {
width: 50%;
margin: 0;
float: left;
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
width: 100%;
}
}
@@ -268,32 +329,50 @@ summary {
/* Little helpers */
+// Bold text
.bold {
font-weight: bold;
}
+// Do not print this
.noprint {
@media print {
display: none !important;
}
}
+// For print: Start new page after this
.newpage {
page-break-after: always;
}
+// For list elements without a dot
+li.nodot {
+ list-style-type: none;
+}
+
+// Disabled elements (only visual)
.disabled,
-.disabled * {
+:disabled,
+.disabled *,
+:disabled *,
+ {
color: #aaa !important;
cursor: not-allowed !important;
}
+// Convert excess text into "..."
.overflow-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
+// Used on labels which initiate visual change (e.g. open-sidebar-button)
+.navigation-element {
+ cursor: pointer;
+}
+
/* Button */
button {
@@ -301,16 +380,32 @@ button {
background-color: transparent;
}
-/* Unsorted */
+/* Lists with dots */
+
+.dotlist {
+ list-style-type: disc;
+ text-align: left;
+ li {
+ margin-bottom: 5px !important;
+ }
+}
+
+/* Code */
-// Currently in use for the plugin modal
-.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;
+code {
+ white-space: pre-wrap;
+ overflow-wrap: break-word;
+ word-break: break-word;
}
+/* Adresses */
+
+address {
+ white-space: pre;
+}
+
+/* Unknown Uses */
+
label a {
color: inherit;
&:hover {
@@ -319,15 +414,6 @@ label a {
}
}
-li.nodot {
- list-style-type: none;
-}
-
-// Used on labels which initiate visual change (e.g. open-sidebar-button)
-.navigation-element {
- cursor: pointer;
-}
-
// For Elements where newlines should actually be displayed
.wrap {
white-space: pre-wrap;
diff --git a/resources/assets/less/metager/general/specific.less b/resources/assets/less/metager/general/specific.less
new file mode 100644
index 0000000000000000000000000000000000000000..a703ee66ed0b5dea23bfea862ced857a7256e56a
--- /dev/null
+++ b/resources/assets/less/metager/general/specific.less
@@ -0,0 +1,23 @@
+/* Rules for specific elements */
+
+// kontakt.blade.php, spende.blade.php, zitatsuche.blade.php
+.form-group {
+ font-family: sans-serif;
+ font-size: 16px;
+ color: @color-black;
+ background-color: transparent;
+ text-align: center;
+}
+
+input[name=eingabe] {
+ border-right: 0;
+ box-shadow: inset 0 1px 0px rgba(0, 0, 0, 0.075);
+}
+
+fieldset input[type=text] {
+ width: 100%;
+ padding-left: 10px;
+ padding-right: 10px;
+ border-width: 1px;
+ overflow: visible;
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/metager.less b/resources/assets/less/metager/metager.less
index 1351c3a8e588c33f8ff13a04a624abc260ccf754..e89da21eb81d68919d3d1cb6b60dd451a1ecc6a7 100644
--- a/resources/assets/less/metager/metager.less
+++ b/resources/assets/less/metager/metager.less
@@ -1,13 +1,22 @@
-@import "./general.less";
-@import "./specific.less";
-@import "./result-page.less";
-@import "./start-page.less";
-@import "./settings.less";
+// Variables
@import "./variables.less";
-@import "./sidebar.less";
-@import "./modals.less";
-@import "./footer.less";
-@import "./searchbar.less";
-@import "./aufruf-winter.less";
-@import "./cards.less";
-@import "./widget.less";
\ No newline at end of file
+// General
+@import "./general/cards.less";
+@import "./general/general.less";
+@import "./general/specific.less";
+// Pages
+@import "./pages/contact.less";
+@import "./pages/donation.less";
+@import "./pages/help_faq.less";
+@import "./pages/language.less";
+@import "./pages/privacy.less";
+@import "./pages/resultpage.less";
+@import "./pages/start-page.less";
+@import "./pages/widget.less";
+// Parts
+@import "./parts/aufruf-winter.less";
+@import "./parts/footer.less";
+@import "./parts/modals.less";
+@import "./parts/searchbar.less";
+@import "./parts/settings.less";
+@import "./parts/sidebar.less";
\ No newline at end of file
diff --git a/resources/assets/less/metager/beitritt.less b/resources/assets/less/metager/pages/beitritt.less
similarity index 100%
rename from resources/assets/less/metager/beitritt.less
rename to resources/assets/less/metager/pages/beitritt.less
diff --git a/resources/assets/less/metager/pages/contact.less b/resources/assets/less/metager/pages/contact.less
new file mode 100644
index 0000000000000000000000000000000000000000..ea987ab7ee4f7c8e4a590c78f732188fc9e0dde7
--- /dev/null
+++ b/resources/assets/less/metager/pages/contact.less
@@ -0,0 +1,12 @@
+.kontakt-form-group {
+ text-align: left;
+ font-size: 14px;
+}
+
+form.contact {
+ max-width: 500px;
+}
+
+textarea#message {
+ height: 200px;
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/pages/donation.less b/resources/assets/less/metager/pages/donation.less
new file mode 100644
index 0000000000000000000000000000000000000000..3a5ecac1bd7121c871daab42c214a680c847df17
--- /dev/null
+++ b/resources/assets/less/metager/pages/donation.less
@@ -0,0 +1,8 @@
+.donation-form-group {
+ text-align: left;
+ font-size: 12px;
+}
+
+.donation-form-group label {
+ font-weight: bold;
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/pages/help_faq.less b/resources/assets/less/metager/pages/help_faq.less
new file mode 100644
index 0000000000000000000000000000000000000000..5be91c7d932a1b2dedad5f2b544f5f6a9dbc3c56
--- /dev/null
+++ b/resources/assets/less/metager/pages/help_faq.less
@@ -0,0 +1,33 @@
+.hilfe,
+.faq {
+ section {
+ .card-heavy;
+ h3 {
+ border-bottom: 1px solid #aaa;
+ }
+ .search-example {
+ border: 1px solid #aaa;
+ background-color: #eee;
+ border-radius: 5px;
+ padding: 10px;
+ }
+ }
+ .fake-result {
+ *:hover {
+ overflow: visible !important;
+ }
+ .result-footer {
+ overflow: hidden;
+ align-items: center;
+ }
+ .open-result-options label {
+ padding: 10px;
+ border: 2px dashed red;
+ border-radius: 100%;
+ color: black;
+ font-size: 14px;
+ text-decoration: none;
+ font-weight: normal;
+ }
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/pages/language.less b/resources/assets/less/metager/pages/language.less
new file mode 100644
index 0000000000000000000000000000000000000000..b87b3b047e8c9e84d1fd04e0d90979e839ef6aa6
--- /dev/null
+++ b/resources/assets/less/metager/pages/language.less
@@ -0,0 +1,3 @@
+.language-name {
+ white-space: pre;
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/pages/privacy.less b/resources/assets/less/metager/pages/privacy.less
new file mode 100644
index 0000000000000000000000000000000000000000..9d8c728ff91f05064f54d7173f9f7251e670a727
--- /dev/null
+++ b/resources/assets/less/metager/pages/privacy.less
@@ -0,0 +1,48 @@
+.privacy {
+ main {
+ font-size: 10pt;
+ hyphens: auto;
+ counter-reset: kontext 0 datum 0;
+ text-align: justify;
+ }
+ h1 {
+ font-size: 18pt;
+ }
+ .kontext>h1::before {
+ counter-increment: kontext;
+ content: "K" counter(kontext) " ";
+ font-weight: normal;
+ }
+ .datum>h1::before {
+ counter-increment: datum;
+ content: "D" counter(datum) " ";
+ font-weight: normal;
+ }
+ .kontext h1 {
+ font-size: 16pt;
+ margin-bottom: inherit;
+ }
+ .kontext h2 {
+ font-size: 14pt;
+ margin-bottom: inherit;
+ }
+ .datum h1 {
+ font-size: 12pt;
+ margin-bottom: inherit;
+ }
+ .datum h2 {
+ font-size: 11pt;
+ margin-bottom: inherit;
+ margin-top: 5pt;
+ }
+ .kontext-list {
+ list-style: none;
+ }
+ .datum-list {
+ list-style: none;
+ }
+ samp {
+ hyphens: none;
+ font-size: 8pt;
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/pages/resultpage.less b/resources/assets/less/metager/pages/resultpage.less
new file mode 100644
index 0000000000000000000000000000000000000000..991a2c42e9f93851ce4b513b1c687c922e9ec013
--- /dev/null
+++ b/resources/assets/less/metager/pages/resultpage.less
@@ -0,0 +1,5 @@
+@import "./resultpage/result-page.less";
+@import "./resultpage/result.less";
+@import "./resultpage/product.less";
+@import "./resultpage/quicktips.less";
+@import "./resultpage/result-saver.less";
\ No newline at end of file
diff --git a/resources/assets/less/metager/product.less b/resources/assets/less/metager/pages/resultpage/product.less
similarity index 78%
rename from resources/assets/less/metager/product.less
rename to resources/assets/less/metager/pages/resultpage/product.less
index 5b3ccd441ff6d1c2b115463f35e631c090e318dd..350e954ce01bce40c22e5463726773693b3f9aa9 100644
--- a/resources/assets/less/metager/product.less
+++ b/resources/assets/less/metager/pages/resultpage/product.less
@@ -5,12 +5,12 @@
flex-direction: column;
text-align: center;
padding: 5px;
- .lSSlideOuter {
+ .lSSlideOuter {
margin-top: 5px;
- border: 1px dotted @product-border-color;
+ border: 1px dotted @color-almost-white;
}
a {
- color: @product-a-color;
+ color: @color-strong-grey;
}
img {
max-width: 100px;
@@ -18,8 +18,8 @@
.price {
position: relative;
top: 20px;
- color: @product-price-color;
- background-color: @product-price-background-color;
+ color: @color-strong-grey;
+ background-color: fade(@color-white, 90%);
text-align: left;
width: 80px;
font-weight: bold;
diff --git a/resources/assets/less/metager/quicktips.less b/resources/assets/less/metager/pages/resultpage/quicktips.less
similarity index 100%
rename from resources/assets/less/metager/quicktips.less
rename to resources/assets/less/metager/pages/resultpage/quicktips.less
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/pages/resultpage/result-page.less
similarity index 76%
rename from resources/assets/less/metager/result-page.less
rename to resources/assets/less/metager/pages/resultpage/result-page.less
index 353956c976e462d430ceebff0723c1add015a3fb..0d2b7ef3e52e83ef6264b1ec44d68610398e9ffd 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/pages/resultpage/result-page.less
@@ -1,39 +1,28 @@
-/* Ergebnisseite */
-
-@import "./quicktips.less";
-@import "./result-saver.less";
-@import "./result.less";
-@import "./product.less";
-//
-@resultpage-background-color: #FAFAFA;
-//
+/* Variables */
+
+// Background color
+@resultpage-background-color: @background-color;
+// Margin to the left of the results
@results-margin-left: 16px;
-//
-@result-page-body-background-color: @background-color;
-@result-page-a-hover-color: red;
-@result-page-product-shop-color: green;
-//
-@body-background-color: @result-page-body-background-color;
-@a-hover-color: @result-page-a-hover-color;
-@a-donation-hover-color: @result-page-a-hover-color;
-@product-shop-color: @result-page-product-shop-color;
-//
+// Min and max widths of the 2 resultpage columns
@results-width-min: 500px;
@results-width-max: 700px;
@additions-width-min: 400px;
@additions-width-max: 500px;
-//
-@resultpage-breakpoint-large: (@results-width-max + @additions-width-max + @padding-small-default * 4);
-@resultpage-breakpoint-small: (@results-width-min + @additions-width-min + @padding-small-default * 4);
-//
-@resultpage-leftbox-max-width: @results-width-max;
-@resultpage-leftbox-min-dist-left-right: @padding-small-default;
-@resultpage-leftbox-min-dist-top-bottom: @padding-small-default;
-//
+// Breakpoints for the 2 resultpage columns
+@resultpage-breakpoint-max: (@results-width-max + @additions-width-max + @padding-small-default * 4);
+@resultpage-breakpoint-min: (@results-width-min + @additions-width-min + @padding-small-default * 4);
+@product-shop-color: green;
+// The point upon which a .screen-large logo is displayed
@logo-size-breakpoint: (@results-width-min + @padding-small-default * 2);
-//
+// The point upon which the sidebar opener switches place
@sidebar-opener-breakpoint: (@results-width-max + @padding-small-default * 2 + 60px);
-//
+// Quicktip background color
+@quicktip-background-color: @color-white;
+// Color of the Spruch author
+@spruch-author-color: @color-strong-grey;
+/* Styles */
+
#header-logo {
z-index: 0;
padding-right: 10px;
@@ -46,7 +35,6 @@
.screen-small {
display: none;
}
- .screen-large {}
@media (max-width: @logo-size-breakpoint) {
.screen-large {
display: none;
@@ -96,17 +84,6 @@ body {
padding-top: 10px;
}
-.hostlabel {
- display: none;
- position: relative;
- margin-top: -14px;
- background-color: @hostlabel-background-color;
- a:link,
- a:visited {
- color: @hostlabel-a-link-or-visited-color;
- }
-}
-
.img:hover .hostlabel {
display: block;
}
@@ -124,7 +101,7 @@ body {
.alert ul {
list-style-type: none;
padding-left: 49px;
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
padding-left: 0px;
}
}
@@ -162,20 +139,10 @@ nav .input-group {
}
a {
- &:visited {
- color: @link-color;
- }
- &:hover {
- text-decoration: none;
- color: @a-hover-color;
- }
&#donation {
&,
&:visited {
- color: @a-donation-normal-or-visited-color;
- }
- &:hover {
- color: @a-donation-hover-color;
+ color: inherit;
}
}
}
@@ -220,24 +187,6 @@ a {
margin: 0 !important;
}
-.options-list>li {
- &:hover {
- background-color: @options-list-li-hover-background-color;
- }
- &>a {
- color: @options-list-li-a-color;
- white-space: nowrap;
- display: block;
- padding: 5px 14px;
- }
- input[type=submit] {
- width: 100%;
- background-color: transparent;
- border: 0;
- margin: 5px 0;
- }
-}
-
.js-only {
display: none;
}
@@ -254,7 +203,7 @@ a {
margin-bottom: 10px;
margin: 5px;
.img {
- box-shadow: 0px 0px 10px 2px @image-item-img-box-shadow-color;
+ box-shadow: 0px 0px 10px 2px fade(@color-black, 30%);
}
}
@@ -290,6 +239,8 @@ a {
}
}
+/*
+@searchplugin-a-color: @color-white;
#searchplugin {
display: none;
position: fixed;
@@ -311,6 +262,7 @@ a {
display: initial;
}
}
+*/
#products {
width: 100%;
@@ -322,7 +274,7 @@ a {
.lSPrev>i,
.lSNext>i {
- background-color: @lsprev-or-lsnext-i-background-color;
+ background-color: @color-black;
padding: 5px;
}
@@ -391,13 +343,13 @@ a {
display: none;
}
}
- @media (max-width: @resultpage-breakpoint-large) {
+ @media (max-width: @resultpage-breakpoint-max) {
@supports (display: grid) {
grid-template-columns:~"calc(60% - 8px)"~"calc(40% - 8px)";
grid-template-areas: "searchbar ." "foki ." "results additions";
}
}
- @media (max-width: @resultpage-breakpoint-small) {
+ @media (max-width: @resultpage-breakpoint-min) {
margin-left: @padding-small-default;
grid-template-columns: 100%;
grid-template-areas: "searchbar" "foki" "results";
@@ -417,12 +369,12 @@ a {
padding: @padding-small-default @padding-small-default 0px @padding-small-default;
width: (@results-width-max + 2 * @padding-small-default);
max-width: (@results-width-max + 2 * @padding-small-default);
- @media (max-width: @resultpage-breakpoint-large) {
+ @media (max-width: @resultpage-breakpoint-max) {
@supports (display: grid) {
width: ~"calc(60% - 6px)";
}
}
- @media (max-width: @resultpage-breakpoint-small) {
+ @media (max-width: @resultpage-breakpoint-min) {
width: 100%;
margin-left: 0px;
}
@@ -461,41 +413,12 @@ a {
#foki {
display: flex;
justify-content: left;
- /*
- @media (max-width: (@results-width-min + @additions-width-min - 1px)) {
- width: 100%;
- max-width: none;
- margin: 0px;
- padding: @padding-small-default;
- .scrollbox {
- max-width: none;
- margin: 0px;
- #foki-box {
- max-width: none;
- margin: 0px;
- }
- }
- }
- @media (max-width: (4 * @padding-small-default + @results-width-max + @additions-width-max - 1px)) {
- padding-left: @padding-small-default;
- }
- @media (max-width: (@results-width-min + @additions-width-min - 1px)) {
- width: 100%;
- max-width: 700px;
- margin: 0px;
- padding: @padding-small-default;
- #research-bar {
- max-width: none;
- margin: 0px;
- }
- }
- */
#foki-box {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
width: 100%;
- max-width: @resultpage-leftbox-max-width;
+ max-width: @results-width-max;
background-color: white;
border: 1px solid #ccc;
-webkit-box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
@@ -570,7 +493,7 @@ footer.resultPageFooter {
#resultpage-container {
#results-container {
float: left;
- @media (max-width: @resultpage-breakpoint-small) {
+ @media (max-width: @resultpage-breakpoint-min) {
float:none;
}
}
@@ -596,7 +519,7 @@ footer.resultPageFooter {
position: fixed;
width: 100%;
padding: 15px;
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
padding: 5px;
}
}
@@ -605,7 +528,7 @@ footer.resultPageFooter {
.metager3-unstable-warning;
top: 0;
padding-right: 50px;
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
padding: 5px;
padding-right: 50px;
}
@@ -615,4 +538,16 @@ footer.resultPageFooter {
.metager3-unstable-warning;
bottom: 0;
margin-bottom: 0px;
+}
+
+/* Settings button and checkboxes */
+
+.settings-checkbox {
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+.settings-checkbox .settings-icon {
+ margin-left: 5px;
+ font-size: 12px;
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/result-saver.less b/resources/assets/less/metager/pages/resultpage/result-saver.less
similarity index 99%
rename from resources/assets/less/metager/result-saver.less
rename to resources/assets/less/metager/pages/resultpage/result-saver.less
index dc872225e3fb4e1332551f47098a4a2cf328da8e..4096e742ecd2e6bde8a08845d7eed7345db8ffe2 100644
--- a/resources/assets/less/metager/result-saver.less
+++ b/resources/assets/less/metager/pages/resultpage/result-saver.less
@@ -1,6 +1,5 @@
@saved-result-distance-first: 10px;
@saved-result-distance-between: 10px;
-
#savedFoki {
padding-top: 50px;
display: flex;
diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/pages/resultpage/result.less
similarity index 96%
rename from resources/assets/less/metager/result.less
rename to resources/assets/less/metager/pages/resultpage/result.less
index 434ac838dd6273aba014d604b2fc732242aeb7ea..6b3c0a958a93d0d25590c81e2dae1e6ba5480a2a 100644
--- a/resources/assets/less/metager/result.less
+++ b/resources/assets/less/metager/pages/resultpage/result.less
@@ -1,12 +1,12 @@
-/* Ergebnis */
-
@result-font-large: 18px;
@result-font-medium: 16px;
@result-font-url: 14px;
@result-font-small: 12px;
+@result-description-color: @color-black;
+@result-image-border-color: @color-almost-white;
.result {
.card;
- margin: @resultpage-leftbox-min-dist-top-bottom 0px @resultpage-leftbox-min-dist-top-bottom 0px;
+ margin: @padding-small-default 0px;
padding: 8px 15px 5px 15px;
width: 100%;
.result-header {
@@ -78,7 +78,7 @@
color: #333;
text-shadow: none;
font-weight: inherit;
- border: 1px solid #686868 ;
+ border: 1px solid #686868;
padding: 2px;
margin-left: 20px;
border-radius: 4px;
@@ -126,7 +126,7 @@
width: auto;
max-width: 120px;
max-height: 200px;
- border: solid 1px @result-description-img-border-color;
+ border: solid 1px @result-image-border-color;
}
}
}
@@ -181,11 +181,9 @@
}
}
}
-
.result-footer * {
font-size: 10px !important;
}
-
&.ad .ad-label {
&,
& a,
diff --git a/resources/assets/less/metager/pages/start-page.less b/resources/assets/less/metager/pages/start-page.less
new file mode 100644
index 0000000000000000000000000000000000000000..a18047f3bdb53ae56c0dd0ccc1cd4a172e52c345
--- /dev/null
+++ b/resources/assets/less/metager/pages/start-page.less
@@ -0,0 +1,81 @@
+/* Startseite */
+
+@main-content-width: 1000px;
+@foki-edge-rounding: 7px;
+#main-content {
+ flex-grow: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ @media(max-width: @main-content-width) {
+ width: 100%;
+ }
+ @media(min-width: @main-content-width) {
+ width: @main-content-width;
+ }
+ #plugin-btn-div {
+ display: flex;
+ justify-content: center;
+ margin-top: 5px;
+ }
+ #plugin-btn {
+ color: @text-color;
+ }
+}
+
+#additional-content {
+ flex-grow: 2;
+ padding-top: 50px;
+ display: flex;
+ @media(max-width: @screen-mobile) {
+ flex-direction: column;
+ }
+ #about-us {
+ max-width: 500px;
+ margin-right: 50px;
+ @media(max-width: @screen-mobile) {
+ margin: 0px 8px;
+ }
+ h2 {
+ font-size: 21px;
+ }
+ p {
+ font-size: 15px;
+ }
+ }
+ #sponsors {
+ @media(max-width: @screen-mobile) {
+ margin: 20px 5px;
+ }
+ h2 {
+ font-size: 21px;
+ }
+ ul {
+ list-style-type: none;
+ padding: 0px;
+ text-align: left;
+ li.sponsor {
+ a {
+ color: inherit;
+ display: flex;
+ justify-content: space-between;
+ font-size: 15px;
+ i {
+ margin-left: 10px;
+ }
+ }
+ }
+ }
+ }
+}
+
+#spendenaufruf {
+ text-align: center;
+ a {
+ background-color: white;
+ display: inline-block;
+ width: 100%;
+ max-width: 770px;
+ margin-bottom: 10px;
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/widget.less b/resources/assets/less/metager/pages/widget.less
similarity index 96%
rename from resources/assets/less/metager/widget.less
rename to resources/assets/less/metager/pages/widget.less
index 37f6514edbfa95a2d786e17fa99ecfeb2f2f8842..964d52fd816d4772f1d2427287af439ed3eb01b7 100644
--- a/resources/assets/less/metager/widget.less
+++ b/resources/assets/less/metager/pages/widget.less
@@ -5,7 +5,7 @@
font-size: 14px;
line-height: 1.42857;
color: #555;
- background-color: #FFF;
+ background-color: white;
background-image: none;
border: 1px solid #CCC;
margin: 0px;
diff --git a/resources/assets/less/metager/aufruf-winter.less b/resources/assets/less/metager/parts/aufruf-winter.less
similarity index 82%
rename from resources/assets/less/metager/aufruf-winter.less
rename to resources/assets/less/metager/parts/aufruf-winter.less
index 7a4ee98fca97f8c1ed0721cb20de4f66dd0265dc..dedcaa87679ab2b2776786b08b15fe3de8bfc1c8 100644
--- a/resources/assets/less/metager/aufruf-winter.less
+++ b/resources/assets/less/metager/parts/aufruf-winter.less
@@ -6,16 +6,16 @@
@base-aufruf-winter-btn-hover-background-color: #bd0d0d;
//
@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-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-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;
+@aufruf-winter-quicktip-border-color: @base-aufruf-winter-color !important;
.aufruf-winter {
h1 {
font-size: 32px;
- @media(max-width: @screen-md-max) {
+ @media(max-width: @screen-medium) {
.aufruf-winter h1 {
font-size: 27px;
}
@@ -34,22 +34,22 @@
background-color: @aufruf-winter-aufruf-action-btn-hover-background-color;
border-color: @aufruf-winter-aufruf-action-btn-hover-border-color;
}
- &.mg-panel {
+ &#main-content {
background-image: url("/img/snowflake.svg");
background-repeat: no-repeat;
background-position: right top;
background-size: 100px 100px;
- @media(max-width: @screen-sm-max) {
+ @media(max-width: @screen-small) {
background-size: 60px 60px;
}
- @media(min-width: @screen-lg) {
+ @media(min-width: @screen-medium) {
width: 940px;
}
}
&.quicktip {
border-left: 3px solid @aufruf-winter-quicktip-border-color;
}
- @media(max-width: @screen-md-max) {
+ @media(max-width: @screen-medium) {
.lead {
font-size: 18px;
}
diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/parts/footer.less
similarity index 94%
rename from resources/assets/less/metager/footer.less
rename to resources/assets/less/metager/parts/footer.less
index 347197d1bc218f39d3a73bdea88515ac0d5b6776..c0e69b6ed7951792da4190dfbaf64bd6960359c5 100644
--- a/resources/assets/less/metager/footer.less
+++ b/resources/assets/less/metager/parts/footer.less
@@ -29,7 +29,7 @@ footer {
color: @color-black;
}
}
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
img {
display: none;
}
diff --git a/resources/assets/less/metager/modals.less b/resources/assets/less/metager/parts/modals.less
similarity index 95%
rename from resources/assets/less/metager/modals.less
rename to resources/assets/less/metager/parts/modals.less
index 53b090f436ab467cd631cd0d99b379b22a6e3b61..0ad7c57b73ec3e96adc452c3576c549a2f0c0376 100644
--- a/resources/assets/less/metager/modals.less
+++ b/resources/assets/less/metager/parts/modals.less
@@ -3,18 +3,27 @@
#show-create-focus:checked {
&+#create-focus-modal {
position: fixed;
- display: -webkit-box;
- display: -ms-flexbox;
display: flex;
}
}
+#plugin-modal ol>li {
+ margin-bottom: 5px;
+}
+
#plugin-modal-checkbox:checked {
&+#plugin-modal {
display: block;
}
}
+.settings-modal-buttons {
+ padding: 5px;
+ button {
+ margin: 5px
+ }
+}
+
.metager-modal {
display: none;
position: absolute;
diff --git a/resources/assets/less/metager/searchbar.less b/resources/assets/less/metager/parts/searchbar.less
similarity index 75%
rename from resources/assets/less/metager/searchbar.less
rename to resources/assets/less/metager/parts/searchbar.less
index 295c9494076e5b4209cc4cb5cf45fc667a28fcd1..c92bac4b3aa54865f104deeb08f44bf6f8b7d3b6 100644
--- a/resources/assets/less/metager/searchbar.less
+++ b/resources/assets/less/metager/parts/searchbar.less
@@ -1,8 +1,5 @@
-/* Suchleiste */
-
-@startpage-border-color: #a2a2a2;
-/**/
-
+@searchbar-border-color: #a2a2a2;
+@searchbar-background-color: white;
.searchbar {
display: -webkit-box;
display: -ms-flexbox;
@@ -93,6 +90,7 @@
}
}
.search-input {
+ position: relative;
-webkit-box-flex: 1;
-ms-flex-positive: 1;
flex-grow: 1;
@@ -110,6 +108,16 @@
border-radius: 4px;
}
}
+ #search-delete-btn {
+ position: absolute;
+ right: 2px;
+ bottom: 1px;
+ width: auto;
+ border: none;
+ background-color: white;
+ font-size: 25px;
+ font-weight: normal;
+ }
}
.search-submit {
button {
@@ -128,7 +136,7 @@
.search-custom-hidden {
display: none;
}
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
-webkit-box-orient: vertical;
-webkit-box-direction: reverse;
-ms-flex-direction: column-reverse;
@@ -138,21 +146,21 @@
.startpage-searchbar {
>* {
- border: 1px solid @startpage-border-color;
+ border: 1px solid @searchbar-border-color;
&:not(:first-child) {
border-left: none;
}
}
.search-input-submit {
border-radius: 5px;
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
max-width: initial;
}
>:not(:first-child) {
- border-left: 1px solid @startpage-border-color;
+ border-left: 1px solid @searchbar-border-color;
}
}
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
.search-focus-selector {
border: 1px solid #aaa;
border-top: none;
@@ -177,7 +185,7 @@
.search-input-submit {
#search-lang,
#search-key {
- @media (max-width: @screen-xs-max) {
+ @media (max-width: @screen-mobile) {
display: none;
}
}
@@ -187,61 +195,8 @@
}
}
-header:nth-child(1) {
- @media (max-width: 1400px) {
- position: relative;
- }
-}
-
-/* Scrollbar Style */
-
-@scrollfade-color: white;
-.scrollbox {
- position: relative;
- width: 100%;
- max-width: @results-width-max;
- .foki-scrollfade {
- &-left,
- &-right {
- position: absolute;
- width: 20px;
- height: 40px;
- top: 1px;
- pointer-events: none;
- }
- &-left {
- background: -webkit-gradient(linear, left top, right top, from(@scrollfade-color), color-stop(fade(@scrollfade-color, 80%)), to(fade(@scrollfade-color, 0%)));
- background: linear-gradient(to right, @scrollfade-color, fade(@scrollfade-color, 80%), fade(@scrollfade-color, 0%));
- left: 1px;
- }
- &-right {
- background: -webkit-gradient(linear, right top, left top, from(@scrollfade-color), color-stop(fade(@scrollfade-color, 80%)), to(fade(@scrollfade-color, 0%)));
- background: linear-gradient(to left, @scrollfade-color, fade(@scrollfade-color, 80%), fade(@scrollfade-color, 0%));
- right: 1px;
- }
- }
- .search-option-frame {
- position: relative;
- }
-}
-
#research-bar-placeholder {
width: 100%;
max-width: 760px;
height: 51px;
-}
-
-.search-input {
- position: relative;
-}
-
-#search-delete-btn {
- position: absolute;
- right: 2px;
- bottom: 1px;
- width: auto;
- border: none;
- background-color: white;
- font-size: 25px;
- font-weight: normal;
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/settings.less b/resources/assets/less/metager/parts/settings.less
similarity index 89%
rename from resources/assets/less/metager/settings.less
rename to resources/assets/less/metager/parts/settings.less
index 5596a208808d6e0c1491f7ac8fe5153d3f0f2a04..0bc3e26f0100bde7630d2cb5f89b0c656a4f3ab0 100644
--- a/resources/assets/less/metager/settings.less
+++ b/resources/assets/less/metager/parts/settings.less
@@ -26,7 +26,12 @@
margin-right: auto;
}
-@media (max-width: @screen-xs-max) {
+label.select-label {
+ margin-bottom: 0;
+ margin-top: 10px;
+}
+
+@media (max-width: @screen-mobile) {
html,
body,
.wrapper,
diff --git a/resources/assets/less/metager/sidebar.less b/resources/assets/less/metager/parts/sidebar.less
similarity index 91%
rename from resources/assets/less/metager/sidebar.less
rename to resources/assets/less/metager/parts/sidebar.less
index dd7aec9d495210706b2b1d223c1c736962ed5fbd..fd580d35214587c963c73d670e3599365c4b1d84 100644
--- a/resources/assets/less/metager/sidebar.less
+++ b/resources/assets/less/metager/parts/sidebar.less
@@ -1,9 +1,6 @@
-/* Navigations-Seitenleiste */
-
.sidebar {
border-left: 1px solid #ccc;
box-shadow: 0px 1px 1.5px 1px #c0c0c0;
- /**/
position: fixed;
display: block;
top: 0px;
@@ -142,24 +139,44 @@
}
}
-input#sidebarToggle:checked {
- &~.sidebar {
- right: 0px;
- }
- &~.sidebar-opener {
- &:after {
- content: "×";
+@media (max-width: @screen-mobile) {
+ .sidebar {
+ padding-top: 15px;
+ right: -90%;
+ width: 90%;
+ overflow: auto;
+ .sidebar-list {
+ max-height: 1000px;
+ }
+ .sidebar-logo {
+ display: none;
+ }
+ ul.metager-dropdown-content {
+ position: inherit;
+ width: 100%;
}
}
+ .sidebar-opener {
+ // Make the open and close button bigger, so it is easier to hit
+ @sidebar-opener-mobile-magnification: 10px;
+ margin: @sidebar-opener-mobile-magnification;
+ top: (@sidebar-opener-position-top - @sidebar-opener-mobile-magnification);
+ right: (@sidebar-opener-position-right - @sidebar-opener-mobile-magnification);
+ }
+ .sidebar-opener-placeholder {
+ display: initial;
+ }
}
+/* Sidebar opener */
+
// Top right starting position of the sidebar icon
-@sidebar-opener-top: 23px;
-@sidebar-opener-right: 25px;
+@sidebar-opener-position-top: 23px;
+@sidebar-opener-position-right: 25px;
.sidebar-opener {
position: fixed;
- top: @sidebar-opener-top;
- right: @sidebar-opener-right;
+ top: @sidebar-opener-position-top;
+ right: @sidebar-opener-position-right;
margin: 0px;
z-index: 20;
font-size: 36px;
@@ -180,31 +197,15 @@ input#sidebarToggle:checked {
width: 45px;
}
-@media (max-width: @screen-xs-max) {
- .sidebar {
- padding-top: 15px;
- right: -90%;
- width: 90%;
- overflow: auto;
- .sidebar-list {
- max-height: 1000px;
- }
- .sidebar-logo {
- display: none;
- }
- ul.metager-dropdown-content {
- position: inherit;
- width: 100%;
- }
- }
- .sidebar-opener {
- // Make the open and close button bigger, so it is easier to hit
- @sidebar-opener-mobile-magnification: 10px;
- margin: @sidebar-opener-mobile-magnification;
- top: (@sidebar-opener-top - @sidebar-opener-mobile-magnification);
- right: (@sidebar-opener-right - @sidebar-opener-mobile-magnification);
+/* Sidebar toggle checkbox */
+
+#sidebarToggle:checked {
+ &~.sidebar {
+ right: 0px;
}
- .sidebar-opener-placeholder {
- display: initial;
+ &~.sidebar-opener {
+ &:after {
+ content: "×";
+ }
}
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/specific.less b/resources/assets/less/metager/specific.less
deleted file mode 100644
index 889064be16ccc1aba5b6b846f006e987aa6f2ec6..0000000000000000000000000000000000000000
--- a/resources/assets/less/metager/specific.less
+++ /dev/null
@@ -1,211 +0,0 @@
-/* Rules for specific elements */
-
-ul.startpage {
- list-style-type: none;
-}
-
-li#info {
- white-space: pre-line;
-}
-
-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;
-}
-
-.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;
- text-align: center;
-}
-
-.donation-form-group {
- text-align: left;
- font-size: 12px;
-}
-
-.checkbox {
- margin-top: 5px;
- margin-bottom: 5px;
-}
-
-.non-bold {
- font-weight: normal;
-}
-
-.settings-checkbox .settings-icon {
- margin-left: 5px;
- font-size: 12px;
-}
-
-i.fa {
- background-color: transparent;
-}
-
-a.content.hidden-xs {
- color: @a-content-hidden-xs-color;
-}
-
-.navbar-brand {
- line-height: 100% !important;
- padding: 0;
- position: absolute;
- z-index: 5;
- left: 10px;
- .noprint;
-}
-
-.dotlist li {
- margin-bottom: 5px !important;
-}
-
-.emphasize {
- @media (min-width: 768px) {
- font-size: 17px;
- }
-}
-
-form.contact {
- max-width: 500px;
-}
-
-label.select-label {
- margin-bottom: 0;
- margin-top: 10px;
-}
-
-.donation-form-group label {
- font-weight: bold;
-}
-
-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;
- }
- fieldset {
- border: 0;
- }
-}
-
-.panel-title {
- font-weight: bold;
-}
-
-.fake-result {
- *:hover {
- overflow: visible !important;
- }
- .result-footer {
- overflow: hidden;
- align-items: center;
- }
- .open-result-options label {
- padding: 10px;
- border: 2px dashed red;
- border-radius: 100%;
- color: black;
- font-size: 14px;
- text-decoration: none;
- font-weight: normal;
- }
-}
-
-.hilfe,
-.faq {
- section {
- .card-heavy;
- h3 {
- border-bottom: 1px solid #aaa;
- }
- .search-example {
- border: 1px solid #aaa;
- background-color: #eee;
- border-radius: 5px;
- padding: 10px;
- }
- }
-}
\ No newline at end of file
diff --git a/resources/assets/less/metager/start-page.less b/resources/assets/less/metager/start-page.less
deleted file mode 100644
index b2e78689423f525e54e3674077226761288794b7..0000000000000000000000000000000000000000
--- a/resources/assets/less/metager/start-page.less
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Startseite */
-
-@search-bar-width: 1000px;
-//
-@focus-hover-focus-edit-background-color: #e3e3e3;
-@focus-radio-checked-focus-label-focus-edit-background-color: #e3e3e3;
-@foki-edge-rounding: 7px;
-.mg-panel {
- flex-grow: 1;
- display: flex;
- flex-direction: column;
- justify-content: center;
- @media(max-width: @search-bar-width) {
- width: 100%;
- }
- @media(min-width: @search-bar-width) {
- width: @search-bar-width;
- }
- .settings-modal-buttons {
- padding: 5px;
- button {
- margin: 5px
- }
- }
- .startpage-foki,
- .foki {
- display: flex;
- flex-wrap: wrap;
- justify-content: center;
- input {
- visibility: hidden;
- &+.custom-focus-label {
- border-radius: @foki-edge-rounding 0px 0px @foki-edge-rounding;
- }
- &+.custom-focus-label+.custom-focus-edit {
- margin-left: 5px;
- display: inline-block;
- border-radius: 0px @foki-edge-rounding @foki-edge-rounding 0px;
- }
- }
- label {
- & span:not(.badge) {
- background-color: transparent;
- }
- }
- }
- .focus {
- margin: 0px;
- &~.focus {
- margin-left: 10px;
- }
- &:hover {
- .focus-label,
- .focus-edit {
- cursor: pointer;
- background-color: @focus-hover-focus-edit-background-color;
- }
- }
- }
- .focus-radio:checked {
- &+.focus-label,
- &+.focus-label+.focus-edit {
- background-color: @focus-radio-checked-focus-label-focus-edit-background-color;
- }
- }
- .focus-label,
- .focus-edit {
- margin: 0px;
- border-radius: 7px;
- padding: 7px;
- font-weight: normal;
- }
- #plugin-btn-div {
- display: flex;
- justify-content: center;
- margin-top: 5px;
- }
- #plugin-btn {
- color: @text-color;
- }
-}
-
-#more-information {
- flex-grow: 2;
- padding-top: 50px;
- display: flex;
- @media(max-width: @screen-xs-max) {
- flex-direction: column;
- }
- #about-us {
- max-width: 500px;
- margin-right: 50px;
- @media(max-width: @screen-xs-max) {
- margin: 0px 8px;
- }
- h2 {
- font-size: 21px;
- }
- p {
- font-size: 15px;
- }
- }
- #sponsors {
- @media(max-width: @screen-xs-max) {
- margin: 20px 5px;
- }
- h2 {
- font-size: 21px;
- }
- ul {
- padding: 0px;
- text-align: left;
- li.sponsor {
- a {
- color: inherit;
- display: flex;
- justify-content: space-between;
- font-size: 15px;
- i {
- margin-left: 10px;
- }
- }
- }
- }
- }
-}
-
-#spendenaufruf {
- text-align: center;
- a {
- background-color: white;
- display: inline-block;
- width: 100%;
- max-width: 770px;
- margin-bottom: 10px;
- }
-}
\ No newline at end of file
diff --git a/resources/assets/less/metager/variables.less b/resources/assets/less/metager/variables.less
index 0632f3346073d425420593ad77dece2c5ff53d6b..c66a306b49ff786a4f03abf7e21a28182c698641 100644
--- a/resources/assets/less/metager/variables.less
+++ b/resources/assets/less/metager/variables.less
@@ -1,6 +1,6 @@
// MetaGer Brand Color
@metager-orange: #FF8000;
-// General Colors
+// Shades of Gray
@color-white: white;
@color-almost-white: mix(@color-white, @color-black, 90%);
@color-light-grey: mix(@color-white, @color-black, 75%);
@@ -8,17 +8,10 @@
@color-strong-grey: mix(@color-white, @color-black, 25%);
@color-almost-black: mix(@color-white, @color-black, 10%);
@color-black: black;
-// General Background Color
+// Default Background Color
@background-color: #FAFAFA;
-// Signal Colors
-@brand-success: #5cb85c;
-@brand-info: #FB0;
-@brand-warning: #f0ad4e;
-@brand-danger: #d9534f;
-//
-@body-bg: rgb(250, 250, 250);
-@input-border-focus: @metager-orange;
-@font-family-sans-serif: Arimo,
+// Default Font
+@metager-font: Arimo,
"Liberation Sans",
"Helvetica Neue",
Helvetica,
@@ -26,41 +19,11 @@ Arial,
sans-serif;
// General text color.
@text-color: @color-black;
-// General textual link color.
-@link-color: #0066CC;
-//
+// Default textual link color.
+@link-color: #06C;
+// Default Mini-Padding
@padding-small-default: 8px;
// Screen sizes
-@screen-xs-max: 767px;
-@screen-sm-max: 991;
-@screen-md-max: 1199px;
-@screen-lg: 1200;
-/* Unsorted */
-
-@quicktip-background-color: @color-white;
-@navbar-default-background-color: @color-white;
-@form-group-color: @color-black;
-@modal-content-box-shadow-color: fade(@color-black, 30%);
-@a-content-hidden-xs-color: @color-almost-black;
-@section-box-shadow-color: fade(@color-black, 55%);
-@body-background-color: @background-color;
-@hostlabel-a-link-or-visited-color: @color-white;
-@hostlabel-background-color: @color-strong-grey;
-@navbar-resultpage-background-color: @color-white;
-@navbar-resultpage-ul-li-a-metager-dropdown-toggle-hover-or-focus-background-color: @color-almost-white;
-@research-a-color: @color-black;
-@content-wrapper-background-color: @color-white;
-@a-donation-normal-or-visited-color: inherit;
-@spruch-author-color: @color-strong-grey;
-@result-description-color: @color-black;
-@result-description-img-border-color: @color-almost-white;
-@options-list-li-hover-background-color: @color-almost-white;
-@options-list-li-a-color: @color-strong-grey;
-@image-item-img-box-shadow-color: fade(@color-black, 30%);
-@searchplugin-a-color: @color-white;
-@product-border-color: @color-almost-white;
-@product-a-color: @color-strong-grey;
-@product-price-color: @color-strong-grey;
-@product-price-background-color: fade(@color-white, 90%);
-@lsprev-or-lsnext-i-background-color: @color-black;
-@searchbar-background-color: white;
\ No newline at end of file
+@screen-mobile: 760px;
+@screen-small: 1000;
+@screen-medium: 1200px;
\ No newline at end of file
diff --git a/resources/views/datenschutz/datenschutz.blade.php b/resources/views/datenschutz/datenschutz.blade.php
index 88da679d70913c24e98bb251a2f7a0e3ec4c1a17..ecd5a29a07332632572d41c28ebc666df0c598fa 100644
--- a/resources/views/datenschutz/datenschutz.blade.php
+++ b/resources/views/datenschutz/datenschutz.blade.php
@@ -1,64 +1,10 @@
-@extends('layouts.subPages')
+@extends('layouts.subPages', ['page' => 'privacy'])
@section('title', $title )
@section('navbarFocus.datenschutz', 'class="active"')
@section('content')
-<style>
-main {
- font-size: 10pt;
- hyphens:auto;
- counter-reset: kontext 0 datum 0;
- text-align: justify;
-}
-
-h1 {
- font-size: 18pt;
-}
-
-.kontext > h1::before {
- counter-increment: kontext;
- content: "K" counter(kontext) " ";
- font-weight: normal;
-}
-
-.datum > h1::before {
- counter-increment: datum;
- content: "D" counter(datum) " ";
- font-weight: normal;
-}
-
-.kontext h1 {
- font-size: 16pt;
- margin-bottom: inherit;
-}
-.kontext h2 {
- font-size: 14pt;
- margin-bottom: inherit;
-}
-.datum h1 {
- font-size: 12pt;
- margin-bottom: inherit;
-}
-.datum h2 {
- font-size: 11pt;
- margin-bottom: inherit;
- margin-top: 5pt;
-}
-
-.kontext-list {
- list-style: none;
-}
-.datum-list {
- list-style: none;
-}
-
-samp {
- hyphens:none;
- font-size: 8pt;
-}
-</style>
@if (LaravelLocalization::getCurrentLocale() == "de")
@include('datenschutz.german')
@else
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 6f3b6850f800881518c3b18a477015656fb5b57e..11014409fb0f617a63ec09854b63754435e8cb80 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -14,22 +14,20 @@
<script src="{{ mix('js/searchbar.js') }}" defer></script>
@endsection
-@section('optionalContent')
- <div id="more-information">
- <div id="about-us">
- <h2>{!! trans('index.slogan.title') !!}</h2>
- <p>{!! trans('index.slogan.1') !!}</p>
- <p>{!! trans('index.slogan.2') !!}</p>
- </div>
- <div id="sponsors">
- <h2>{{ trans('index.sponsors.head.2') }}</h2>
- <ul class="startpage">
- @foreach($sponsors as $link)
- <li class="sponsor">
- <a href="{{ $link->link }}" target="_blank" rel="noopener"><p>{{ $link->linktext }}</p> <i class="fa fa-external-link-alt"></i></a>
- </li>
- @endforeach
- </ul>
- </div>
+@section('additional-content')
+ <div id="about-us">
+ <h2>{!! trans('index.slogan.title') !!}</h2>
+ <p>{!! trans('index.slogan.1') !!}</p>
+ <p>{!! trans('index.slogan.2') !!}</p>
+ </div>
+ <div id="sponsors">
+ <h2>{{ trans('index.sponsors.head.2') }}</h2>
+ <ul class="startpage">
+ @foreach($sponsors as $link)
+ <li class="sponsor">
+ <a href="{{ $link->link }}" target="_blank" rel="noopener"><p>{{ $link->linktext }}</p> <i class="fa fa-external-link-alt"></i></a>
+ </li>
+ @endforeach
+ </ul>
</div>
@endsection
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 71d7592b9b54278e283e2ff5f6adc44257f0d9da..50f80a235e8f4254a9646177fb68f6a585b8dbd4 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -19,11 +19,11 @@
</div>
<div id="foki">
<div class="scrollbox">
- <div class="foki-scrollfade-left"></div>
+ <div class="scrollfade-left"></div>
<div id="foki-box">
@include('parts.foki')
</div>
- <div class="foki-scrollfade-right"></div>
+ <div class="scrollfade-right"></div>
</div>
</div>
<div id="results-container">
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index cc54c119b2294f6b2276a7b00843536dcb79a004..9f17542b089a71408faa714cc3577d4b603ab1d1 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -15,7 +15,7 @@
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
- <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" />
<link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
<meta name="referrer" content="origin">
<meta name="age-meta-label" content="age=18"/>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 7435eb4bb4f7c4c5c2c3eeaaaaacf53a4199b5fc..4daa887b6cb209bbcf03444a847e817db8c98040 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -17,7 +17,7 @@
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
- <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" />
<script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/utility.js') }}"></script>
@@ -43,7 +43,7 @@
@include('parts.sidebar', ['id' => 'staticPagesSideBar'])
@include('parts.sidebar-opener', ['class' => 'fixed'])
<div class="wrapper {{$page or ''}}">
- <main class="mg-panel">
+ <main id="main-content">
@if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div>
@endif
@@ -58,7 +58,9 @@
@endif
@yield('content')
</main>
- @yield('optionalContent')
+ <div id="additional-content">
+ @yield('additional-content')
+ </div>
</div>
@if (isset($page) && $page === 'startpage')
@include('parts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php
index 1f604df6eeaad004a0c8135f3ce834adda818c24..0e840d54d86a08eb45cf2de67a3adb1e65a16071 100644
--- a/resources/views/spende/beitritt.blade.php
+++ b/resources/views/spende/beitritt.blade.php
@@ -5,8 +5,8 @@
@section('navbarFocus.donate', 'class="dropdown active"')
@section('content')
- <link type="text/css" rel="stylesheet" href="{{ mix('/css/beitritt.css') }}" />
- <script src="{{ mix('js/scriptJoinPage.js') }}"></script>
+<link type="text/css" rel="stylesheet" href="{{ mix('/css/beitritt.css') }}" />
+<script src="{{ mix('js/scriptJoinPage.js') }}"></script>
<form id="donation-form">
<div class="card-heavy">
<h1>{{ trans('beitritt.heading.1') }}</h1>
diff --git a/webpack.mix.js b/webpack.mix.js
index db676f19d976152301879d608d5b567a6077ae27..d64b85df4efca184dcff27db109089fccf4bf2e8 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -18,7 +18,7 @@ mix
@import "./bootstrap/bootstrap.less";
*/
// css
- .less("resources/assets/less/default.less", "public/css/themes/default.css", {
+ .less("resources/assets/less/metager/metager.less", "public/css/themes/metager.css", {
strictMath: true
})
.less("resources/assets/less/font-awesome/fontawesome.less", "public/css/fontawesome.css", {
@@ -31,7 +31,7 @@ mix
strictMath: true
})
.less(
- "resources/assets/less/metager/beitritt.less",
+ "resources/assets/less/metager/pages/beitritt.less",
"public/css/beitritt.css", {
strictMath: true
}