Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Fixed shadowing, colors, alignments on mac
Browse files Browse the repository at this point in the history
Also, style fix for find bar

Fixes #5317

Auditors: @bbondy
  • Loading branch information
bradleyrichter authored and bbondy committed Nov 2, 2016
1 parent 6697ff7 commit 5f7193b
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 16 deletions.
2 changes: 1 addition & 1 deletion less/button.less
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ span.browserButton,
font-size: 0px;
width: 24px;
height: 100%;
opacity: 0.5;
opacity: 0.65;
background: url('../img/icon_new_frame.svg') 50% 20% scroll / 20px no-repeat;
&:hover {
opacity: 0.8;
Expand Down
2 changes: 1 addition & 1 deletion less/navigationBar.less
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
// Styles had to be reworked to properly position the new caption buttons for Windows
.navbarCaptionButtonContainer {
display: flex;
border-bottom: 1px solid #aaaaaa;
border-bottom: 1px solid #bbb;

&.allowDragging {
-webkit-app-region: drag;
Expand Down
25 changes: 15 additions & 10 deletions less/tabs.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
@import "variables.less";

.tabs {
background: @tabsBackground;
box-sizing: border-box;
display: flex;
flex: 1;
overflow: auto;
padding: 0 4px 0 0;
height: @tabsToolbarHeight;
margin-top: 2px;
position: relative;
white-space: nowrap;
z-index: @zindexTabs;
Expand Down Expand Up @@ -42,22 +42,23 @@
}

.tab {
background: rgba(222, 222, 222, 0.6);
// 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;
margin: 0;
margin-top: 2px;
transition: transform 200ms ease;
left: 0;
opacity: 1.0;
padding: 0;
width: 100%;
align-items: center;
justify-content: center;
border: 1px solid @chromeTertiary;
border: 1px solid rgba(0, 0, 0, 0.0);
border-bottom: 1px;

.tabTitle {
Expand Down Expand Up @@ -115,7 +116,7 @@
&.active {
background: linear-gradient(to bottom, white, @chromePrimary, );
height: 24px;
margin-top: -1px;
margin-top: 1px;
box-shadow: inset 1px 1px 2px 0px white;
box-shadow: 0px -1px 4px 0px rgba(51, 51, 51, 0.12);
border: 1px solid #bbb;
Expand All @@ -141,7 +142,7 @@
}

&:not(.active):hover {
background: linear-gradient(to bottom, white, @chromePrimary);
background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), rgba(250, 250, 250, 0.4), );
&.private {
background: lighten(@privateTabBackground, 20%);
}
Expand Down Expand Up @@ -176,7 +177,7 @@
.tabArea {
box-sizing: border-box;
display: inline-block;
padding: 0 2px 0 0;
padding: 0 4px 0 0;
position: relative;
vertical-align: top;
overflow: hidden;
Expand Down Expand Up @@ -242,6 +243,7 @@
background: @tabsBackground;
display: flex;
height: @tabsToolbarHeight;
// margin-top: 2px;
-webkit-user-select: none;
}

Expand All @@ -250,7 +252,7 @@
padding-right: 2px;
.browserButton {
display: inline-block;
line-height: 20px;
line-height: 26px;
}
}

Expand All @@ -270,11 +272,12 @@
}

&.singlePage {
height: 3px;
height: 1px;
}

>div {
display: flex
// margin-top: 4px;
}
}

Expand All @@ -286,6 +289,7 @@
box-sizing: border-box;
display: inline-block;
margin: auto 2.5px;
margin-top: 3px;
height: 6px;
width: 36px;
vertical-align: middle;
Expand Down Expand Up @@ -313,7 +317,7 @@
color: #a0a0a0;
font-size: 21px !important;
height: 20px;
line-height: 17px !important;
line-height: 19px !important;
text-align: center;
vertical-align: top;
margin-top: 2px;
Expand Down Expand Up @@ -346,6 +350,7 @@

.pinnedTabs {
margin-left: 9px;
margin-top: 2px;
}

.segmentedControl {
Expand Down
6 changes: 3 additions & 3 deletions less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@chromeTertiary: #c7c7c7;
@chromeText: #555555;

@tabsBackground: #d9d9d9;
@tabsBackground: #dddddd;
@navigationBarBackground: @chromeSecondary;
@navigationBarBackground: white;
@chromeBorderColor: @chromePrimary;
Expand Down Expand Up @@ -66,8 +66,8 @@

@navbarHeight: 36px;
@downloadsBarHeight: 50px;
@tabsToolbarHeight: 23px;
@tabPagesHeight: 12px;
@tabsToolbarHeight: 26px;
@tabPagesHeight: 9px;
@bookmarksToolbarHeight: 24px;
@bookmarksToolbarWithFaviconsHeight: 28px;
@bookmarksFileIconSize: 13px;
Expand Down
2 changes: 1 addition & 1 deletion less/window.less
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ html,
}

.top {
background: linear-gradient(to bottom, white, @chromeSecondary, );
background: linear-gradient(to bottom, #fbfbfb, #ededed, );
}

.mainContainer {
Expand Down

0 comments on commit 5f7193b

Please sign in to comment.