From 2db02bd240a82d2addc19fe73cd5651541a58dc8 Mon Sep 17 00:00:00 2001
From: ijin08 <ocarroll.patrick@gmail.com>
Date: Thu, 21 Mar 2019 10:43:06 +0100
Subject: [PATCH] replaced rem with pixels or variables

---
 public/sass/base/_reboot.scss                 | 20 ++++++-------
 public/sass/components/_cards.scss            | 16 ++---------
 public/sass/components/_dashboard_grid.scss   |  2 +-
 public/sass/components/_dashboard_list.scss   |  2 +-
 .../sass/components/_dashboard_settings.scss  |  2 +-
 public/sass/components/_dropdown.scss         |  6 ++--
 public/sass/components/_navbar.scss           |  4 ---
 public/sass/components/_query_editor.scss     | 10 +++----
 public/sass/pages/_login.scss                 | 28 +++++++++----------
 9 files changed, 37 insertions(+), 53 deletions(-)

diff --git a/public/sass/base/_reboot.scss b/public/sass/base/_reboot.scss
index 3b05bff61bf..01052839504 100644
--- a/public/sass/base/_reboot.scss
+++ b/public/sass/base/_reboot.scss
@@ -106,7 +106,7 @@ h4,
 h5,
 h6 {
   margin-top: 0;
-  margin-bottom: 0.5rem;
+  margin-bottom: $space-sm;
 }
 
 // Reset margins on paragraphs
@@ -115,7 +115,7 @@ h6 {
 // bottom margin to use `rem` units instead of `em`.
 p {
   margin-top: 0;
-  margin-bottom: 1rem;
+  margin-bottom: $space-md;
 }
 
 // Abbreviations and acronyms
@@ -125,7 +125,7 @@ abbr[title] {
 }
 
 address {
-  margin-bottom: 1rem;
+  margin-bottom: $space-md;
   font-style: normal;
   line-height: inherit;
 }
@@ -134,7 +134,7 @@ ol,
 ul,
 dl {
   margin-top: 0;
-  margin-bottom: 0rem;
+  margin-bottom: 0;
 }
 
 ol ol,
@@ -149,12 +149,12 @@ dt {
 }
 
 dd {
-  margin-bottom: 0.5rem;
+  margin-bottom: $space-sm;
   margin-left: 0; // Undo browser default
 }
 
 blockquote {
-  margin: 0 0 1rem;
+  margin: 0 0 $space-md;
 }
 
 //
@@ -183,7 +183,7 @@ pre {
   // Remove browser default top margin
   margin-top: 0;
   // Reset browser default of `1em` to use `rem`s
-  margin-bottom: 1rem;
+  margin-bottom: $space-md;
 }
 
 //
@@ -193,7 +193,7 @@ pre {
 figure {
   // Normalize adds `margin` to `figure`s as browsers apply it inconsistently.
   // We reset that to create a better flow in-page.
-  margin: 0 0 1rem;
+  margin: 0 0 $space-md;
 }
 
 //
@@ -314,8 +314,8 @@ legend {
   display: block;
   width: 100%;
   padding: 0;
-  margin-bottom: 0.5rem;
-  font-size: 1.5rem;
+  margin-bottom: $space-sm;
+  font-size: $space-lg;
   line-height: inherit;
   //  border: 0;
 }
diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss
index 58d4b1ab5d2..9861030abd9 100644
--- a/public/sass/components/_cards.scss
+++ b/public/sass/components/_cards.scss
@@ -62,13 +62,6 @@
     font-size: 11px;
     padding: 2px 6px;
   }
-
-  &--alert {
-    padding: 0.5rem 1rem;
-    .card-item-name a {
-      font-size: $font-size-h5;
-    }
-  }
 }
 
 .card-item-body {
@@ -147,15 +140,10 @@
 
   .card-item-figure {
     margin: 0 $space-md $space-md 0;
-    height: 6rem;
+    height: 80px;
 
     img {
-      width: 6rem;
-    }
-    .fa,
-    .icon-gf,
-    .gicon {
-      font-size: 3.5rem;
+      width: 80px;
     }
   }
 
diff --git a/public/sass/components/_dashboard_grid.scss b/public/sass/components/_dashboard_grid.scss
index eeb01c86ab9..5b865f3c7e4 100644
--- a/public/sass/components/_dashboard_grid.scss
+++ b/public/sass/components/_dashboard_grid.scss
@@ -55,7 +55,7 @@
     position: unset !important;
     width: 100% !important;
     transform: translate(0px, 0px) !important;
-    margin-bottom: 1rem;
+    margin-bottom: $space-md;
   }
 }
 
diff --git a/public/sass/components/_dashboard_list.scss b/public/sass/components/_dashboard_list.scss
index 03b0e58dd4e..8fbf9d65e91 100644
--- a/public/sass/components/_dashboard_list.scss
+++ b/public/sass/components/_dashboard_list.scss
@@ -5,7 +5,7 @@
 }
 
 .search-results {
-  margin-top: 2rem;
+  margin-top: $space-xl;
 }
 
 .search-results-filter-row {
diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss
index 173ab1a3935..c5e6bc5efa6 100644
--- a/public/sass/components/_dashboard_settings.scss
+++ b/public/sass/components/_dashboard_settings.scss
@@ -60,7 +60,7 @@
   color: $text-muted;
   font-style: italic;
   position: relative;
-  top: -1.5rem;
+  top: -$space-lg;
 }
 
 .dashboard-settings__nav-item {
diff --git a/public/sass/components/_dropdown.scss b/public/sass/components/_dropdown.scss
index 7ad75644d5c..0c7426d5104 100644
--- a/public/sass/components/_dropdown.scss
+++ b/public/sass/components/_dropdown.scss
@@ -66,8 +66,8 @@
   }
 
   .divider {
-    height: 0.1rem;
-    margin: 0.5rem 0; // 8px 1px
+    height: 1px;
+    margin: $space-sm 0; // 8px 1px
     overflow: hidden;
     background-color: $dropdownDividerTop;
     border-bottom: 1px solid $dropdownDividerBottom;
@@ -314,7 +314,7 @@
 
   &::before {
     font-family: FontAwesome;
-    width: 2rem;
+    width: 28px;
     display: inline-block;
     text-align: center;
     content: '\f11c';
diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss
index eef101c98b4..4f026a1fd95 100644
--- a/public/sass/components/_navbar.scss
+++ b/public/sass/components/_navbar.scss
@@ -66,10 +66,6 @@
     padding-left: 6px;
   }
 
-  &--search {
-    padding: 1rem 1.5rem 0.75rem 1.5rem;
-  }
-
   .gicon {
     top: -2px;
     position: relative;
diff --git a/public/sass/components/_query_editor.scss b/public/sass/components/_query_editor.scss
index 676b3cd5407..08b4eefabf8 100644
--- a/public/sass/components/_query_editor.scss
+++ b/public/sass/components/_query_editor.scss
@@ -42,7 +42,7 @@
 }
 
 input[type='text'].tight-form-func-param {
-  font-size: 0.875rem;
+  font-size: $font-size-sm;
   background: transparent;
   border: none;
   margin: 0;
@@ -87,7 +87,7 @@ input[type='text'].tight-form-func-param {
 
 .rst-unknown.rst-directive {
   font-family: monospace;
-  margin-bottom: 1rem;
+  margin-bottom: $space-md;
 }
 
 .rst-interpreted_text {
@@ -96,8 +96,8 @@ input[type='text'].tight-form-func-param {
 }
 
 .rst-bullet-list {
-  padding-left: 1.5rem;
-  margin-bottom: 1rem;
+  padding-left: $space-lg;
+  margin-bottom: $space-md;
 }
 
 .rst-paragraph:last-child {
@@ -105,7 +105,7 @@ input[type='text'].tight-form-func-param {
 }
 
 .drop-element.drop-popover.drop-function-def .drop-content {
-  max-width: 30rem;
+  max-width: 416px;
 }
 
 .rst-literal-block .rst-text {
diff --git a/public/sass/pages/_login.scss b/public/sass/pages/_login.scss
index 32fcdd54808..fb496f54579 100644
--- a/public/sass/pages/_login.scss
+++ b/public/sass/pages/_login.scss
@@ -43,11 +43,11 @@ select:-webkit-autofill:focus {
   flex-direction: column;
   width: 100%;
   align-items: center;
-  margin-bottom: 1rem;
+  margin-bottom: $space-md;
 }
 
 .login-form {
-  margin-bottom: 1rem;
+  margin-bottom: $space-md;
   width: 100%;
 }
 
@@ -69,13 +69,13 @@ select:-webkit-autofill:focus {
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  margin-top: 0.5rem;
+  margin-top: $space-sm;
 
   &--right {
     justify-content: flex-end;
 
     & .btn {
-      margin-left: 1rem;
+      margin-left: $space-md;
     }
   }
   & .btn-inverse {
@@ -90,7 +90,7 @@ select:-webkit-autofill:focus {
 }
 
 .login-button-forgot-password {
-  padding-top: 1rem;
+  padding-top: $space-md;
 }
 
 .login-text {
@@ -117,7 +117,7 @@ select:-webkit-autofill:focus {
   align-items: center;
   justify-content: center;
   flex-grow: 0;
-  padding-top: 2rem;
+  padding-top: $space-xl;
 
   .logo-icon {
     width: 70px;
@@ -150,7 +150,7 @@ select:-webkit-autofill:focus {
 
 .login-inner-box {
   text-align: center;
-  padding: 2rem;
+  padding: $space-xl;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -177,7 +177,7 @@ select:-webkit-autofill:focus {
 }
 
 .login-change-password-info {
-  padding-bottom: 1.5rem;
+  padding-bottom: $space-lg;
 
   & h5 {
     text-align: left;
@@ -229,7 +229,7 @@ select:-webkit-autofill:focus {
 .login-divider {
   float: left;
   width: 100%;
-  margin: 0 25% 1rem 25%;
+  margin: 0 25% $space-md 25%;
   display: flex;
   justify-content: space-between;
 
@@ -251,7 +251,7 @@ select:-webkit-autofill:focus {
   align-items: center;
   justify-content: flex-end;
   width: 100%;
-  margin-top: 1rem;
+  margin-top: $space-md;
 }
 
 .login-signup-title {
@@ -262,7 +262,7 @@ select:-webkit-autofill:focus {
 
 .login-btn {
   width: 100%;
-  margin: 0 0 1rem;
+  margin: 0 0 $space-md;
 }
 
 .signup-page-background {
@@ -307,7 +307,7 @@ select:-webkit-autofill:focus {
 
 @include media-breakpoint-up(sm) {
   .login-branding {
-    padding: 1rem;
+    padding: $space-md;
 
     .logo-icon {
       width: 80px;
@@ -329,7 +329,7 @@ select:-webkit-autofill:focus {
 
   .login-branding {
     width: 45%;
-    padding: 2rem;
+    padding: $space-xl;
     flex-grow: 1;
     border-right: 1px solid $login-border;
 
@@ -340,7 +340,7 @@ select:-webkit-autofill:focus {
 
   .login-inner-box {
     width: 55%;
-    padding: 1rem 4rem;
+    padding: $space-md 56px;
   }
 
   .login-button-group {