Skip to content
Browse files

Merge branch 'one' of https://github.com/tatsumihiroki/clubgalre into…

… one

Conflicts:
	app/assets/stylesheets/photos.css.scss
  • Loading branch information...
2 parents a1e3ea8 + bc5730c commit a03c52bbf37e648d51dd60b3b6f183672d2c6a94 @wacky wacky committed May 27, 2013
Showing with 25 additions and 23 deletions.
  1. +2 −2 app/assets/javascripts/photos.js
  2. +22 −20 app/assets/stylesheets/photos.css.scss
  3. +1 −1 app/views/photos/_modal.html.erb
View
4 app/assets/javascripts/photos.js
@@ -71,10 +71,10 @@ function onLoadData(data) {
+ '<li class="imageBox">'
+ '<figure>'
+ '<img class="move" src="<%= image.avatar_file_name %>" width="200" data-pos="<%= image.id %>">'
- + '<figcaption>'
+ + '<figcaption><%= image.name %>'
+ '</figcaption>'
+ '</figure>'
- + '<p class="picname"><%= image.name %></p>'
+ + '<p class="picname"></p>'
+ '<div class="prefecturemenu">'
+ '<span class="prefectureaic typcn" data-pos="<%= image.id %>"></span>'
+ '<p class="prefecture"><%= image.prefecture %></p>'
View
42 app/assets/stylesheets/photos.css.scss
@@ -132,9 +132,6 @@ header {
#menu li a {
padding: 16px 20px;
}
- #main {
- width:100%;
- }
}
.picname {
@@ -151,8 +148,8 @@ header {
line-height: 24px;
.prefectureaic {
- width: 24px;
height: 24px;
+ width: 24px;
line-height: 24px;
color: #f3645c;
font-size: 1.25em;
@@ -196,8 +193,8 @@ header {
}
#lanking {
- margin: 0 auto;
height:300px;
+ margin: 0 auto;
h1 {
margin-left:100px;
@@ -317,30 +314,32 @@ header {
}
.imageBox {
- figure {
- display: block;
- position: relative;
- overflow: hidden;
-
- &:hover figcaption {
- left: 0;
- }
+ figure {
+ display: block;
+ position: relative;
+ overflow: hidden;
}
- figcaption {
+ figcaption {
position: absolute;
- bottom: 0;
- left: -70%;
- width: 70%;
+ bottom: -30%;
+ left: 0;
+ width: 100%;
height: 30px;
+ text-align: center;
+ line-height: 30px;
background: rgba(243, 100, 92, 0.75);
color: white;
- -webkit-transition: all 0.4s ease;
- -moz-transition: all 0.4s ease;
- -o-transition: all 0.4s ease;
+ -webkit-transition: all 0.3s ease;
+ -moz-transition: all 0.3s ease;
+ -o-transition: all 0.3s ease;
}
+ figure:hover figcaption {
+ bottom: 0%;
+ }
+
}
/** Loader **/
@@ -358,3 +357,6 @@ header {
background-image: url(loading.gif);
}
+
+
+
View
2 app/views/photos/_modal.html.erb
@@ -1,7 +1,7 @@
<div id="myModal" class="modal hide fade">
<div class="modal-header">
<a href="/photos" class="close" data-dismiss="modal">&times;</a>
- <h3>Photo UP</h3>
+ <h3>Photo upload</h3>
</div>
<div class="modal-body">
<%= form_for(@photo) do |f| %>

0 comments on commit a03c52b

Please sign in to comment.
Something went wrong with that request. Please try again.