Bug 1280177 - fix titlebar button position in devedition, r=mstange
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 15 Jun 2016 12:42:53 +0100
changeset 379733 61b7d2351dd2ed50789df8aed472ee0af1e06829
parent 379627 13bdb28018357af151edadbb3f76a474ff00ec07
child 379734 6ba1398db335a3175b08cb26ebb499544e30171a
child 379789 7cabb118ec94ce02241f94c2ef7d94055837482e
child 379837 451007ea3f85bff438193197dcf0a75fd63d3d1a
child 380008 d3b019543a55c97430848e550659a2ac2024669b
child 380010 f0a174c154576a638632e666009970e161d43b12
child 380091 2b06b2dc63e3ad4c0ac34263c2e4cbea28a1091c
push id21042
push userbechen@mozilla.com
push dateFri, 17 Jun 2016 09:22:30 +0000
reviewersmstange
bugs1280177
milestone50.0a1
Bug 1280177 - fix titlebar button position in devedition, r=mstange MozReview-Commit-ID: 5lTpdW38gOL
browser/themes/osx/devedition.css
--- a/browser/themes/osx/devedition.css
+++ b/browser/themes/osx/devedition.css
@@ -27,16 +27,26 @@
 }
 
 /* Resize things so that the native titlebar is in line with the tabs */
 #main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
 #main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
   margin-top: 6px;
 }
 
+/* In private windows, the #titlebar-content is higher because of the
+ * private browsing indicator. With the margin-top the titlebar buttons
+ * align to the top correctly in that case, but only if we don't stretch
+ * the box they're in because the container is too high, so we override
+ * the default alignment value (stretch).
+ */
+#main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-buttonbox-container {
+  -moz-box-align: start;
+}
+
 /* Square back and forward buttons.  Need !important on these because there
    are a lot of more specific selectors sprinkled around elsewhere for changing
    background / shadows for different states */
 #back-button,
 #forward-button {
   height: 24px !important;
   box-shadow: none !important;
   border: 1px solid var(--chrome-nav-bar-controls-border-color) !important;