From fc4cc65e073d144e0bab222d89c6dbf06e10853b Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 18 Aug 2020 17:14:02 +0100
Subject: [PATCH] Merge typography files in css admin

---
 .../stylesheets/admin/shared/typography.scss  | 18 +++++++++++++++++
 app/assets/stylesheets/admin/typography.scss  | 20 -------------------
 2 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 app/assets/stylesheets/admin/typography.scss

diff --git a/app/assets/stylesheets/admin/shared/typography.scss b/app/assets/stylesheets/admin/shared/typography.scss
index 9cd3a4c2c4..16d1b86b5d 100644
--- a/app/assets/stylesheets/admin/shared/typography.scss
+++ b/app/assets/stylesheets/admin/shared/typography.scss
@@ -132,3 +132,21 @@ dl {
   padding: 40px 0px;
   color: lighten($color-body-text, 15);
 }
+
+.text-normal {
+  font-size: 1.0rem;
+  font-weight: 300;
+}
+
+.text-big {
+  font-size: 1.2rem;
+  font-weight: 300;
+}
+
+.text-red {
+  color: $warning-red;
+}
+
+input.text-big {
+  font-size: 1.1rem;
+}
diff --git a/app/assets/stylesheets/admin/typography.scss b/app/assets/stylesheets/admin/typography.scss
deleted file mode 100644
index 12c683d820..0000000000
--- a/app/assets/stylesheets/admin/typography.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import "variables";
-
-.text-normal {
-  font-size: 1.0rem;
-  font-weight: 300;
-}
-
-.text-big {
-  font-size: 1.2rem;
-  font-weight: 300;
-}
-
-.text-red {
-  color: $warning-red;
-}
-
-
-input.text-big {
-  font-size: 1.1rem;
-}