Commit a456ee36 authored by dgozman@chromium.org's avatar dgozman@chromium.org

[filebrowser] Yet another animation in gallery ribbon.

BUG=chromium-os:23434
TEST=See bug.

Review URL: http://codereview.chromium.org/8770044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112969 0039d316-1c4b-4281-b951-d872f2087c98
parent 95dacd08
...@@ -238,7 +238,7 @@ body { ...@@ -238,7 +238,7 @@ body {
.gallery .filename-spacer > input { .gallery .filename-spacer > input {
background-color: transparent; background-color: transparent;
color: white; color: white;
width: 40em; width: 200px;
border: none; border: none;
outline: none; outline: none;
} }
...@@ -252,31 +252,26 @@ body { ...@@ -252,31 +252,26 @@ body {
/* Thumbnails */ /* Thumbnails */
.gallery .ribbon-spacer { .gallery .ribbon-spacer {
position: relative;
display: -webkit-box; display: -webkit-box;
-webkit-box-flex: 1; -webkit-box-flex: 1;
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-pack: center;
} }
.gallery .toolbar .ribbon { .gallery .toolbar .ribbon {
position: absolute;
top: 0px;
left: 0px;
overflow: hidden; overflow: hidden;
height: 100%; height: 100%;
-webkit-box-flex: 0;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-pack: left; -webkit-box-pack: start;
width: 280px;
max-width: 100%; max-width: 100%;
-webkit-transition: max-width 500ms ease-in-out; -webkit-transition: max-width 500ms ease-in-out;
z-index: 0; z-index: 0;
} }
.gallery .toolbar .ribbon[inactive] {
z-index: -1;
}
.gallery[editing] .toolbar .ribbon { .gallery[editing] .toolbar .ribbon {
max-width: 0; max-width: 0;
} }
...@@ -292,18 +287,23 @@ body { ...@@ -292,18 +287,23 @@ body {
height: 47px; height: 47px;
margin: 2px; margin: 2px;
border: 2px solid rgba(255,255,255,0); /* transparent white */ border: 2px solid rgba(255,255,255,0); /* transparent white */
-webkit-transition: margin-left 180ms linear;
}
.gallery .ribbon-image[selected] {
border: 2px solid rgba(255,233,168,1);
}
margin-left: 2px; .gallery .toolbar .ribbon.fade-left {
-webkit-transition: opacity 200ms linear; -webkit-mask-image: -webkit-linear-gradient(left, rgba(0,0,0,0) 0, rgba(0,0,0,1) 40px);
} }
.gallery .ribbon-image[inactive] { .gallery .toolbar .ribbon.fade-right {
opacity: 0; -webkit-mask-image: -webkit-linear-gradient(right, rgba(0,0,0,0) 0, rgba(0,0,0,1) 40px);
pointer-events: none;
} }
.gallery .ribbon-image[selected] { .gallery .toolbar .ribbon.fade-left.fade-right {
border: 2px solid rgba(255,233,168,1); -webkit-mask-image: -webkit-linear-gradient(left, rgba(0,0,0,0) 0, rgba(0,0,0,1) 40px, rgba(0,0,0,1) 230px, rgba(0,0,0,0) 100%);
} }
.gallery .image-wrapper { .gallery .image-wrapper {
...@@ -314,34 +314,6 @@ body { ...@@ -314,34 +314,6 @@ body {
border: 1px solid rgba(0,0,0,0); /* transparent black */ border: 1px solid rgba(0,0,0,0); /* transparent black */
} }
.gallery .toolbar .fade {
background-repeat: no-repeat;
background-position: center center;
position: absolute;
z-index: 10;
width: 55px;
height: 100%;
pointer-events: none;
opacity: 0;
-webkit-transition: opacity 200ms linear;
}
.gallery .toolbar .fade[active] {
opacity: 1;
}
.gallery[editing] .toolbar .fade[active] {
opacity: 0;
}
.gallery .toolbar .fade.left {
background-image: url(../../images/gallery/thumb_fade_left.png);
}
.gallery .toolbar .fade.right {
background-image: url(../../images/gallery/thumb_fade_right.png);
}
/* Editor buttons */ /* Editor buttons */
.gallery .toolbar .edit-bar { .gallery .toolbar .edit-bar {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment