From 75c3009f839f94a19830673673f4b9ac25342633 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Mon, 4 Sep 2017 15:55:14 -0700 Subject: Fix header style; Address comments --- ui/app/css/itcss/components/account-dropdown.scss | 2 +- ui/app/css/itcss/components/header.scss | 26 ++++++++++++----------- ui/app/css/itcss/components/network.scss | 23 ++++++++++++++++---- ui/app/css/itcss/components/newui-sections.scss | 2 +- 4 files changed, 35 insertions(+), 18 deletions(-) (limited to 'ui/app/css/itcss') diff --git a/ui/app/css/itcss/components/account-dropdown.scss b/ui/app/css/itcss/components/account-dropdown.scss index 715f41dc9..1c4620e40 100644 --- a/ui/app/css/itcss/components/account-dropdown.scss +++ b/ui/app/css/itcss/components/account-dropdown.scss @@ -10,7 +10,7 @@ .account-dropdown-edit-button { color: $dusty-gray; font-family: "DIN OT"; - font-weight: 500; + &:hover { color: $white; } diff --git a/ui/app/css/itcss/components/header.scss b/ui/app/css/itcss/components/header.scss index bfa94134d..160476d58 100644 --- a/ui/app/css/itcss/components/header.scss +++ b/ui/app/css/itcss/components/header.scss @@ -2,11 +2,12 @@ align-items: center; visibility: visible; background: $gallery; - padding: 6px 8px; height: 14.4vh; max-height: 97px; position: relative; z-index: $header-z-index; + display: flex; + flex-flow: column nowrap; @media screen and (max-width: 575px) { position: fixed; @@ -19,13 +20,22 @@ .app-header-contents { display: flex; - justify-content: inherit; + justify-content: space-between; + flex-flow: row nowrap; width: 100%; + height: 6.9vh; @media screen and (min-width: 576px) { + width: 85vw; + } + + @media screen and (min-width: 769px) { width: 80vw; - margin-left: 10vw; - margin-bottom: 15px; + height: 6.9vh; + } + + @media screen and (min-width: 1281px) { + width: 65vw; } } @@ -47,18 +57,10 @@ h2.page-subtitle { display: flex; flex-direction: row; align-items: center; - - @media screen and (min-width: 576px) { - margin-bottom: 1.8em; - } } .left-menu-wrapper { display: flex; flex-direction: row; align-items: center; - - @media screen and (min-width: 576px) { - margin-bottom: 1.8em; - } } diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss index f242102af..8beef5e72 100644 --- a/ui/app/css/itcss/components/network.scss +++ b/ui/app/css/itcss/components/network.scss @@ -5,15 +5,30 @@ } .network-name { - width: 5.2em; - line-height: 9px; - text-rendering: geometricPrecision; + line-height: 12px; + padding: 0 4px; font-family: 'DIN OT'; font-size: 10px; flex: 1 0 auto; } -.network-name { +.network-droppo { + right: 2px; + + @media screen and (min-width: 576px) { + right: calc(((100% - 85vw) / 2) + 2px); + } + + @media screen and (min-width: 769px) { + right: calc(((100% - 80vw) / 2) + 2px); + } + + @media screen and (min-width: 1281px) { + right: calc(((100% - 65vw) / 2) + 2px); + } +} + +.network-name-item { font-weight: 100; flex: 1 0 auto; color: $dusty-gray; diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 288a3650d..5c5d16ef3 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -97,7 +97,7 @@ $wallet-view-bg: $wild-sand; } .main-container { - margin-top: 35px; + margin-top: 6.9vh; width: 85%; height: 90vh; box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); -- cgit