Permalink
Browse files

マージミスってたので直し

  • Loading branch information...
wacky committed Jun 1, 2013
1 parent 4b6ada4 commit f417fa6ae8157e3a1d01bf0a2947b36c68888318
Showing with 23 additions and 21 deletions.
  1. +23 −21 app/assets/stylesheets/photos.css.scss
@@ -335,33 +335,35 @@ header {
}
.imageBox {
+
figure {
display: block;
position: relative;
overflow: hidden;
- }
-
- figcaption {
- $base_pad: 5px;
- position: absolute;
- bottom: -50%;
- left: 0;
- padding: 0 $base_pad $base_pad;
- width: $img_w - ($base_pad*2);
- height: auto;
- text-align: center;
- word-break: break-all;
- vertical-align:baseline;
- background: rgba(243, 100, 92, 0.75);
- color: white;
+ &:hover figcaption {
+ bottom: 0%;
+ }
- -webkit-transition: all 0.3s ease;
- -moz-transition: all 0.3s ease;
- -o-transition: all 0.3s ease;
- }
- figure:hover figcaption {
- bottom: 0%;
+ figcaption {
+ $base_pad: 5px;
+ position: absolute;
+ bottom: -50%;
+ left: 0;
+ padding: 0 $base_pad $base_pad;
+ width: $img_w - ($base_pad*2);
+ height: auto;
+ text-align: center;
+ word-break: break-all;
+ vertical-align:baseline;
+
+ background: rgba(243, 100, 92, 0.75);
+ color: white;
+
+ -webkit-transition: all 0.3s ease;
+ -moz-transition: all 0.3s ease;
+ -o-transition: all 0.3s ease;
+ }
}
}

0 comments on commit f417fa6

Please sign in to comment.