summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordzhioev@google.com <dzhioev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 09:03:09 +0000
committerdzhioev@google.com <dzhioev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 09:03:09 +0000
commitdd4a43d8381a048d28c105269c29bd28daca4a32 (patch)
tree124a42957ceedd5fd664757e126c9d202f210890
parentef98357d1b943259f51f3b0fb9b986490d783437 (diff)
downloadchromium_src-dd4a43d8381a048d28c105269c29bd28daca4a32.zip
chromium_src-dd4a43d8381a048d28c105269c29bd28daca4a32.tar.gz
chromium_src-dd4a43d8381a048d28c105269c29bd28daca4a32.tar.bz2
Merge 209185 "Menu is displayed over user pods on account picker..."
> Menu is displayed over user pods on account picker screen. > > BUG=253523 > TEST=manually > NOTRY=true > > Review URL: https://chromiumcodereview.appspot.com/18109002 TBR=dzhioev@chromium.org Review URL: https://codereview.chromium.org/18628002 git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@209935 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/chromeos/login/user_pod_row.css12
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.css b/chrome/browser/resources/chromeos/login/user_pod_row.css
index 7e630ecd..33d7135 100644
--- a/chrome/browser/resources/chromeos/login/user_pod_row.css
+++ b/chrome/browser/resources/chromeos/login/user_pod_row.css
@@ -14,6 +14,8 @@ podrow {
display: -webkit-box;
max-height: 650px;
overflow: visible;
+ position: relative;
+ z-index: 0;
}
podrow[ncolumns='4'] {
@@ -46,8 +48,10 @@ podrow.images-loading {
display: inline-block;
margin: 0 20px;
padding: 10px 10px 3px;
+ position: relative;
vertical-align: middle;
width: 160px;
+ z-index: 0;
}
.pod .main-pane {
@@ -65,6 +69,7 @@ podrow[ncolumns='6'] .pod {
/* Focused pod has the same size no matter how many pods. */
-webkit-transform: scale(1.0) !important;
cursor: default;
+ z-index: 1;
}
.pod .user-image {
@@ -318,13 +323,6 @@ html[dir=rtl] .action-box-area {
width: 100%;
}
-html[oobe=old] .pod.focused .action-box-area {
- /* Track shifting of .user-image on pod focus. */
- -webkit-transform: translateY(-1px);
- -webkit-transition: -webkit-transform 140ms ease;
- opacity: 1;
-}
-
.signed-in-indicator {
-webkit-transition: all 140ms ease;
background: rgba(0, 0, 0, 0.5);