From 683864e359fa50fe3c7f1e0d4349c7fc8f28b099 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <karl@suma-ev.de>
Date: Mon, 12 Nov 2018 10:31:21 +0100
Subject: [PATCH] Less files are sorted by target type. Unfortunately along the
way the arrow for select fields broke.
---
resources/assets/less/metager.less | 19 -----------
.../less/metager/{ => general}/cards.less | 0
.../less/metager/{ => general}/general.less | 16 +++++++---
.../less/metager/{ => general}/specific.less | 0
resources/assets/less/metager/metager.less | 32 ++++++++++++-------
.../less/metager/{ => pages}/beitritt.less | 0
.../less/metager/{ => pages}/contact.less | 0
.../less/metager/{ => pages}/donation.less | 0
.../less/metager/{ => pages}/help_faq.less | 0
.../less/metager/{ => pages}/language.less | 0
.../assets/less/metager/pages/resultpage.less | 5 +++
.../{ => pages/resultpage}/product.less | 0
.../{ => pages/resultpage}/quicktips.less | 0
.../{ => pages/resultpage}/result-page.less | 4 ---
.../{ => pages/resultpage}/result-saver.less | 1 -
.../{ => pages/resultpage}/result.less | 0
.../less/metager/{ => pages}/start-page.less | 0
.../less/metager/{ => pages}/widget.less | 0
.../metager/{ => parts}/aufruf-winter.less | 0
.../less/metager/{ => parts}/footer.less | 0
.../less/metager/{ => parts}/modals.less | 4 +++
.../less/metager/{ => parts}/searchbar.less | 0
.../less/metager/{ => parts}/settings.less | 0
.../less/metager/{ => parts}/sidebar.less | 0
.../assets/less/metager/plugin-modal.less | 3 --
resources/assets/less/metager/subpages.less | 8 -----
webpack.mix.js | 4 +--
27 files changed, 43 insertions(+), 53 deletions(-)
delete mode 100644 resources/assets/less/metager.less
rename resources/assets/less/metager/{ => general}/cards.less (100%)
rename resources/assets/less/metager/{ => general}/general.less (96%)
rename resources/assets/less/metager/{ => general}/specific.less (100%)
rename resources/assets/less/metager/{ => pages}/beitritt.less (100%)
rename resources/assets/less/metager/{ => pages}/contact.less (100%)
rename resources/assets/less/metager/{ => pages}/donation.less (100%)
rename resources/assets/less/metager/{ => pages}/help_faq.less (100%)
rename resources/assets/less/metager/{ => pages}/language.less (100%)
create mode 100644 resources/assets/less/metager/pages/resultpage.less
rename resources/assets/less/metager/{ => pages/resultpage}/product.less (100%)
rename resources/assets/less/metager/{ => pages/resultpage}/quicktips.less (100%)
rename resources/assets/less/metager/{ => pages/resultpage}/result-page.less (99%)
rename resources/assets/less/metager/{ => pages/resultpage}/result-saver.less (99%)
rename resources/assets/less/metager/{ => pages/resultpage}/result.less (100%)
rename resources/assets/less/metager/{ => pages}/start-page.less (100%)
rename resources/assets/less/metager/{ => pages}/widget.less (100%)
rename resources/assets/less/metager/{ => parts}/aufruf-winter.less (100%)
rename resources/assets/less/metager/{ => parts}/footer.less (100%)
rename resources/assets/less/metager/{ => parts}/modals.less (98%)
rename resources/assets/less/metager/{ => parts}/searchbar.less (100%)
rename resources/assets/less/metager/{ => parts}/settings.less (100%)
rename resources/assets/less/metager/{ => parts}/sidebar.less (100%)
delete mode 100644 resources/assets/less/metager/plugin-modal.less
delete mode 100644 resources/assets/less/metager/subpages.less
diff --git a/resources/assets/less/metager.less b/resources/assets/less/metager.less
deleted file mode 100644
index 631e897ee..000000000
--- a/resources/assets/less/metager.less
+++ /dev/null
@@ -1,19 +0,0 @@
-@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/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 96%
rename from resources/assets/less/metager/general.less
rename to resources/assets/less/metager/general/general.less
index 6f3504fc4..4594e7d0d 100644
--- a/resources/assets/less/metager/general.less
+++ b/resources/assets/less/metager/general/general.less
@@ -185,10 +185,18 @@ i.fa {
#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;
+ }
}
}
diff --git a/resources/assets/less/metager/specific.less b/resources/assets/less/metager/general/specific.less
similarity index 100%
rename from resources/assets/less/metager/specific.less
rename to resources/assets/less/metager/general/specific.less
diff --git a/resources/assets/less/metager/metager.less b/resources/assets/less/metager/metager.less
index 1351c3a8e..75b35e626 100644
--- a/resources/assets/less/metager/metager.less
+++ b/resources/assets/less/metager/metager.less
@@ -1,13 +1,21 @@
-@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/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/contact.less b/resources/assets/less/metager/pages/contact.less
similarity index 100%
rename from resources/assets/less/metager/contact.less
rename to resources/assets/less/metager/pages/contact.less
diff --git a/resources/assets/less/metager/donation.less b/resources/assets/less/metager/pages/donation.less
similarity index 100%
rename from resources/assets/less/metager/donation.less
rename to resources/assets/less/metager/pages/donation.less
diff --git a/resources/assets/less/metager/help_faq.less b/resources/assets/less/metager/pages/help_faq.less
similarity index 100%
rename from resources/assets/less/metager/help_faq.less
rename to resources/assets/less/metager/pages/help_faq.less
diff --git a/resources/assets/less/metager/language.less b/resources/assets/less/metager/pages/language.less
similarity index 100%
rename from resources/assets/less/metager/language.less
rename to resources/assets/less/metager/pages/language.less
diff --git a/resources/assets/less/metager/pages/resultpage.less b/resources/assets/less/metager/pages/resultpage.less
new file mode 100644
index 000000000..991a2c42e
--- /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 100%
rename from resources/assets/less/metager/product.less
rename to resources/assets/less/metager/pages/resultpage/product.less
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 99%
rename from resources/assets/less/metager/result-page.less
rename to resources/assets/less/metager/pages/resultpage/result-page.less
index 31cf49599..7d02af9f2 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/pages/resultpage/result-page.less
@@ -1,7 +1,3 @@
-@import "./quicktips.less";
-@import "./result-saver.less";
-@import "./result.less";
-@import "./product.less";
/* Variables */
// Background color
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 dc872225e..4096e742e 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 100%
rename from resources/assets/less/metager/result.less
rename to resources/assets/less/metager/pages/resultpage/result.less
diff --git a/resources/assets/less/metager/start-page.less b/resources/assets/less/metager/pages/start-page.less
similarity index 100%
rename from resources/assets/less/metager/start-page.less
rename to resources/assets/less/metager/pages/start-page.less
diff --git a/resources/assets/less/metager/widget.less b/resources/assets/less/metager/pages/widget.less
similarity index 100%
rename from resources/assets/less/metager/widget.less
rename to resources/assets/less/metager/pages/widget.less
diff --git a/resources/assets/less/metager/aufruf-winter.less b/resources/assets/less/metager/parts/aufruf-winter.less
similarity index 100%
rename from resources/assets/less/metager/aufruf-winter.less
rename to resources/assets/less/metager/parts/aufruf-winter.less
diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/parts/footer.less
similarity index 100%
rename from resources/assets/less/metager/footer.less
rename to resources/assets/less/metager/parts/footer.less
diff --git a/resources/assets/less/metager/modals.less b/resources/assets/less/metager/parts/modals.less
similarity index 98%
rename from resources/assets/less/metager/modals.less
rename to resources/assets/less/metager/parts/modals.less
index bf3787347..0ad7c57b7 100644
--- a/resources/assets/less/metager/modals.less
+++ b/resources/assets/less/metager/parts/modals.less
@@ -7,6 +7,10 @@
}
}
+#plugin-modal ol>li {
+ margin-bottom: 5px;
+}
+
#plugin-modal-checkbox:checked {
&+#plugin-modal {
display: block;
diff --git a/resources/assets/less/metager/searchbar.less b/resources/assets/less/metager/parts/searchbar.less
similarity index 100%
rename from resources/assets/less/metager/searchbar.less
rename to resources/assets/less/metager/parts/searchbar.less
diff --git a/resources/assets/less/metager/settings.less b/resources/assets/less/metager/parts/settings.less
similarity index 100%
rename from resources/assets/less/metager/settings.less
rename to resources/assets/less/metager/parts/settings.less
diff --git a/resources/assets/less/metager/sidebar.less b/resources/assets/less/metager/parts/sidebar.less
similarity index 100%
rename from resources/assets/less/metager/sidebar.less
rename to resources/assets/less/metager/parts/sidebar.less
diff --git a/resources/assets/less/metager/plugin-modal.less b/resources/assets/less/metager/plugin-modal.less
deleted file mode 100644
index 69b288538..000000000
--- a/resources/assets/less/metager/plugin-modal.less
+++ /dev/null
@@ -1,3 +0,0 @@
-#plugin-modal ol>li {
- margin-bottom: 5px;
-}
\ No newline at end of file
diff --git a/resources/assets/less/metager/subpages.less b/resources/assets/less/metager/subpages.less
deleted file mode 100644
index 2ccce8d61..000000000
--- a/resources/assets/less/metager/subpages.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.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/webpack.mix.js b/webpack.mix.js
index 049724a0a..d64b85df4 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -18,7 +18,7 @@ mix
@import "./bootstrap/bootstrap.less";
*/
// css
- .less("resources/assets/less/metager.less", "public/css/themes/metager.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
}
--
GitLab