From 77c5e5660dd23281f180cde77bb54ec98d246730 Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Fri, 27 Sep 2019 12:51:18 +0200
Subject: [PATCH] solves merge conflict in _iconfont.scss
refs #16082, refs #15646
---
themes/fid_adlr/scss/_iconfont.scss | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/themes/fid_adlr/scss/_iconfont.scss b/themes/fid_adlr/scss/_iconfont.scss
index 10a0835e748..f47cd4af638 100755
--- a/themes/fid_adlr/scss/_iconfont.scss
+++ b/themes/fid_adlr/scss/_iconfont.scss
@@ -38,10 +38,22 @@ $imo-css-prefix: 'icon' !default;
-webkit-font-smoothing: antialiased;
}
+.#{$imo-css-prefix}-1\.5x {
+ font-size: 150%;
+}
+
.#{$imo-css-prefix}-2x {
font-size: 200%;
}
+.#{$imo-css-prefix}-3x {
+ font-size: 300%;
+}
+
+.#{$imo-css-prefix}-4x {
+ font-size: 400%;
+}
+
// Icons are sorted by hex value
.#{$imo-css-prefix}-alert-circle::before {
content: '\e900';
--
GitLab