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

Commit

Permalink
Merge pull request #9282 from luixxiul/fix-urlbarForm-background
Browse files Browse the repository at this point in the history
Increase urlbarForm input height to the equal value as 'urlbarFormHeight'
  • Loading branch information
cezaraugusto authored Jun 15, 2017
2 parents dc534ed + 48e9b4e commit 6478bcd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
21 changes: 9 additions & 12 deletions less/navigationBar.less
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,6 @@
justify-content: center;
height: @urlbarFormHeight;
padding: 0 10px 0 3px;
background: @navigationBarBackgroundActive;
display: flex;
flex-grow: 1;
min-width: 0%; // allow the navigator to shrink
Expand All @@ -654,7 +653,6 @@
legend:before {
content: ' ';
position: absolute;
background: @navigationBarBackgroundActive;
border-radius: 0 4px 4px 0;
color: #333;
box-shadow: inset 0 0 0 1px @urlBarOutline, inset 0 0 0 3px @focusUrlbarOutline;
Expand All @@ -672,13 +670,17 @@
}

#navigator:not(.titleMode) & {
background: @navigationBarBackgroundActive;
border-radius: @borderRadiusURL;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
box-shadow: inset 0 0 0 1px rgba(187, 187, 187, 1.0);
color: @chromeText;

// #4922
// TODO: replace this value with a CSS variable to add a dark UI.
background: #fff;
}

@media (max-width: @breakpointNarrowViewport) {
max-width: 80%;
}
Expand Down Expand Up @@ -718,7 +720,7 @@
}

.urlbarForm {
&.noBorderRadius {
&.noBorderRadius {
border-radius: 0;

legend:before {
Expand Down Expand Up @@ -825,13 +827,11 @@
.urlbarForm {
.loadTime {
color: @loadTimeColor;
// background: @navigationBarBackground;
font-size: 12px;
text-align: right;
cursor: default;

&.onFocus {
background: @navigationBarBackgroundActive;
display: none;
}
}
Expand All @@ -842,7 +842,6 @@
}

.inputbar-wrapper {
//background: white;
display: flex;
flex: 1 1 0;
border-radius: 4px;
Expand All @@ -851,7 +850,6 @@
}

input {
background: @navigationBarBackgroundActive;
border: none;
box-sizing: border-box;
color: #333;
Expand All @@ -864,17 +862,16 @@
text-overflow: ellipsis;
min-width: 0%; // allow the navigator to shrink

&:hover {
background: @navigationBarBackgroundActive;
}
// #4922: make the whole .urlbarForm clickable
height: @urlbarFormHeight;
background: transparent;

&.private {
background: @privateTabBackground;
color: @chromeText;
}

&:focus {
background: @navigationBarBackgroundActive;
margin-right: 3px;
}
}
Expand Down
3 changes: 0 additions & 3 deletions less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
@tabsBackground: #ddd;
@tabsBackgroundInactive: #ddd;
@tabsToolbarBorderColor: #bbb;
@navigationBarBackground: @chromeSecondary;
@navigationBarBackground: #f7f7f7;
@navigationBarBackgroundActive: #fff;
@chromeBorderColor: @chromePrimary;
@chromeControlsBackground: #bbb;
@chromeControlsWarningBackground: @chromePrimary;
Expand Down

0 comments on commit 6478bcd

Please sign in to comment.