From 66d8992687483c7b77f09e5b8c69c9ce1a403d0e Mon Sep 17 00:00:00 2001 From: Victor Porof Date: Thu, 29 Aug 2013 09:24:21 +0200 Subject: [PATCH] Bug 910595 - Make sure the Side Menu Widget "item" does not affect the positioning of the child "item-contents", r=fitzgen --- browser/themes/linux/devtools/debugger.css | 7 +--- browser/themes/linux/devtools/netmonitor.css | 4 -- browser/themes/linux/devtools/widgets.css | 37 ++++++------------- browser/themes/osx/devtools/debugger.css | 7 +--- browser/themes/osx/devtools/netmonitor.css | 4 -- browser/themes/osx/devtools/widgets.css | 37 ++++++------------- browser/themes/windows/devtools/debugger.css | 7 +--- .../themes/windows/devtools/netmonitor.css | 4 -- browser/themes/windows/devtools/widgets.css | 37 ++++++------------- 9 files changed, 39 insertions(+), 105 deletions(-) diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css index 5b2c8f5fac9b..be950914858e 100644 --- a/browser/themes/linux/devtools/debugger.css +++ b/browser/themes/linux/devtools/debugger.css @@ -18,12 +18,9 @@ } .side-menu-widget-item-checkbox { - -moz-appearance: none; + -moz-appearance: none; + -moz-margin-end: -6px; padding: 0; - margin-top: 4px; - margin-bottom: -4px; - -moz-margin-start: 4px; - -moz-margin-end: -4px; opacity: 0; transition: opacity .15s ease 0s; } diff --git a/browser/themes/linux/devtools/netmonitor.css b/browser/themes/linux/devtools/netmonitor.css index 4cf2604a945d..7c18da94d43c 100644 --- a/browser/themes/linux/devtools/netmonitor.css +++ b/browser/themes/linux/devtools/netmonitor.css @@ -316,10 +316,6 @@ box.requests-menu-status[code^="5"] { background: rgba(255,255,255,0.05); } -.side-menu-widget-item-contents { - padding: 0; -} - /* Network request details */ #details-pane { diff --git a/browser/themes/linux/devtools/widgets.css b/browser/themes/linux/devtools/widgets.css index 2478253d55b2..dbc41973b659 100644 --- a/browser/themes/linux/devtools/widgets.css +++ b/browser/themes/linux/devtools/widgets.css @@ -304,19 +304,20 @@ } .side-menu-widget-item { - border-top: 1px solid hsla(210,16%,76%,.1); - border-bottom: 1px solid hsla(210,8%,5%,.25); + border-top: 1px solid hsla(210,8%,5%,.25); + border-bottom: 1px solid hsla(210,16%,76%,.1); + margin-top: -1px; + margin-bottom: -1px; cursor: pointer; } .side-menu-widget-item:last-of-type { - box-shadow: 0 1px 0 hsla(210,16%,76%,.1); + box-shadow: inset 0 -1px 0 hsla(210,8%,5%,.25); } .side-menu-widget-item.selected { background: linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%)) repeat-x top left !important; - box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15), - inset 0 -1px 0 hsla(210,40%,83%,.05); + box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15); } .side-menu-widget-item.selected > .side-menu-widget-item-arrow { @@ -334,21 +335,14 @@ background-position: center left, top left; } -.side-menu-widget-item-arrow { - -moz-margin-start: -8px; - width: 8px; -} - -.side-menu-widget-item-contents { +.side-menu-widget-item-label { padding: 4px 0px; -} - -.side-menu-widget-item label { cursor: inherit; } -.side-menu-widget-item-other:first-of-type { - border-top-left-radius: 4px; +.side-menu-widget-item-arrow { + -moz-margin-start: -8px; + width: 8px; } .side-menu-widget-item-other { @@ -361,17 +355,8 @@ inset 0 -1px 0 hsla(210,40%,83%,.07); } -.side-menu-widget-item.selected .side-menu-widget-item-other:first-of-type { - border-top: 1px dotted #333; - margin-top: 3px; -} - .side-menu-widget-item-other:first-of-type { - margin-top: 4px; -} - -.side-menu-widget-item-other:last-of-type { - margin-bottom: -4px; + border-top-left-radius: 4px; } .side-menu-widget-item-other > label { diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css index 3475aa2b4865..21879347b56b 100644 --- a/browser/themes/osx/devtools/debugger.css +++ b/browser/themes/osx/devtools/debugger.css @@ -20,12 +20,9 @@ } .side-menu-widget-item-checkbox { - -moz-appearance: none; + -moz-appearance: none; + -moz-margin-end: -6px; padding: 0; - margin-top: 4px; - margin-bottom: -4px; - -moz-margin-start: 4px; - -moz-margin-end: -4px; opacity: 0; transition: opacity .15s ease-out 0s; } diff --git a/browser/themes/osx/devtools/netmonitor.css b/browser/themes/osx/devtools/netmonitor.css index 1192e84eb0e1..1e9460b06000 100644 --- a/browser/themes/osx/devtools/netmonitor.css +++ b/browser/themes/osx/devtools/netmonitor.css @@ -316,10 +316,6 @@ box.requests-menu-status[code^="5"] { background: rgba(255,255,255,0.05); } -.side-menu-widget-item-contents { - padding: 0; -} - /* Network request details */ #details-pane { diff --git a/browser/themes/osx/devtools/widgets.css b/browser/themes/osx/devtools/widgets.css index 41c38988760b..15f02ceb2439 100644 --- a/browser/themes/osx/devtools/widgets.css +++ b/browser/themes/osx/devtools/widgets.css @@ -304,19 +304,20 @@ } .side-menu-widget-item { - border-top: 1px solid hsla(210,16%,76%,.1); - border-bottom: 1px solid hsla(210,8%,5%,.25); + border-top: 1px solid hsla(210,8%,5%,.25); + border-bottom: 1px solid hsla(210,16%,76%,.1); + margin-top: -1px; + margin-bottom: -1px; cursor: pointer; } .side-menu-widget-item:last-of-type { - box-shadow: 0 1px 0 hsla(210,16%,76%,.1); + box-shadow: inset 0 -1px 0 hsla(210,8%,5%,.25); } .side-menu-widget-item.selected { background: linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%)) repeat-x top left !important; - box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15), - inset 0 -1px 0 hsla(210,40%,83%,.05); + box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15); } .side-menu-widget-item.selected > .side-menu-widget-item-arrow { @@ -334,21 +335,14 @@ background-position: center left, top left; } -.side-menu-widget-item-arrow { - -moz-margin-start: -8px; - width: 8px; -} - -.side-menu-widget-item-contents { +.side-menu-widget-item-label { padding: 4px 0px; -} - -.side-menu-widget-item label { cursor: inherit; } -.side-menu-widget-item-other:first-of-type { - border-top-left-radius: 4px; +.side-menu-widget-item-arrow { + -moz-margin-start: -8px; + width: 8px; } .side-menu-widget-item-other { @@ -361,17 +355,8 @@ inset 0 -1px 0 hsla(210,40%,83%,.07); } -.side-menu-widget-item.selected .side-menu-widget-item-other:first-of-type { - border-top: 1px dotted #333; - margin-top: 3px; -} - .side-menu-widget-item-other:first-of-type { - margin-top: 4px; -} - -.side-menu-widget-item-other:last-of-type { - margin-bottom: -4px; + border-top-left-radius: 4px; } .side-menu-widget-item-other > label { diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css index 748c2d671f2e..16f6d7cf9d03 100644 --- a/browser/themes/windows/devtools/debugger.css +++ b/browser/themes/windows/devtools/debugger.css @@ -18,12 +18,9 @@ } .side-menu-widget-item-checkbox { - -moz-appearance: none; + -moz-appearance: none; + -moz-margin-end: -6px; padding: 0; - margin-top: 4px; - margin-bottom: -4px; - -moz-margin-start: 4px; - -moz-margin-end: -4px; opacity: 0; transition: opacity .15s ease 0s; } diff --git a/browser/themes/windows/devtools/netmonitor.css b/browser/themes/windows/devtools/netmonitor.css index 422515d73051..694c0fd8c70e 100644 --- a/browser/themes/windows/devtools/netmonitor.css +++ b/browser/themes/windows/devtools/netmonitor.css @@ -316,10 +316,6 @@ box.requests-menu-status[code^="5"] { background: rgba(255,255,255,0.05); } -.side-menu-widget-item-contents { - padding: 0; -} - /* Network request details */ #details-pane { diff --git a/browser/themes/windows/devtools/widgets.css b/browser/themes/windows/devtools/widgets.css index c23f97bd135a..07ebbf634c11 100644 --- a/browser/themes/windows/devtools/widgets.css +++ b/browser/themes/windows/devtools/widgets.css @@ -308,19 +308,20 @@ } .side-menu-widget-item { - border-top: 1px solid hsla(210,16%,76%,.1); - border-bottom: 1px solid hsla(210,8%,5%,.25); + border-top: 1px solid hsla(210,8%,5%,.25); + border-bottom: 1px solid hsla(210,16%,76%,.1); + margin-top: -1px; + margin-bottom: -1px; cursor: pointer; } .side-menu-widget-item:last-of-type { - box-shadow: 0 1px 0 hsla(210,16%,76%,.1); + box-shadow: inset 0 -1px 0 hsla(210,8%,5%,.25); } .side-menu-widget-item.selected { background: linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%)) repeat-x top left !important; - box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15), - inset 0 -1px 0 hsla(210,40%,83%,.05); + box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15); } .side-menu-widget-item.selected > .side-menu-widget-item-arrow { @@ -338,21 +339,14 @@ background-position: center left, top left; } -.side-menu-widget-item-arrow { - -moz-margin-start: -8px; - width: 8px; -} - -.side-menu-widget-item-contents { +.side-menu-widget-item-label { padding: 4px 0px; -} - -.side-menu-widget-item label { cursor: inherit; } -.side-menu-widget-item-other:first-of-type { - border-top-left-radius: 4px; +.side-menu-widget-item-arrow { + -moz-margin-start: -8px; + width: 8px; } .side-menu-widget-item-other { @@ -365,17 +359,8 @@ inset 0 -1px 0 hsla(210,40%,83%,.07); } -.side-menu-widget-item.selected .side-menu-widget-item-other:first-of-type { - border-top: 1px dotted #333; - margin-top: 3px; -} - .side-menu-widget-item-other:first-of-type { - margin-top: 4px; -} - -.side-menu-widget-item-other:last-of-type { - margin-bottom: -4px; + border-top-left-radius: 4px; } .side-menu-widget-item-other > label {