From dd584857e937c593ccd1d7102143f6fb9961c6c8 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 16 Mar 2023 12:44:15 +0000
Subject: [PATCH] remove bogus font-size setting, fixes #2140
Closes #2140
Merge request studip/studip!1564
---
resources/assets/stylesheets/highcontrast.scss | 4 ----
resources/assets/stylesheets/scss/contents.scss | 4 ++--
resources/assets/stylesheets/scss/dashboard.scss | 2 +-
resources/assets/stylesheets/scss/oauth2.scss | 10 ++++++----
resources/assets/stylesheets/scss/questionnaire.scss | 2 +-
resources/assets/stylesheets/scss/scroll-to-top.scss | 4 ++--
resources/assets/stylesheets/scss/sidebar.scss | 2 +-
resources/assets/stylesheets/scss/typography.scss | 1 -
resources/assets/stylesheets/scss/vue-select.scss | 3 ---
resources/assets/stylesheets/studip.scss | 1 -
resources/vue/components/MyCoursesTiles.vue | 7 -------
11 files changed, 13 insertions(+), 27 deletions(-)
delete mode 100644 resources/assets/stylesheets/scss/vue-select.scss
diff --git a/resources/assets/stylesheets/highcontrast.scss b/resources/assets/stylesheets/highcontrast.scss
index 0dda1fd2cb5..bc63acf163b 100644
--- a/resources/assets/stylesheets/highcontrast.scss
+++ b/resources/assets/stylesheets/highcontrast.scss
@@ -1215,7 +1215,6 @@ table.course-search {
.content-item-title {
color: $base-color;
- font-size: 2rem;
}
}
@@ -1551,6 +1550,3 @@ button.skiplink {
}
}
-
-
-
diff --git a/resources/assets/stylesheets/scss/contents.scss b/resources/assets/stylesheets/scss/contents.scss
index 4ec46f42f7a..be96c99e505 100644
--- a/resources/assets/stylesheets/scss/contents.scss
+++ b/resources/assets/stylesheets/scss/contents.scss
@@ -22,7 +22,7 @@
.content-item-text {
.content-item-title {
- font-size: 1.8rem;
+ font-size: larger;
margin-bottom: 5px;
}
@@ -65,7 +65,7 @@
.content-item-text {
.content-item-title {
color: $base-color;
- font-size: 2rem;
+ font-size: 1.3em;
width: 100%;
max-width: 160px;
white-space: nowrap;
diff --git a/resources/assets/stylesheets/scss/dashboard.scss b/resources/assets/stylesheets/scss/dashboard.scss
index 61c5c454369..8349799c28e 100644
--- a/resources/assets/stylesheets/scss/dashboard.scss
+++ b/resources/assets/stylesheets/scss/dashboard.scss
@@ -132,7 +132,7 @@ form div.files-search {
display: block;
width: 1%;
line-height: 1.5;
- padding: .375rem .75rem;
+ padding: .25em .5em;
margin: 0;
}
diff --git a/resources/assets/stylesheets/scss/oauth2.scss b/resources/assets/stylesheets/scss/oauth2.scss
index 552cfda903a..86ce2008e02 100644
--- a/resources/assets/stylesheets/scss/oauth2.scss
+++ b/resources/assets/stylesheets/scss/oauth2.scss
@@ -11,13 +11,15 @@ article.admin-oauth2--setup {
font-size: 16px;
- #sidebar, #main-footer {
+ #sidebar,
+ #main-footer {
display: none;
}
- .scopes, .buttons {
- margin-top: 2rem;
- margin-bottom: 2rem;
+ .scopes,
+ .buttons {
+ margin-top: 1em;
+ margin-bottom: 1em;
}
.buttons {
diff --git a/resources/assets/stylesheets/scss/questionnaire.scss b/resources/assets/stylesheets/scss/questionnaire.scss
index 69f239af9fd..94239bcbcae 100644
--- a/resources/assets/stylesheets/scss/questionnaire.scss
+++ b/resources/assets/stylesheets/scss/questionnaire.scss
@@ -280,7 +280,7 @@ $width: 270px;
.ct-label {
color: rgba(0, 0, 0, 0.8);
text-shadow: -1px 0px $white, 0px 1px $white, 1px 0px $white, 0px -1px $white;
- font-size: 1rem;
+ font-size: x-small;
fill: $black;
}
diff --git a/resources/assets/stylesheets/scss/scroll-to-top.scss b/resources/assets/stylesheets/scss/scroll-to-top.scss
index 0214b54d6b7..aad5cd2e137 100644
--- a/resources/assets/stylesheets/scss/scroll-to-top.scss
+++ b/resources/assets/stylesheets/scss/scroll-to-top.scss
@@ -9,7 +9,7 @@ body #scroll-to-top {
margin-bottom: $scroll-to-top-margin;
padding: 10px;
background: $base-color;
- border: .05rem solid transparent;
+ border: 1px solid transparent;
background-clip: padding-box;
cursor: pointer;
box-sizing: border-box;
@@ -20,7 +20,7 @@ body #scroll-to-top {
z-index: 1;
&:hover {
background: $brand-color-darker;
- border-radius: .12rem;
+ border-radius: 2px;
}
&.hide {
bottom: calc( 0px - #{$scroll-to-top-height + $scroll-to-top-margin});
diff --git a/resources/assets/stylesheets/scss/sidebar.scss b/resources/assets/stylesheets/scss/sidebar.scss
index 4abfd82c90d..4d4efc02df5 100644
--- a/resources/assets/stylesheets/scss/sidebar.scss
+++ b/resources/assets/stylesheets/scss/sidebar.scss
@@ -310,7 +310,7 @@ select.sidebar-selectlist {
border: 1px solid $dark-gray-color-30;
border-right: none;
flex: 1;
- padding: .375rem .75rem;
+ padding: .25em .5em;
width: 100%;
}
diff --git a/resources/assets/stylesheets/scss/typography.scss b/resources/assets/stylesheets/scss/typography.scss
index 67bebc0b63c..e225c42cd40 100644
--- a/resources/assets/stylesheets/scss/typography.scss
+++ b/resources/assets/stylesheets/scss/typography.scss
@@ -1,7 +1,6 @@
// Body reset
html {
- font-size: 62.5%;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
diff --git a/resources/assets/stylesheets/scss/vue-select.scss b/resources/assets/stylesheets/scss/vue-select.scss
deleted file mode 100644
index 7dd13a6ce6b..00000000000
--- a/resources/assets/stylesheets/scss/vue-select.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.vs__search, .vs__search:focus {
- font-size: 1em !important;
-}
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index 7fb1e816d60..fb38beb1d87 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -102,7 +102,6 @@
@import "scss/user-administration";
@import "scss/wiki";
@import "scss/multi_person_search";
-@import "scss/vue-select";
// Class for DOM elements that should only be visible to Screen readers
diff --git a/resources/vue/components/MyCoursesTiles.vue b/resources/vue/components/MyCoursesTiles.vue
index 236ba6899dc..373296f7a18 100644
--- a/resources/vue/components/MyCoursesTiles.vue
+++ b/resources/vue/components/MyCoursesTiles.vue
@@ -172,10 +172,6 @@ $tile-padding: 10px;
$header-size: $avatar-size;
$element-height: (100px + $header-size);
- &:not(:last-child) {
- margin-bottom: 2rem;
- }
-
.studip-grid-element {
box-sizing: border-box;
display: flex;
@@ -196,9 +192,6 @@ $tile-padding: 10px;
overflow: hidden;
}
- //.tiled-grid-element-header-title {
- //}
-
.tiles-grid-element-header-image {
float: left;
display: block;
--
GitLab