diff --git a/app/assets/stylesheets/app/_header.scss b/app/assets/stylesheets/app/_header.scss index cbb1ea55c..82df61883 100644 --- a/app/assets/stylesheets/app/_header.scss +++ b/app/assets/stylesheets/app/_header.scss @@ -1,13 +1,13 @@ .header { position: relative; width: 100%; - background-color: #f1f1f1; + background-color: #d8d7d9; height: $header-height; max-height: $header-height; z-index: 100; font-size: 10px; color: $dark-gray; - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid rgba(#979799, 0.4); a { color: $dark-gray; @@ -32,12 +32,12 @@ .menu { // float: right; margin-left: 15px; - padding-top: 9px; + padding-top: 5px; margin-top: 0px; - color: black; + color: #515263; z-index: 1000; margin-bottom: 0px; - font-size: 12px; + font-size: 11px; .login-panel .login-input { border-radius: 0px; @@ -54,7 +54,7 @@ font-weight: bold; a { - color: $dark-gray; + color: #515263; } .panel { diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index 200005d36..cdbf37d9f 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -101,7 +101,7 @@ p { min-width: 900px; } -$header-height: 35px; +$header-height: 25px; .app-container { display: table; @@ -171,9 +171,9 @@ $section-header-height: 70px; > .add-button { float: right; - font-size: 22px; - width: 30px; - height: 30px; + font-size: 18px; + width: 45px; + height: 24px; cursor: pointer; background-color: #e9e9e9; border-radius: 4px; diff --git a/app/assets/templates/frontend/header.html.haml b/app/assets/templates/frontend/header.html.haml index 59b4d0d9b..3c2b00260 100644 --- a/app/assets/templates/frontend/header.html.haml +++ b/app/assets/templates/frontend/header.html.haml @@ -86,5 +86,5 @@ %a{"ng-click" => "ctrl.signOutPressed()"} Sign Out .item - %a.menuItem{"href" => "https://standardnotes.org", "target" => "_blank"} + %a{"href" => "https://standardnotes.org", "target" => "_blank"} Help diff --git a/app/assets/templates/frontend/home.html.haml b/app/assets/templates/frontend/home.html.haml index 532f806ee..59445363d 100644 --- a/app/assets/templates/frontend/home.html.haml +++ b/app/assets/templates/frontend/home.html.haml @@ -1,5 +1,4 @@ .main-ui-view - %header{"user" => "defaultUser", "logout" => "headerLogout"} .app-container .app %tags-section{"save" => "tagsSave", "add-new" => "tagsAddNew", "will-select" => "tagsWillMakeSelection", "selection-made" => "tagsSelectionMade", "all-tag" => "allTag", @@ -10,3 +9,4 @@ %editor-section{"ng-if" => "selectedNote", "note" => "selectedNote", "remove" => "deleteNote", "user" => "defaultUser", "save" => "saveNote"} + %header{"user" => "defaultUser", "logout" => "headerLogout"}