fix photo bug

yanyiyi · Sep 18, 2018 · b76ce24 · b76ce24
1 parent 8ad035c
commit b76ce24
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/css/main.css b/css/main.css
@@ -279,13 +279,6 @@ h2 {
     text-decoration: underline;
 }
 
-.oPhotos {
-    width: 47%;
-    height: 100px;
-    margin: 1.5%;
-    overflow: hidden;
-    float: left;
-}
 
 .warpRatio {
     position: relative;
@@ -343,33 +336,41 @@ a.lilisSet {
 }
 
 .oImg {
-    width: 50%;
+    width: 100%;
     height: 100%;
     position: relative;
     background-color: #444;
     text-align: center;
     overflow: hidden;
+}
+
+.oPhotos {
+    width: 47%;
+    height: 150px;
+    margin: 1.5%;
+    overflow: hidden;
     float: left;
+    position: relative;
 }
 
-.oPhotos:nth-child(5n + 1) {
-    background-color: #6e7b8f;
+.oPhotos:nth-child(5n + 1) .oContent {
+    background-color: #6e7b8f99;
 }
 
-.oPhotos:nth-child(5n + 2) {
-    background-color: #f4c256;
+.oPhotos:nth-child(5n + 2) .oContent {
+    background-color: #f4c25699;
 }
 
-.oPhotos:nth-child(5n + 3) {
-    background-color: #89c9cb;
+.oPhotos:nth-child(5n + 3) .oContent {
+    background-color: #89c9cb99;
 }
 
-.oPhotos:nth-child(5n + 4) {
-    background-color: #9ec6a5;
+.oPhotos:nth-child(5n + 4) .oContent {
+    background-color: #9ec6a599;
 }
 
-.oPhotos:nth-child(5n + 5) {
-    background-color: #ef6960;
+.oPhotos:nth-child(5n + 5) .oContent {
+    background-color: #ef696099;
 }
 
 
@@ -385,12 +386,14 @@ a.lilisSet {
     font-size: 0.9em;
     font-weight: 200;
     color: #FFF;
-    width: 45%;
-    height: 98%;
-    float: left;
-    padding: 5% 2.5%;
+    width: 100%;
+    min-height: 15%;
+    padding: 2% 2.5%;
     letter-spacing: 0.1em;
     line-height: 1.2;
+    position: absolute;
+    bottom: 0px;
+    z-index: 75;
 }
 
 .pWid {

diff --git a/js/liMain.js b/js/liMain.js
@@ -76,7 +76,7 @@ $.getJSON('https://spreadsheets.google.com/feeds/list/1eUgqe2z8gL1d9GrY2LwpAAxW9
                     var pTime = photoLog.feed.entry[k].gsx$time.$t;
                     var pFileid = photoLog.feed.entry[k].gsx$fileid.$t;
                     console.log(pID, pEvent, pPoint, pTime);
-                    $("#oldPhoto").append("<div class='oPhotos'><div class='oImg'><img src='./img/oldphoto/" + pID + "/" + pFileid + ".jpg'/></div><div class='oContent'>" + pEvent + "<br/><span class='pWid'>" + pPoint + "<br/>" + pTime + "</span></div></div>");
+                    $("#oldPhoto").append("<div class='oPhotos'><div class='oImg'><img src='./img/oldphoto/" + pID + "/" + pFileid + ".jpg'/></div><div class='oContent'>" + pEvent + "<br/><span class='pWid'>" + pPoint + "・" + pTime + "</span></div></div>");
                 }
             }
         }); //end of photoLog

diff --git a/lili.html b/lili.html
@@ -124,7 +124,6 @@ <h1 id="liName"></h1>
             <div class="fb-like" data-share="true" data-width="300px" data-show-faces="true">
             </div>
             <div id="oldPhoto">
-
             </div>
         </div>
         <footer>
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,7 +124,6 @@ <h1 id="liName"></h1> @@
                 <div class="fb-like" data-share="true" data-width="300px" data-show-faces="true">
                 </div>
                 <div id="oldPhoto">
                 </div>
             </div>
             <footer>
@@ Expand Down @@