Chromium Code Reviews| Index: Source/devtools/front_end/ui/toolbar.css |
| diff --git a/Source/devtools/front_end/ui/toolbar.css b/Source/devtools/front_end/ui/toolbar.css |
| index 08b4f03dfbff22a3cc31de48b80f853e4fe1838c..669cbf686989c0c885d5516e5a243814e1f7d195 100644 |
| --- a/Source/devtools/front_end/ui/toolbar.css |
| +++ b/Source/devtools/front_end/ui/toolbar.css |
| @@ -6,12 +6,13 @@ |
| :host { |
| flex: none; |
| + padding: 0 2px; |
|
dgozman
2015/06/11 16:14:12
This may strike when two toolbars are near each ot
pfeldman
2015/06/11 16:38:07
That's probably fine for now?
|
| } |
| .toolbar-shadow { |
| position: relative; |
| white-space: nowrap; |
| - height: 24px; |
| + height: 26px; |
| overflow: hidden; |
| z-index: 12; |
| display: flex; |
| @@ -19,14 +20,10 @@ |
| align-items: center; |
| } |
| -:host-context(.material) .toolbar-shadow { |
| - height: 28px; |
| -} |
| - |
| .toolbar-shadow.vertical { |
| flex-direction: column; |
| height: auto; |
| - width: 32px; |
| + width: 26px; |
| } |
| .toolbar-shadow.floating { |
| @@ -35,29 +32,21 @@ |
| background-color: white; |
| border: 1px solid #ccc; |
| margin-top: -1px; |
| - width: 32px; |
| -} |
| - |
| -.toolbar-shadow > div { |
| - display: inline-flex; |
| - overflow: visible; |
| - margin: 0 2px; |
| + width: 26px; |
| + left: -2px; |
| } |
| .toolbar-item { |
| position: relative; |
| display: flex; |
| - border: 0 transparent none; |
| + border: 1px solid white; |
| background-color: transparent; |
| flex: none; |
| align-items: center; |
| justify-content: center; |
| padding: 0; |
| - height: 24px; |
| -} |
| - |
| -:host-context(.material) .toolbar-item { |
| - height: 28px; |
| + height: 26px; |
| + border: none; |
|
dgozman
2015/06/11 16:14:12
Two "border" declarations in the same rule.
pfeldman
2015/06/11 16:38:07
Done.
|
| } |
| .toolbar-text { |
| @@ -83,22 +72,13 @@ |
| } |
| .long-click-glyph { |
| - background-color: rgba(0, 0, 0, 0.75); |
| + background-color: #595959; |
| -webkit-mask-image: url(Images/toolbarButtonGlyphs.png); |
| -webkit-mask-position: -288px -48px; |
| -webkit-mask-size: 352px 144px; |
| z-index: 1; |
| width: 32px; |
| - height: 24px; |
| -} |
| - |
| -.narrow .long-click-glyph { |
|
dgozman
2015/06/11 16:14:12
Remove makeNarrow.
|
| - top: -2px; |
| - left: -7px; |
| -} |
| - |
| -:host-context(.material) .long-click-glyph { |
| - top: 2px; |
| + height: 26px; |
| } |
| @media (-webkit-min-device-pixel-ratio: 1.5) { |
| @@ -107,26 +87,15 @@ |
| } |
| } /* media */ |
| -.narrow button.toolbar-item { |
| - width: 26px; |
| -} |
| - |
| -.narrow button.toolbar-item .glyph { |
| - margin: 0 -3px; |
| -} |
| - |
| button.toolbar-item { |
| - width: 30px; |
| -} |
| - |
| -:host-context(.material) button.toolbar-item { |
| - width: 32px; |
| + width: 26px; |
| } |
| -button.toolbar-item:hover, |
| +button.toolbar-item:enabled:hover, |
| .toolbar-item.checkbox:hover, |
|
dgozman
2015/06/11 16:14:12
Should this be checkbox:enabled?
pfeldman
2015/06/11 16:38:07
Input is even deeper there + we don't disable them
|
| .toolbar-counter:hover { |
| background-color: rgba(110, 110, 110, 0.1); |
| + transition: background-color 150ms cubic-bezier(0, 0, 0.2, 1); |
| } |
| button.toolbar-item.toggled-on .glyph { |
| @@ -205,7 +174,7 @@ select.toolbar-item { |
| } |
| .toolbar-item.checkbox { |
| - padding-right: 5px; |
| + padding: 0 5px 0 2px; |
| } |
| .toolbar-item > .glyph { |
| @@ -218,11 +187,14 @@ select.toolbar-item { |
| height: 24px; |
| } |
| -:host-context(:not(.material)) .toolbar-item > .glyph { |
| +.toolbar-item > .glyph { |
| position: relative; |
| - left: -1px; |
| + left: -3px; |
| } |
| +.toolbar-item > .long-click-glyph { |
| + left: -5px; |
| +} |
| @media (-webkit-min-device-pixel-ratio: 1.5) { |
| .toolbar-item > .glyph { |
| @@ -237,7 +209,7 @@ select.toolbar-item { |
| .toolbar-counter { |
| cursor: pointer; |
| padding: 0 2px; |
| - min-width: 30px; |
| + min-width: 26px; |
| } |
| .toolbar-counter-item { |
| @@ -257,21 +229,18 @@ select.toolbar-item { |
| } |
| .toolbar-divider { |
| - margin-left: 7px; |
| - border-right: 1px solid hsla(0, 0%, 0%, 0.1); |
| -} |
| - |
| -:host-context(.material) .toolbar-divider { |
| - height: 18px; |
| + background-color: #ccc; |
| + width: 1px; |
| + margin: 2px 2px; |
| + height: 17px; |
| } |
| .toolbar-group-label { |
| - margin-left: 6px; |
| + margin-left: 5px; |
| margin-right: 3px; |
| color: #888; |
| } |
| - |
| /* Predefined items */ |
| .dock-toolbar-item.toggled-undocked .glyph { |
| @@ -305,11 +274,12 @@ select.toolbar-item { |
| .emulation-toolbar-item.warning::after { |
| background-image: url(Images/toolbarButtonGlyphs.png); |
| background-size: 352px 144px; |
| - width: 15px; |
| - height: 11px; |
| + width: 10px; |
| + height: 12px; |
| content: ""; |
| - position: relative; |
| - top: 4px; |
| + position: absolute; |
| + right: 3px; |
| + bottom: 2px; |
| background-position: -202px -107px; |
| z-index: 1; |
| } |