From f29d42e2f78a9c9cb9d2baabc0ff263519eee0c0 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Mon, 21 Aug 2017 13:41:24 -0500 Subject: [PATCH] Revert "admin design" This reverts commit 23e38f2 --- public/assets/admin/sass/paper/_misc.scss | 2 +- public/assets/admin/sass/paper/_navbars.scss | 17 +++++++---------- public/assets/admin/sass/paper/_responsive.scss | 4 ++-- .../sass/paper/_sidebar-and-main-panel.scss | 11 ++++------- public/assets/admin/sass/paper/_variables.scss | 5 ++--- .../admin/sass/paper/mixins/_sidebar.scss | 2 +- 6 files changed, 17 insertions(+), 24 deletions(-) diff --git a/public/assets/admin/sass/paper/_misc.scss b/public/assets/admin/sass/paper/_misc.scss index 0c2e5410..3482539d 100755 --- a/public/assets/admin/sass/paper/_misc.scss +++ b/public/assets/admin/sass/paper/_misc.scss @@ -2,7 +2,7 @@ body{ color: $font-color; font-size: $font-size-base; - font-family: "Roboto","Helvetica Neue",Arial,sans-serif; //'Muli', Arial, sans-serif; + font-family: 'Muli', Arial, sans-serif; .wrapper{ min-height: 100vh; position: relative; diff --git a/public/assets/admin/sass/paper/_navbars.scss b/public/assets/admin/sass/paper/_navbars.scss index 71d06c02..9120910d 100644 --- a/public/assets/admin/sass/paper/_navbars.scss +++ b/public/assets/admin/sass/paper/_navbars.scss @@ -15,27 +15,24 @@ .navbar-brand{ color: $white-color; font-weight: $font-weight-light;; - /*margin: $navbar-margin-brand; - padding: $navbar-padding-brand;*/ + margin: $navbar-margin-brand; + padding: $navbar-padding-brand; font-size: $font-size-large-navbar; } .navbar-nav{ > li > a { line-height: 1.42857; - /*margin: $navbar-margin-a; - padding: $navbar-padding-a;*/ + margin: $navbar-margin-a; + padding: $navbar-padding-a; - padding-top: 12px; - font-weight: $font-weight-light; - - i, p { + i, + p{ display: inline-block; margin: 0; } - i { + i{ position: relative; top: 1px; - margin-right: 3px; } } > li > a.btn{ diff --git a/public/assets/admin/sass/paper/_responsive.scss b/public/assets/admin/sass/paper/_responsive.scss index 84b79f21..a22fc237 100644 --- a/public/assets/admin/sass/paper/_responsive.scss +++ b/public/assets/admin/sass/paper/_responsive.scss @@ -1,6 +1,6 @@ @media (min-width: 992px){ .navbar{ - height: 30px; + min-height: 75px; } .navbar-form { margin-top: 21px; @@ -53,7 +53,7 @@ .navbar{ .navbar-header{ - //margin-left: 10px; + margin-left: 10px; } } diff --git a/public/assets/admin/sass/paper/_sidebar-and-main-panel.scss b/public/assets/admin/sass/paper/_sidebar-and-main-panel.scss index 6af76994..b7614d31 100755 --- a/public/assets/admin/sass/paper/_sidebar-and-main-panel.scss +++ b/public/assets/admin/sass/paper/_sidebar-and-main-panel.scss @@ -35,13 +35,10 @@ font-weight: 200; .logo{ - /*padding: 18px 0px; - margin: 0 20px;*/ - padding: 6px; - background: #067ec1; - text-align: center; + padding: 18px 0px; + margin: 0 20px; - p { + p{ float: left; font-size: 20px; margin: 10px 10px; @@ -60,7 +57,7 @@ } .nav{ - margin-top: 10px; + margin-top: 20px; li{ > a{ diff --git a/public/assets/admin/sass/paper/_variables.scss b/public/assets/admin/sass/paper/_variables.scss index e50b00c5..81b43036 100644 --- a/public/assets/admin/sass/paper/_variables.scss +++ b/public/assets/admin/sass/paper/_variables.scss @@ -24,9 +24,8 @@ $black-hr: #444444 !default; $white-background-color: #FFFFFF !default; //$black-background-color: #212120 !default; -$black-background-color: #1a2932 !default; -//$black-background-color: #0c1419 !default; - +//$black-background-color: #1a2932 !default; +$black-background-color: #0c1419 !default; $light-gray: #E3E3E3 !default; diff --git a/public/assets/admin/sass/paper/mixins/_sidebar.scss b/public/assets/admin/sass/paper/mixins/_sidebar.scss index 53b388e3..abb62c98 100644 --- a/public/assets/admin/sass/paper/mixins/_sidebar.scss +++ b/public/assets/admin/sass/paper/mixins/_sidebar.scss @@ -5,7 +5,7 @@ } .logo{ - //border-bottom: 1px solid rgba($font-color,.3); + border-bottom: 1px solid rgba($font-color,.3); p{ color: $font-color;