From 615a6ec152a4535531a5cf46b7d6489d73060d62 Mon Sep 17 00:00:00 2001 From: bradleyrichter Date: Sat, 3 Dec 2016 12:49:45 -0800 Subject: [PATCH] these edits ad 2 px to our tab height - this adds some needed space above and below the text string - increases tab text to 12 on mac (already 12 on windows) - tabs buttons adjusted to align properly auditors: @bbondy @bsclifton --- less/button.less | 6 +++--- less/navigationBar.less | 4 ++-- less/tabs.less | 13 ++++++------- less/variables.less | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/less/button.less b/less/button.less index 24fee407520..a81f574825a 100644 --- a/less/button.less +++ b/less/button.less @@ -22,8 +22,8 @@ span.buttonSeparator { background-color: @buttonColor; display: inline-block; width: 20px; - height: 12px; - margin: 8px 4px 0 0; + height: 13px; + margin: 9px 4px 0 0; cursor: default; -webkit-mask-image: url('../img/toolbar/menu_btn.svg'); -webkit-mask-repeat: no-repeat; @@ -68,7 +68,7 @@ span.buttonSeparator { line-height: 18px; width: 18px; height: 18px; - font-size: 12px; + font-size: 24px; } &.primaryButton, diff --git a/less/navigationBar.less b/less/navigationBar.less index bcca10715d0..68e0eba49fa 100644 --- a/less/navigationBar.less +++ b/less/navigationBar.less @@ -886,8 +886,8 @@ &.fa-lock, &.fa-unlock { - margin-top: 1px; - font-size: 16px; + margin-top: 2px; + font-size: 15px; min-height: 10px; min-width: 16px; } diff --git a/less/tabs.less b/less/tabs.less index 44e1e4c7c7e..3510dab68c1 100644 --- a/less/tabs.less +++ b/less/tabs.less @@ -53,8 +53,8 @@ .newFrameButton { background: @buttonColor; - width: 14px; - height: 24px; + width: 15px; + height: 26px; line-height: 24px; -webkit-mask-image: url('../img/toolbar/newtab_btn.svg'); -webkit-mask-repeat: no-repeat; @@ -69,14 +69,13 @@ } .tab { - // background: rgba(222, 222, 222, 0.6); background: linear-gradient(to bottom, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1)); border-radius: @borderRadiusTabs @borderRadiusTabs 0px 0px; border-width: 1px 1px 0; box-sizing: border-box; color: #3B3B3B; display: flex; - height: 22px; + height: 23px; margin-top: 2px; transition: transform 200ms ease; left: 0; @@ -92,7 +91,7 @@ -webkit-user-select: none; box-sizing: border-box; display: inline-block; - font-size: 11.5px; + font-size: 12px; overflow: hidden; text-overflow: ellipsis; line-height: 16px; @@ -142,7 +141,7 @@ &.active { background: linear-gradient(to bottom, white, @chromePrimary, ); - height: 24px; + height: 25px; margin-top: 1px; box-shadow: inset 1px 1px 2px 0px white; box-shadow: 0px -1px 4px 0px rgba(51, 51, 51, 0.12); @@ -347,7 +346,7 @@ line-height: 19px !important; text-align: center; vertical-align: top; - margin-top: 2px; + margin-top: 4px; margin-left: -5px; margin-right: -5px; width: 30px; diff --git a/less/variables.less b/less/variables.less index a7114829770..2ad62fca8de 100644 --- a/less/variables.less +++ b/less/variables.less @@ -38,7 +38,7 @@ @contextMenuFontSize: 14px; @audioColor: @highlightBlue; @focusUrlbarOutline: @highlightBlue; -@siteSecureColor: @highlightBlue; +@siteSecureColor: @buttonColor; @siteInsecureColor: #C63626; @siteEVColor: green; @loadTimeColor: @highlightBlue; @@ -69,7 +69,7 @@ @navbarHeight: 36px; @downloadsBarHeight: 50px; -@tabsToolbarHeight: 26px; +@tabsToolbarHeight: 28px; @tabPagesHeight: 9px; @bookmarksToolbarHeight: 24px; @bookmarksToolbarWithFaviconsHeight: 28px;