From bef936d1577174da70bea0caeef8fe46c63e8ae2 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 16 Dec 2022 14:48:21 +0000
Subject: [PATCH] remove unnecessary imports, fixes #1912
Closes #1912
Merge request studip/studip!1256
---
resources/assets/stylesheets/scss/header.scss | 2 --
resources/assets/stylesheets/scss/layouts.scss | 2 --
resources/assets/stylesheets/scss/variables.scss | 1 -
resources/assets/stylesheets/studip.scss | 2 +-
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/resources/assets/stylesheets/scss/header.scss b/resources/assets/stylesheets/scss/header.scss
index 36ae554cff0..bcd76b761b5 100644
--- a/resources/assets/stylesheets/scss/header.scss
+++ b/resources/assets/stylesheets/scss/header.scss
@@ -1,5 +1,3 @@
-@import "./layouts.scss";
-
/* --- header.css ----------------------------------------------------------- */
#main-header {
box-sizing: border-box;
diff --git a/resources/assets/stylesheets/scss/layouts.scss b/resources/assets/stylesheets/scss/layouts.scss
index 0fc1b9d21cc..27be3c41fd6 100644
--- a/resources/assets/stylesheets/scss/layouts.scss
+++ b/resources/assets/stylesheets/scss/layouts.scss
@@ -1,7 +1,5 @@
// TODO: SCSSify
-@import "./variables.scss";
-
$page-margin: 15px;
$content-width: 400px;
diff --git a/resources/assets/stylesheets/scss/variables.scss b/resources/assets/stylesheets/scss/variables.scss
index 517949b62e2..96b8cf62ea4 100644
--- a/resources/assets/stylesheets/scss/variables.scss
+++ b/resources/assets/stylesheets/scss/variables.scss
@@ -44,7 +44,6 @@ $drag_and_drop_border: 1px solid $base-color;
// The special handling for -- as #{"--"} seems to be neccessary to make
// scss evaluate the color variables
#{"--"}active-color: $active-color;
- #{"--"}active-color: $active-color;
#{"--"}activity-color: $activity-color;
#{"--"}activity-color-20: $activity-color-20;
#{"--"}activity-color-40: $activity-color-40;
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index d294ae52dbf..804a4224982 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -46,6 +46,7 @@
@import "scss/forum";
@import "scss/gradebook";
@import "scss/grid";
+@import "scss/layouts";
@import "scss/header";
@import "scss/headings";
@import "scss/helpbar";
@@ -54,7 +55,6 @@
@import "scss/index";
@import "scss/fullscreen";
@import "scss/globalsearch";
-@import "scss/layouts";
@import "scss/links";
@import "scss/lists";
@import "scss/messages";
--
GitLab