diff options
author | VirtualTam <virtualtam@flibidi.net> | 2015-12-09 01:00:52 +0100 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2015-12-09 01:00:52 +0100 |
commit | 79851b489087f8a3027ecd805255cd13ee6fcf63 (patch) | |
tree | 288396e3fc0743ecc8b7ab01f2cf7acb97534f88 | |
parent | 2f3e74090ae1b79845f431800c0fb08eeae24c30 (diff) | |
parent | 6a6f6c32e5876a347a806cc43d25596b9257765b (diff) | |
download | Shaarli-79851b489087f8a3027ecd805255cd13ee6fcf63.tar.gz Shaarli-79851b489087f8a3027ecd805255cd13ee6fcf63.tar.zst Shaarli-79851b489087f8a3027ecd805255cd13ee6fcf63.zip |
Merge pull request #406 from ArthurHoaro/qrcode-style
Fixes #403 : Remove QRCode in core CSS and fix plugin layout
-rw-r--r-- | inc/shaarli.css | 10 | ||||
-rw-r--r-- | plugins/qrcode/qrcode.html | 8 |
2 files changed, 3 insertions, 15 deletions
diff --git a/inc/shaarli.css b/inc/shaarli.css index 5578610d..451f0481 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css | |||
@@ -414,16 +414,6 @@ h1 { | |||
414 | color:#E28E3F; | 414 | color:#E28E3F; |
415 | } | 415 | } |
416 | 416 | ||
417 | .linkqrcode { | ||
418 | display: inline; | ||
419 | position: relative; | ||
420 | } | ||
421 | |||
422 | a.qrcode img { | ||
423 | width: 13px; | ||
424 | height: 13px; | ||
425 | } | ||
426 | |||
427 | #linklist li.private { | 417 | #linklist li.private { |
428 | background: url('../images/private.png') no-repeat 4px center; | 418 | background: url('../images/private.png') no-repeat 4px center; |
429 | padding-left: 30px; | 419 | padding-left: 30px; |
diff --git a/plugins/qrcode/qrcode.html b/plugins/qrcode/qrcode.html index ffdaf3b8..58ac5007 100644 --- a/plugins/qrcode/qrcode.html +++ b/plugins/qrcode/qrcode.html | |||
@@ -1,5 +1,3 @@ | |||
1 | <div class="linkqrcode"> | 1 | <a href="http://qrfree.kaywa.com/?l=1&s=8&d=%s" onclick="showQrCode(this); return false;" class="qrcode" data-permalink="%s"> |
2 | <a href="http://qrfree.kaywa.com/?l=1&s=8&d=%s" onclick="showQrCode(this); return false;" class="qrcode" data-permalink="%s"> | 2 | <img src="%s/qrcode/qrcode.png" width="13" height="13" title="QR-Code"> |
3 | <img src="%s/qrcode/qrcode.png" width="13" height="13" title="QR-Code"> | 3 | </a> |
4 | </a> | ||
5 | </div> | ||