From 2314a82efe4129f928439a9ff70f9e82f4aa82a5 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Mon, 20 Nov 2017 10:41:52 +0100
Subject: [PATCH] Refactoring: Aufbau der less dateien geordnet
---
resources/assets/less/default.less | 48 +------------------
resources/assets/less/metager/base.less | 4 ++
.../assets/less/metager/result-page.less | 17 ++++++-
resources/assets/less/metager/variables.less | 26 +++++-----
resources/assets/less/variables-default.less | 29 -----------
5 files changed, 36 insertions(+), 88 deletions(-)
delete mode 100644 resources/assets/less/variables-default.less
diff --git a/resources/assets/less/default.less b/resources/assets/less/default.less
index f64afa380..1b94f65de 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/base.less b/resources/assets/less/metager/base.less
index d4ddfb2b7..44f990064 100644
--- a/resources/assets/less/metager/base.less
+++ b/resources/assets/less/metager/base.less
@@ -39,6 +39,10 @@ body {
justify-content: space-between;
}
+.logo h1 {
+ color: rgb(255, 128, 0);
+}
+
summary {
cursor: pointer;
&::-webkit-details-marker {
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index f942e1b9e..a570ad8d0 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -41,6 +41,20 @@ body {
}
}
+.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;
@@ -544,7 +558,8 @@ a {
}
}
-.disabled, .disabled * {
+.disabled,
+.disabled * {
color: #aaa !important;
cursor: not-allowed !important;
}
diff --git a/resources/assets/less/metager/variables.less b/resources/assets/less/metager/variables.less
index 891650a4e..bdca9c861 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;
@@ -45,14 +59,4 @@
@base-aufruf-winter-border-color: #953535;
@base-aufruf-winter-btn-color: white;
@base-aufruf-winter-btn-hover-background-color: #bd0d0d;
-@base-new-feature-badge-background-color: #f80;
-// 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
+@base-new-feature-badge-background-color: #f80;
\ 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 d7466d4fd..000000000
--- 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
--
GitLab