Bug 989701 - Set -moz-box-align:center for #urlbar-container and reduce the url bar's vertical margin in order to correctly align the urlbar-back-button-clip-path. r=mdeboer, a=sledru.
authorDão Gottwald <dao@mozilla.com>
Mon, 31 Mar 2014 21:22:51 +0200
changeset 191737 5f955bd6ff352afdc108e230824d9e9dfba1e991
parent 191736 45ed5edb396b6e844356453957d4b0f6be7b08ed
child 191738 0a773a23d68fdd9acebd50ec6e25907f96f3ae9c
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmdeboer, sledru
bugs989701
milestone30.0a2
Bug 989701 - Set -moz-box-align:center for #urlbar-container and reduce the url bar's vertical margin in order to correctly align the urlbar-back-button-clip-path. r=mdeboer, a=sledru.
browser/themes/linux/browser.css
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -864,16 +864,17 @@ toolbarbutton[sdk-button="true"][cui-are
 
 /* Location bar */
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
   padding: 1px;
   border: 1px solid ThreeDShadow;
   border-radius: 2px;
+  margin: 1px 3px;
 }
 
 #urlbar[focused],
 .searchbar-textbox[focused] {
   border-color: Highlight;
 }
 
 #urlbar {
@@ -889,18 +890,17 @@ toolbarbutton[sdk-button="true"][cui-are
   -moz-margin-start: 0;
 }
 
 .urlbar-history-dropmarker {
   -moz-appearance: toolbarbutton-dropdown;
 }
 
 #urlbar-container {
-  -moz-box-orient: horizontal;
-  -moz-box-align: stretch;
+  -moz-box-align: center;
 }
 
 @conditionalForwardWithUrlbar@ > #urlbar-wrapper {
   padding-left: @conditionalForwardWithUrlbarWidth@px;
   -moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
   position: relative;
   pointer-events: none;
 }
@@ -921,23 +921,20 @@ toolbarbutton[sdk-button="true"][cui-are
 }
 
 @conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
 @conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper {
-  /* Work with margin-top to align the clip-path correctly. */
-  margin-top: 5px;
   clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");
 }
 
 @conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar {
-  margin-top: -4px;
   margin-left: -@conditionalForwardWithUrlbarWidth@px;
 }
 
 @conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
   /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
   transition-delay: 100s;
 }