From 5cffe342316aada1d0be2907475f1713ef9461b8 Mon Sep 17 00:00:00 2001 From: Zhiting Lin Date: Wed, 18 Apr 2018 13:57:37 +0800 Subject: [PATCH] Change the font size accordingly --- .../app/components/Navigation/Navigation.scss | 29 +++++++++++++--------- .../components/KeyValueTable/KeyValueTable.scss | 2 +- static/styles/_body.scss | 9 +++++++ static/styles/_bootstrap-overrides.scss | 1 + 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/features/app/components/Navigation/Navigation.scss b/src/features/app/components/Navigation/Navigation.scss index 4b8214c..7afac4f 100644 --- a/src/features/app/components/Navigation/Navigation.scss +++ b/src/features/app/components/Navigation/Navigation.scss @@ -5,9 +5,6 @@ } .main { - position: relative; - min-height: 580px; - height: calc(100% - 75px); a { display: block; padding: 1px 0; @@ -50,9 +47,25 @@ .navigationTitle { color: $highlight-inverse-color; - font-size: $font-size-caps; + //font-size: $font-size-caps; text-transform: uppercase; padding: 3px 0; + font-size: $font-size-chrome; + + transform:scale(0.916); + transform-origin-x: 0%; + + -ms-transform:scale(0.916); + -ms-transform-origin-x: 0%; + + -moz-transform:scale(0.916); + -moz-transform-origin-x: 0%; + + -o-transform:scale(0.916); + -o-transform-origin-x: 0%; + + -webkit-transform: scale(0.916); + -webkit-transform-origin-x: 0%; } .activeIcon { @@ -75,11 +88,3 @@ } } -.networkStatus{ - position: absolute; - bottom: 0px; -} - -.networkWord{ - color: $brand-warning; -} diff --git a/src/features/shared/components/KeyValueTable/KeyValueTable.scss b/src/features/shared/components/KeyValueTable/KeyValueTable.scss index 0c1404c..9c2a4d1 100644 --- a/src/features/shared/components/KeyValueTable/KeyValueTable.scss +++ b/src/features/shared/components/KeyValueTable/KeyValueTable.scss @@ -40,7 +40,7 @@ background: $background-color; border-right: 1px solid $border-color; color: $text-strong-color; - font-weight: bold; + font-weight: 600; width: 200px; font-size: $font-size-base; font-family: Nitti Grotesk; diff --git a/static/styles/_body.scss b/static/styles/_body.scss index ec6ffb3..7523461 100644 --- a/static/styles/_body.scss +++ b/static/styles/_body.scss @@ -61,6 +61,14 @@ p { margin-bottom: $grid-gutter-width/2; } +label{ + font-weight: 500; +} + +b, strong{ + font-weight: 600; +} + .flex-container { display: flex; flex-direction: column; @@ -146,3 +154,4 @@ a:focus { font-weight: normal; } + diff --git a/static/styles/_bootstrap-overrides.scss b/static/styles/_bootstrap-overrides.scss index 7e98a50..e667579 100644 --- a/static/styles/_bootstrap-overrides.scss +++ b/static/styles/_bootstrap-overrides.scss @@ -1,6 +1,7 @@ $grid-gutter-width: 30px; $font-size-caps: 11px; +$font-size-chrome: 12px; $font-size-base: 13px; $font-size-code: $font-size-base; $font-size-nav: 14px; -- 2.11.0