From 8e136379e672ff7656343d6d4dcbe03d2f511272 Mon Sep 17 00:00:00 2001 From: Ron Lucke <lucke@elan-ev.de> Date: Wed, 21 Sep 2022 10:50:14 +0000 Subject: [PATCH] Biest #1157 Closes #1157 Merge request studip/studip!1001 --- resources/assets/stylesheets/scss/variables.scss | 4 ++-- resources/assets/stylesheets/studip-cke-ui.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/stylesheets/scss/variables.scss b/resources/assets/stylesheets/scss/variables.scss index 6e7cc22a334..b86352d4f07 100644 --- a/resources/assets/stylesheets/scss/variables.scss +++ b/resources/assets/stylesheets/scss/variables.scss @@ -13,7 +13,7 @@ $font-size-h2: floor($font-size-base * 1.2); // ~30px $font-size-h3: ceil($font-size-base * 1.1); // ~24px $font-size-h4: $font-size-base; // ~18px $font-size-h5: $font-size-base; -$font-size-h6: ceil($font-size-base * 0.85); // ~12px +$font-size-h6: $font-size-base; //** Unit-less `line-height` for use in components like buttons. $line-height-base: 1.428571429; // 20/14 @@ -24,7 +24,7 @@ $line-height-computed: floor($font-size-base * $line-height-base); // ~20px $headings-font-family: inherit; $headings-font-weight: 700; $headings-line-height: 1.1; -$headings-color: #444444; +$headings-color: #000; // Design specific $bar-bottom-container-height: 40px; diff --git a/resources/assets/stylesheets/studip-cke-ui.css b/resources/assets/stylesheets/studip-cke-ui.css index 07b847aa6e3..5fc17f78791 100644 --- a/resources/assets/stylesheets/studip-cke-ui.css +++ b/resources/assets/stylesheets/studip-cke-ui.css @@ -376,7 +376,7 @@ form.default .ck-source-editing-area textarea { /* forum fixes */ #forum .ck-source-editing-area textarea { - height: unset; + height: 100%; min-height: 8em; } -- GitLab