Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 * Use of this source code is governed by a BSD-style license that can be | 2 * Use of this source code is governed by a BSD-style license that can be |
| 3 * found in the LICENSE file. */ | 3 * found in the LICENSE file. */ |
| 4 | 4 |
| 5 #login-header-bar { | 5 #login-header-bar { |
| 6 -webkit-padding-start: 15px; | 6 -webkit-padding-start: 15px; |
| 7 bottom: 0; | 7 bottom: 0; |
| 8 left: 0; | 8 left: 0; |
| 9 padding-bottom: 6px; | 9 padding-bottom: 6px; |
| 10 position: absolute; | 10 position: absolute; |
| 11 right: 0; | 11 right: 0; |
| 12 } | 12 } |
| 13 | 13 |
| 14 #login-header-bar { | 14 #login-header-bar { |
| 15 /* Using copy of Ash launcher background with 0.8 opacity applied to it. | 15 background-color: rgba(0, 0, 0, 0.6); |
| 16 Otherwise if opacity: 0.8 is set here it will affect button text as well. | |
| 17 Have to position background differently so that opacity is not applied | |
| 18 to child elements. */ | |
| 19 background-image: url(chrome://theme/IDR_LAUNCHER_BACKGROUND); | |
| 20 padding-top: 7px; | 16 padding-top: 7px; |
| 21 } | 17 } |
| 22 | 18 |
| 23 html[screen=lock] .login-header-bar-hidden, | 19 html[screen=lock] .login-header-bar-hidden, |
| 24 html[screen=oobe] .login-header-bar-hidden { | 20 html[screen=oobe] .login-header-bar-hidden { |
| 25 opacity: 0; | 21 opacity: 0; |
| 26 } | 22 } |
| 27 | 23 |
| 28 html[screen=lock] .login-header-bar-animate-fast, | 24 html[screen=lock] .login-header-bar-animate-fast, |
| 29 html[screen=oobe] .login-header-bar-animate-fast { | 25 html[screen=oobe] .login-header-bar-animate-fast { |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 52 | 48 |
| 53 #login-header-bar button:not(.button-restricted), | 49 #login-header-bar button:not(.button-restricted), |
| 54 #login-header-bar button:active:not(.button-restricted), | 50 #login-header-bar button:active:not(.button-restricted), |
| 55 #login-header-bar button:focus:not(.button-restricted), | 51 #login-header-bar button:focus:not(.button-restricted), |
| 56 #login-header-bar button:hover:not(.button-restricted) { | 52 #login-header-bar button:hover:not(.button-restricted) { |
| 57 color: white !important; | 53 color: white !important; |
| 58 opacity: 1 !important; | 54 opacity: 1 !important; |
| 59 } | 55 } |
| 60 | 56 |
| 61 .header-bar-item { | 57 .header-bar-item { |
| 62 display: inline-block; | |
| 63 height: 34px; | 58 height: 34px; |
| 64 } | 59 } |
| 65 | 60 |
| 66 .add-supervised-user-menu { | 61 .add-supervised-user-menu { |
| 67 display: none; | 62 display: none; |
| 68 } | 63 } |
| 69 | 64 |
| 70 #more-settings-header-bar-item.active button.add-supervised-user-menu { | 65 #more-settings-header-bar-item.active button.add-supervised-user-menu { |
| 71 background-color: white; | 66 background-color: white; |
| 72 border: 1px solid lightgray; | 67 border: 1px solid lightgray; |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 86 | 81 |
| 87 html[dir=rtl] #more-settings-header-bar-item.active | 82 html[dir=rtl] #more-settings-header-bar-item.active |
| 88 button.add-supervised-user-menu { | 83 button.add-supervised-user-menu { |
| 89 right: 0; | 84 right: 0; |
| 90 } | 85 } |
| 91 | 86 |
| 92 html[dir=rtl] .header-bar-item { | 87 html[dir=rtl] .header-bar-item { |
| 93 background-position: right center; | 88 background-position: right center; |
| 94 } | 89 } |
| 95 | 90 |
| 91 #login-header-bar #shutdown-button-text, | |
| 92 #login-header-bar #restart-button-text, | |
| 93 #login-header-bar #add-user-button-text, | |
| 94 #login-header-bar #guest-user-button-text, | |
| 95 #login-header-bar #more-settings-button-text, | |
| 96 #login-header-bar #cancel-multiple-sign-in-button-text { | |
| 97 -webkit-padding-start: 28px; | |
| 98 background-position: left center; | |
| 99 background-repeat: no-repeat; | |
| 100 background-size: 20px; | |
| 101 } | |
| 102 | |
| 103 html[dir=rtl] #login-header-bar #shutdown-button-text, | |
| 104 html[dir=rtl] #login-header-bar #restart-button-text, | |
| 105 html[dir=rtl] #login-header-bar #add-user-button-text, | |
| 106 html[dir=rtl] #login-header-bar #more-settings-button-text, | |
| 107 html[dir=rtl] #login-header-bar #guest-user-button-text, | |
| 108 html[dir=rtl] #login-header-bar #cancel-multiple-sign-in-button-text { | |
| 109 background-position: right center; | |
| 110 } | |
| 111 | |
| 96 #login-header-bar #shutdown-button, | 112 #login-header-bar #shutdown-button, |
| 97 #login-header-bar #restart-button, | 113 #login-header-bar #restart-button, |
| 98 #login-header-bar #add-user-button, | 114 #login-header-bar #add-user-button, |
| 99 #login-header-bar #guest-user-button, | 115 #login-header-bar #guest-user-button, |
| 100 #login-header-bar #more-settings-button, | 116 #login-header-bar #more-settings-button, |
| 101 #login-header-bar #cancel-multiple-sign-in-button { | 117 #login-header-bar #cancel-multiple-sign-in-button { |
| 102 -webkit-padding-start: 24px; | 118 padding: 0 14px; |
| 103 background-position: left center; | |
| 104 background-repeat: no-repeat; | |
| 105 background-size: 24px; | |
| 106 } | |
| 107 | |
| 108 html[dir=rtl] #login-header-bar #shutdown-button, | |
| 109 html[dir=rtl] #login-header-bar #restart-button, | |
| 110 html[dir=rtl] #login-header-bar #add-user-button, | |
| 111 html[dir=rtl] #login-header-bar #more-settings-button, | |
| 112 html[dir=rtl] #login-header-bar #guest-user-button, | |
| 113 html[dir=rtl] #login-header-bar #cancel-multiple-sign-in-button { | |
| 114 background-position: right center; | |
| 115 } | 119 } |
| 116 | 120 |
| 117 #login-header-bar #more-settings-header-bar-item { | 121 #login-header-bar #more-settings-header-bar-item { |
| 118 position: relative; | 122 position: relative; |
| 119 } | 123 } |
| 120 | 124 |
| 121 #login-header-bar #shutdown-button { | 125 #login-header-bar #shutdown-button-text, |
| 122 background-image: url(chrome://theme/IDR_ICON_POWER_WHITE); | 126 #login-header-bar #restart-button-text { |
| 127 background-image: -webkit-image-set( | |
| 128 url(images/1x/shutdown.svg) 1x, | |
| 129 url(images/2x/shutdown.svg) 2x ); | |
|
xiyuan
2016/11/16 17:48:34
Svg files are vector based and should work on diff
Alexander Alekseev
2016/11/16 22:12:22
I had long discussion with our designers and they
| |
| 123 } | 130 } |
| 124 | 131 |
| 125 #login-header-bar #restart-button { | 132 #login-header-bar #add-user-button-text { |
| 126 background-image: url(chrome://theme/IDR_ICON_POWER_WHITE); | 133 background-image: -webkit-image-set( |
| 134 url(images/1x/add-person.svg) 1x, | |
| 135 url(images/2x/add-person.svg) 2x ); | |
| 127 } | 136 } |
| 128 | 137 |
| 129 #login-header-bar #add-user-button { | 138 #login-header-bar #more-settings-button-text { |
| 130 background-image: url(chrome://theme/IDR_ICON_ADD_USER_WHITE); | |
| 131 } | |
| 132 | |
| 133 #login-header-bar #more-settings-button { | |
| 134 background-image: url(chrome://theme/IDR_ICON_MORE_VERT_WHITE); | 139 background-image: url(chrome://theme/IDR_ICON_MORE_VERT_WHITE); |
| 135 } | 140 } |
| 136 | 141 |
| 137 #login-header-bar #guest-user-button { | 142 #login-header-bar #guest-user-button-text { |
| 138 background-image: url(chrome://theme/IDR_ICON_GUEST_WHITE); | 143 background-image: -webkit-image-set( |
| 144 url(images/1x/browse-as-guest.svg) 1x, | |
| 145 url(images/2x/browse-as-guest.svg) 2x ); | |
| 139 } | 146 } |
| 140 | 147 |
| 141 #login-header-bar #cancel-multiple-sign-in-button { | 148 #login-header-bar #cancel-multiple-sign-in-button-text { |
| 142 /* TODO(dzhioev): replace with appropriate image when possible. */ | 149 /* TODO(dzhioev): replace with appropriate image when possible. */ |
| 143 background-image: url(chrome://theme/IDR_PANEL_CLOSE); | 150 background-image: url(chrome://theme/IDR_PANEL_CLOSE); |
| 144 } | 151 } |
| 145 | 152 |
| 146 .button-restricted { | 153 .button-restricted { |
| 147 border: 1px solid transparent; | 154 border: 1px solid transparent; |
| 148 color: white !important; | 155 color: white !important; |
| 149 opacity: 0.4 !important; | 156 opacity: 0.4 !important; |
| 150 } | 157 } |
| OLD | NEW |