Skip to content

Commit

Permalink
fix styles line-height
Browse files Browse the repository at this point in the history
  • Loading branch information
@kokororin
kokororin committed Dec 6, 2016
1 parent 7956c54 commit 9ac2419
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions dist/assets/bundle.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="ja"><head><meta charset="utf-8"><title>pixivの「ラブライブ」発見</title><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="pixiv.moe - pixivの「ラブライブ」発見 - pixiv写真の壁"><meta name="keywords" content="pixiv,pixiv写真の壁,pixiv lovelive,lovelive,ラブライブ,μ's,Aqours,高坂穂乃果,絢瀬絵里,南ことり,園田海未,星空凛,西木野真姫,東條希,小泉花陽,矢澤にこ,綺羅ツバサ,統堂英玲奈,優木あんじゅ,高海千歌,桜内梨子,松浦果南,黒澤ダイヤ,渡辺曜,津島善子,国木田花丸,小原鞠莉,黒澤ルビィ"><meta name="google-site-verification" content="aHrpJZ8M_WPQb07omJ2bwC2fg2DQMgFFEovu9wsSD0E"><link rel="dns-prefetch" href="//api.pixiv.moe"><link rel="dns-prefetch" href="//cdn.pixiv.moe"><link rel="dns-prefetch" href="//i1.pixiv.net"><link rel="dns-prefetch" href="//i2.pixiv.net"><link rel="dns-prefetch" href="//i3.pixiv.net"><link rel="dns-prefetch" href="//i4.pixiv.net"><link rel="dns-prefetch" href="//www.pixiv.net"><link rel="shortcut icon" type="image/x-icon" href="/favicon.ico?version=0.8.7"><style>.message{text-align:center;padding:20px 0;color:#999}.message p{font-size:15px}</style><style>#index-loading{position:absolute;width:300px;height:100px;top:0;right:0;bottom:0;left:0;margin:auto}#index-loading p{font-size:30px!important;margin:0!important;line-height:0!important}</style></head><body><!--[if lte IE 8]><div class="message"><p>古いInternet Explorerにサ終了！</p><script type="text/javascript">!function(){try{document.getElementById("app").innerHTML="";var t=window.location.hash.replace("#/","");!isNaN(parseFloat(t))&&isFinite(t)&&(document.write("<p>あなたはpixiv.netへリダイレクトしています</p>"),setTimeout(function(){window.location.href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+t},1500))}catch(t){document.write("<p>申し訳ございません</p>")}}()</script></div><![endif]--><noscript><div class="message"><p>Javascriptが無効になっていると、サイト内の一部機能がご利用いただけません</p></div></noscript><div id="app"><div id="index-loading" class="message"><p>(・ω・)充填中<span id="wait"></span></p></div></div><script type="text/javascript">!function(){var n=setInterval(function(){var e=document.getElementById("index-loading");if(null!=e){var t=document.getElementById("wait");t.innerHTML.length>3?t.innerHTML="":t.innerHTML+="."}else clearInterval(n)},400)}()</script><script type="text/javascript">!function(e,t,n,c,a){var i=function(e){var t=c.createElement("script");t.setAttribute("src",e),c.body.appendChild(t)},s=function(e){if(a.execScript)a.execScript(e);else{var t=c.head,n=c.createElement("script");n.type="text/javascript",n.text=e,t.removeChild(t.appendChild(n))}};if(n)if(n.bundle&&n.hash==e)s(n.bundle);else{var d=new XMLHttpRequest;d.open("GET",t,!0),d.onload=function(){var c=d.responseText;c&&c.match(/^!function/)?(n.bundle=c,s(n.bundle),n.hash=e):i(t)},d.send()}else i(t)}("1968c0114b54ff8e2295","/assets/bundle.js?1968c0114b54ff8e2295",window.localStorage,document,window)</script></body></html>
<!doctype html><html lang="ja"><head><meta charset="utf-8"><title>pixivの「ラブライブ」発見</title><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="pixiv.moe - pixivの「ラブライブ」発見 - pixiv写真の壁"><meta name="keywords" content="pixiv,pixiv写真の壁,pixiv lovelive,lovelive,ラブライブ,μ's,Aqours,高坂穂乃果,絢瀬絵里,南ことり,園田海未,星空凛,西木野真姫,東條希,小泉花陽,矢澤にこ,綺羅ツバサ,統堂英玲奈,優木あんじゅ,高海千歌,桜内梨子,松浦果南,黒澤ダイヤ,渡辺曜,津島善子,国木田花丸,小原鞠莉,黒澤ルビィ"><meta name="google-site-verification" content="aHrpJZ8M_WPQb07omJ2bwC2fg2DQMgFFEovu9wsSD0E"><link rel="dns-prefetch" href="//api.pixiv.moe"><link rel="dns-prefetch" href="//cdn.pixiv.moe"><link rel="dns-prefetch" href="//i1.pixiv.net"><link rel="dns-prefetch" href="//i2.pixiv.net"><link rel="dns-prefetch" href="//i3.pixiv.net"><link rel="dns-prefetch" href="//i4.pixiv.net"><link rel="dns-prefetch" href="//www.pixiv.net"><link rel="shortcut icon" type="image/x-icon" href="/favicon.ico?version=0.8.7"><style>.message{text-align:center;padding:20px 0;color:#999}.message p{font-size:15px}</style><style>#index-loading{position:absolute;width:300px;height:100px;top:0;right:0;bottom:0;left:0;margin:auto}#index-loading p{font-size:30px!important;margin:0!important;line-height:0!important}</style></head><body><!--[if lte IE 8]><div class="message"><p>古いInternet Explorerにサ終了！</p><script type="text/javascript">!function(){try{document.getElementById("app").innerHTML="";var t=window.location.hash.replace("#/","");!isNaN(parseFloat(t))&&isFinite(t)&&(document.write("<p>あなたはpixiv.netへリダイレクトしています</p>"),setTimeout(function(){window.location.href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+t},1500))}catch(t){document.write("<p>申し訳ございません</p>")}}()</script></div><![endif]--><noscript><div class="message"><p>Javascriptが無効になっていると、サイト内の一部機能がご利用いただけません</p></div></noscript><div id="app"><div id="index-loading" class="message"><p>(・ω・)充填中<span id="wait"></span></p></div></div><script type="text/javascript">!function(){var n=setInterval(function(){var e=document.getElementById("index-loading");if(null!=e){var t=document.getElementById("wait");t.innerHTML.length>3?t.innerHTML="":t.innerHTML+="."}else clearInterval(n)},400)}()</script><script type="text/javascript">!function(e,t,n,d,a){var i=function(e){var t=d.createElement("script");t.setAttribute("src",e),d.body.appendChild(t)},c=function(e){if(a.execScript)a.execScript(e);else{var t=d.head,n=d.createElement("script");n.type="text/javascript",n.text=e,t.removeChild(t.appendChild(n))}};if(n)if(n.bundle&&n.hash==e)c(n.bundle);else{var s=new XMLHttpRequest;s.open("GET",t,!0),s.onload=function(){var d=s.responseText;d&&d.match(/^!function/)?(n.bundle=d,c(n.bundle),n.hash=e):i(t)},s.send()}else i(t)}("e173ed5bd518407e6e24","/assets/bundle.js?e173ed5bd518407e6e24",window.localStorage,document,window)</script></body></html>
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pixiv.moe",
"version": "1.1.8",
"version": "1.1.9",
"description": "Source code of https://pixiv.moe",
"main": "server.js",
"scripts": {
Expand Down Expand Up @@ -103,7 +103,7 @@
"react-mixin": "^3.0.5",
"react-modal": "^1.5.2",
"react-redux": "^4.4.6",
"react-router-component": "^0.36.1",
"react-router-component": "^0.36.3",
"react-tap-event-plugin": "^2.0.1",
"redux": "^3.6.0",
"redux-thunk": "^2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions src/styles/Item.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
.title {
margin: 1px 0;
font-size: 16px;
line-height: 10px;
line-height: 1;
}

.meta {
line-height: 10px;
line-height: 1;
padding: 0 0 1px;
margin: 8px 0;
font-size: 10px;
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4941,9 +4941,9 @@ react-redux@^4.4.6:
lodash "^4.2.0"
loose-envify "^1.1.0"

react-router-component@^0.36.1:
version "0.36.1"
resolved "https://registry.npmjs.org/react-router-component/-/react-router-component-0.36.1.tgz#0610dcbb773c617c30a7d3ef064d91817985ced9"
react-router-component@^0.36.3:
version "0.36.3"
resolved "https://registry.npmjs.org/react-router-component/-/react-router-component-0.36.3.tgz#03953661610ebb954500ab3b20acd01fef7ec471"
dependencies:
is-equal-shallow "^0.1.3"
object-assign "^4.1.0"
Expand Down

0 comments on commit 9ac2419

Please sign in to comment.