From e6542203880394dd8bb8e565f7d26bf95d1ec328 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <karl@suma-ev.de>
Date: Mon, 12 Nov 2018 09:31:11 +0100
Subject: [PATCH] Reduced specific.less rules
---
resources/assets/less/default.less | 1 -
resources/assets/less/metager.less | 19 ++
resources/assets/less/metager/contact.less | 12 ++
resources/assets/less/metager/donation.less | 8 +
resources/assets/less/metager/general.less | 34 ++++
resources/assets/less/metager/help_faq.less | 33 ++++
resources/assets/less/metager/language.less | 3 +
.../assets/less/metager/plugin-modal.less | 3 +
.../assets/less/metager/result-page.less | 12 ++
resources/assets/less/metager/settings.less | 5 +
resources/assets/less/metager/specific.less | 176 +-----------------
resources/assets/less/metager/start-page.less | 1 +
resources/assets/less/metager/subpages.less | 8 +
resources/views/layouts/resultPage.blade.php | 2 +-
resources/views/layouts/staticPages.blade.php | 2 +-
webpack.mix.js | 2 +-
16 files changed, 142 insertions(+), 179 deletions(-)
delete mode 100644 resources/assets/less/default.less
create mode 100644 resources/assets/less/metager.less
create mode 100644 resources/assets/less/metager/contact.less
create mode 100644 resources/assets/less/metager/donation.less
create mode 100644 resources/assets/less/metager/help_faq.less
create mode 100644 resources/assets/less/metager/language.less
create mode 100644 resources/assets/less/metager/plugin-modal.less
create mode 100644 resources/assets/less/metager/subpages.less
diff --git a/resources/assets/less/default.less b/resources/assets/less/default.less
deleted file mode 100644
index faac8a6b8..000000000
--- 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.less b/resources/assets/less/metager.less
new file mode 100644
index 000000000..631e897ee
--- /dev/null
+++ b/resources/assets/less/metager.less
@@ -0,0 +1,19 @@
+@import "./metager/general.less";
+@import "./metager/specific.less";
+@import "./metager/result-page.less";
+@import "./metager/start-page.less";
+@import "./metager/settings.less";
+@import "./metager/variables.less";
+@import "./metager/sidebar.less";
+@import "./metager/modals.less";
+@import "./metager/footer.less";
+@import "./metager/searchbar.less";
+@import "./metager/aufruf-winter.less";
+@import "./metager/cards.less";
+@import "./metager/widget.less";
+@import "./metager/help_faq.less";
+@import "./metager/contact.less";
+@import "./metager/donation.less";
+@import "./metager/language.less";
+@import "./metager/plugin-modal.less";
+@import "./metager/subpages.less";
\ No newline at end of file
diff --git a/resources/assets/less/metager/contact.less b/resources/assets/less/metager/contact.less
new file mode 100644
index 000000000..ea987ab7e
--- /dev/null
+++ b/resources/assets/less/metager/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/donation.less b/resources/assets/less/metager/donation.less
new file mode 100644
index 000000000..3a5ecac1b
--- /dev/null
+++ b/resources/assets/less/metager/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/general.less b/resources/assets/less/metager/general.less
index c709ce0aa..6f3504fc4 100644
--- a/resources/assets/less/metager/general.less
+++ b/resources/assets/less/metager/general.less
@@ -132,6 +132,12 @@ body {
text-align: center;
}
+.subheading {
+ font-size: 20px;
+ margin: 20px 0px;
+ white-space: pre-wrap;
+}
+
a {
font-size: 100%;
color: @link-color;
@@ -144,6 +150,10 @@ a {
}
}
+i.fa {
+ background-color: transparent;
+}
+
/* Logo */
.logo {
@@ -362,6 +372,30 @@ button {
background-color: transparent;
}
+/* Lists with dots */
+
+.dotlist {
+ list-style-type: disc;
+ text-align: left;
+ li {
+ margin-bottom: 5px !important;
+ }
+}
+
+/* Code */
+
+code {
+ white-space: pre-wrap;
+ overflow-wrap: break-word;
+ word-break: break-word;
+}
+
+/* Adresses */
+
+address {
+ white-space: pre;
+}
+
/* Unknown Uses */
label a {
diff --git a/resources/assets/less/metager/help_faq.less b/resources/assets/less/metager/help_faq.less
new file mode 100644
index 000000000..5be91c7d9
--- /dev/null
+++ b/resources/assets/less/metager/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/language.less b/resources/assets/less/metager/language.less
new file mode 100644
index 000000000..b87b3b047
--- /dev/null
+++ b/resources/assets/less/metager/language.less
@@ -0,0 +1,3 @@
+.language-name {
+ white-space: pre;
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/plugin-modal.less b/resources/assets/less/metager/plugin-modal.less
new file mode 100644
index 000000000..69b288538
--- /dev/null
+++ b/resources/assets/less/metager/plugin-modal.less
@@ -0,0 +1,3 @@
+#plugin-modal ol>li {
+ margin-bottom: 5px;
+}
\ 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 96ae65fb8..31cf49599 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -533,4 +533,16 @@ footer.resultPageFooter {
width: 100%;
padding-right: 60px;
padding-left: 150px;
+}
+
+/* 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/settings.less b/resources/assets/less/metager/settings.less
index 8677e040a..0bc3e26f0 100644
--- a/resources/assets/less/metager/settings.less
+++ b/resources/assets/less/metager/settings.less
@@ -26,6 +26,11 @@
margin-right: auto;
}
+label.select-label {
+ margin-bottom: 0;
+ margin-top: 10px;
+}
+
@media (max-width: @screen-mobile) {
html,
body,
diff --git a/resources/assets/less/metager/specific.less b/resources/assets/less/metager/specific.less
index 3b0fd5ab4..a703ee66e 100644
--- a/resources/assets/less/metager/specific.less
+++ b/resources/assets/less/metager/specific.less
@@ -1,44 +1,6 @@
/* 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: @color-white;
- border-radius: 0;
-}
-
-.row {
- margin-left: 0;
- margin-right: 0;
-}
-
+// kontakt.blade.php, spende.blade.php, zitatsuche.blade.php
.form-group {
font-family: sans-serif;
font-size: 16px;
@@ -47,151 +9,15 @@ textarea#message {
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;
-}
-
-.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: @color-almost-black;
-}
-
-.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;
-}
-
-.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/start-page.less b/resources/assets/less/metager/start-page.less
index fcb0a9cd4..0ffeea843 100644
--- a/resources/assets/less/metager/start-page.less
+++ b/resources/assets/less/metager/start-page.less
@@ -50,6 +50,7 @@
font-size: 21px;
}
ul {
+ list-style-type: none;
padding: 0px;
text-align: left;
li.sponsor {
diff --git a/resources/assets/less/metager/subpages.less b/resources/assets/less/metager/subpages.less
new file mode 100644
index 000000000..2ccce8d61
--- /dev/null
+++ b/resources/assets/less/metager/subpages.less
@@ -0,0 +1,8 @@
+.navbar-brand {
+ line-height: 100% !important;
+ padding: 0;
+ position: absolute;
+ z-index: 5;
+ left: 10px;
+ .noprint;
+}
\ No newline at end of file
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index cc54c119b..9f17542b0 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 8f05c140f..fa0c7925d 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>
diff --git a/webpack.mix.js b/webpack.mix.js
index db676f19d..049724a0a 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.less", "public/css/themes/metager.css", {
strictMath: true
})
.less("resources/assets/less/font-awesome/fontawesome.less", "public/css/fontawesome.css", {
--
GitLab