Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| 3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
| 4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
| 5 */ | 5 */ |
| 6 | 6 |
| 7 :host { | 7 :host { |
| 8 flex: none; | 8 flex: none; |
| 9 padding: 0 2px; | 9 padding: 0 2px; |
| 10 } | 10 } |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 .toolbar-item { | 39 .toolbar-item { |
| 40 position: relative; | 40 position: relative; |
| 41 display: flex; | 41 display: flex; |
| 42 background-color: transparent; | 42 background-color: transparent; |
| 43 flex: none; | 43 flex: none; |
| 44 align-items: center; | 44 align-items: center; |
| 45 justify-content: center; | 45 justify-content: center; |
| 46 padding: 0; | 46 padding: 0; |
| 47 height: 26px; | 47 height: 26px; |
| 48 border: none; | 48 border: none; |
| 49 color: #5a5a5a; | |
| 49 } | 50 } |
| 50 | 51 |
| 51 .toolbar-text { | 52 .toolbar-text { |
| 52 white-space: nowrap; | 53 white-space: nowrap; |
| 53 overflow: hidden; | 54 overflow: hidden; |
| 54 margin-left: 6px; | 55 margin-left: 6px; |
| 55 -webkit-user-select: text; | 56 -webkit-user-select: text; |
| 56 } | 57 } |
| 57 | 58 |
| 58 .toolbar-item:active { | 59 .toolbar-item:active { |
| 59 position: relative; | 60 position: relative; |
| 60 z-index: 200; | 61 z-index: 200; |
| 61 } | 62 } |
| 62 | 63 |
| 63 .toolbar-item:hover .toolbar-button-text { | 64 .toolbar-item:hover .toolbar-button-text { |
| 64 opacity: 1; | 65 color: #333; |
| 65 } | 66 } |
| 66 | 67 |
| 67 .toolbar-item .toolbar-button-text { | 68 .toolbar-item .toolbar-button-text { |
| 68 font-weight: bold; | 69 font-weight: bold; |
| 69 color: rgba(0, 0, 0, 0.75); | 70 color: #5a5a5a; |
| 70 opacity: 0.8; | |
| 71 } | 71 } |
| 72 | 72 |
| 73 .long-click-glyph { | 73 .long-click-glyph { |
| 74 background-color: #595959; | 74 background-color: #595959; |
| 75 -webkit-mask-image: url(Images/toolbarButtonGlyphs.png); | 75 -webkit-mask-image: url(Images/toolbarButtonGlyphs.png); |
| 76 -webkit-mask-position: -288px -48px; | 76 -webkit-mask-position: -288px -48px; |
| 77 -webkit-mask-size: 352px 144px; | 77 -webkit-mask-size: 352px 144px; |
| 78 z-index: 1; | 78 z-index: 1; |
| 79 width: 32px; | 79 width: 32px; |
| 80 height: 26px; | 80 height: 26px; |
| 81 } | 81 } |
| 82 | 82 |
| 83 @media (-webkit-min-device-pixel-ratio: 1.5) { | 83 @media (-webkit-min-device-pixel-ratio: 1.5) { |
| 84 .long-click-glyph { | 84 .long-click-glyph { |
| 85 -webkit-mask-image: url(Images/toolbarButtonGlyphs_2x.png); | 85 -webkit-mask-image: url(Images/toolbarButtonGlyphs_2x.png); |
| 86 } | 86 } |
| 87 } /* media */ | 87 } /* media */ |
| 88 | 88 |
| 89 button.toolbar-item { | 89 button.toolbar-item { |
| 90 width: 26px; | 90 width: 26px; |
| 91 } | 91 } |
| 92 | 92 |
| 93 button.toolbar-item:enabled:hover, | |
| 94 .toolbar-item.checkbox:hover, | |
| 95 .toolbar-counter:hover { | |
| 96 background-color: rgba(110, 110, 110, 0.1); | |
| 97 transition: background-color 150ms cubic-bezier(0, 0, 0.2, 1); | |
|
dgozman
2015/06/12 18:56:17
Transition was nice!
pfeldman
2015/06/12 19:35:29
I tend to agree with Max that it was too much for
| |
| 98 } | |
| 99 | |
| 100 button.toolbar-item.toggled-on .glyph { | 93 button.toolbar-item.toggled-on .glyph { |
| 101 background-color: rgb(66, 129, 235) !important; | 94 background-color: rgb(66, 129, 235) !important; |
| 102 } | 95 } |
| 103 | 96 |
| 104 button.toolbar-item:hover .glyph { | 97 button.toolbar-item:enabled:hover .glyph { |
| 105 opacity: 1; | 98 background-color: #333; |
| 99 } | |
| 100 | |
| 101 .toolbar-counter:hover, | |
| 102 .toolbar-item.checkbox:hover { | |
| 103 color: #333; | |
| 106 } | 104 } |
| 107 | 105 |
| 108 button.toolbar-item:active .glyph { | 106 button.toolbar-item:active .glyph { |
| 109 opacity: 0.8; | 107 background-color: #5a5a5a; |
| 110 } | 108 } |
| 111 | 109 |
| 112 button.toolbar-item:disabled { | 110 button.toolbar-item:disabled { |
| 113 background-position: 0 0 !important; | 111 background-position: 0 0 !important; |
| 114 } | 112 } |
| 115 | 113 |
| 116 button.toolbar-item:disabled .glyph { | 114 button.toolbar-item:disabled .glyph { |
| 117 opacity: 0.5 !important; | 115 opacity: 0.5 !important; |
| 118 } | 116 } |
| 119 | 117 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 172 line-height: 22px; | 170 line-height: 22px; |
| 173 } | 171 } |
| 174 | 172 |
| 175 .toolbar-item.checkbox { | 173 .toolbar-item.checkbox { |
| 176 padding: 0 5px 0 2px; | 174 padding: 0 5px 0 2px; |
| 177 } | 175 } |
| 178 | 176 |
| 179 .toolbar-item > .glyph { | 177 .toolbar-item > .glyph { |
| 180 -webkit-mask-image: url(Images/toolbarButtonGlyphs.png); | 178 -webkit-mask-image: url(Images/toolbarButtonGlyphs.png); |
| 181 -webkit-mask-size: 352px 144px; | 179 -webkit-mask-size: 352px 144px; |
| 182 opacity: 0.9; | 180 background-color: #5a5a5a; |
| 183 background-color: #595959; | |
| 184 z-index: 1; | 181 z-index: 1; |
| 185 width: 32px; | 182 width: 32px; |
| 186 height: 24px; | 183 height: 24px; |
| 187 } | 184 } |
| 188 | 185 |
| 189 .toolbar-item > .glyph { | 186 .toolbar-item > .glyph { |
| 190 position: relative; | 187 position: relative; |
| 191 left: -3px; | 188 left: -3px; |
| 192 } | 189 } |
| 193 | 190 |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 223 margin-left: 0; | 220 margin-left: 0; |
| 224 } | 221 } |
| 225 | 222 |
| 226 .toolbar-counter-item > div { | 223 .toolbar-counter-item > div { |
| 227 margin-right: 2px; | 224 margin-right: 2px; |
| 228 } | 225 } |
| 229 | 226 |
| 230 .toolbar-divider { | 227 .toolbar-divider { |
| 231 background-color: #ccc; | 228 background-color: #ccc; |
| 232 width: 1px; | 229 width: 1px; |
| 233 margin: 2px 2px; | 230 margin: 2px 4px; |
| 234 height: 17px; | 231 height: 17px; |
| 235 } | 232 } |
| 236 | 233 |
| 237 .toolbar-group-label { | 234 .toolbar-group-label { |
| 238 margin-left: 5px; | 235 margin-left: 5px; |
| 239 margin-right: 3px; | 236 margin-right: 3px; |
| 240 color: #888; | 237 color: #888; |
| 241 } | 238 } |
| 242 | 239 |
| 243 /* Predefined items */ | 240 /* Predefined items */ |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 489 } | 486 } |
| 490 | 487 |
| 491 .playback-rate-button.toggled-on > .toolbar-button-text { | 488 .playback-rate-button.toggled-on > .toolbar-button-text { |
| 492 color: rgb(66, 129, 235); | 489 color: rgb(66, 129, 235); |
| 493 } | 490 } |
| 494 | 491 |
| 495 button.playback-rate-button { | 492 button.playback-rate-button { |
| 496 width: auto; | 493 width: auto; |
| 497 margin-right: 10px; | 494 margin-right: 10px; |
| 498 } | 495 } |
| OLD | NEW |