beenull/m1k1oblog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into redesign

Browse source
This commit is contained in:
Miroslav Šedivý 2020-01-24 02:38:47 +01:00
commit ee9506ac59
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.php
View file

@ -119,7 +119,11 @@ if(!empty($scripts)){
<img class="thumb_imglink">
<div class="play"></div>
</div>
<<<<<<< HEAD
<div class="info">
=======
<div class="info has_thumb">
>>>>>>> master
<div class="title"></div>
<div class="desc"></div>
<div class="host"></div>

2
static/scripts/app.js
View file

@ -125,7 +125,7 @@ var cnt_funcs = {
if(!data.thumb){
obj.find(".thumb").remove();
obj.find(".right").removeClass("right");
obj.find(".has_thumb").removeClass("has_thumb");
} else {
obj.find(".thumb img").attr("src", data.thumb);
}

13
static/styles/design.css
View file

@ -704,14 +704,13 @@ body {
height:8px;
animation-name: e_dots;
animation-duration:2s;
animation-iteration-count:infinite;
animation-timing-function:cubic-bezier(0.5, 0, 0.5, 1);
background-color:rgb(255, 255, 255);
border-radius:4px;
display:inline-block;
animation-duration: 2s;
animation-iteration-count: infinite;
animation-timing-function: cubic-bezier(0.5, 0, 0.5, 1);
background-color: rgb(255, 255, 255);
border-radius: 4px;
display: inline-block;
}
.e_dots:nth-child(2) {