aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-09-12 12:36:07 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-09-12 12:36:07 +0200
commit3e05742568428cfe8cfbf2dc45e3b14206368e93 (patch)
tree2a86de37cb139be76619aae1d4456c84cfc7ce80
parent660b998eb7c9d1c7ba3ae5f61040084d7df6b6df (diff)
parentb084cde8549c4f6efa7b089d8f1ae370b46b212f (diff)
downloadwallabag-3e05742568428cfe8cfbf2dc45e3b14206368e93.tar.gz
wallabag-3e05742568428cfe8cfbf2dc45e3b14206368e93.tar.zst
wallabag-3e05742568428cfe8cfbf2dc45e3b14206368e93.zip
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
-rw-r--r--tpl/css/style-light.css34
-rw-r--r--tpl/css/style.css31
2 files changed, 38 insertions, 27 deletions
diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css
index 224ef182..a85961c9 100644
--- a/tpl/css/style-light.css
+++ b/tpl/css/style-light.css
@@ -1,51 +1,45 @@
1
2a.back span { 1a.back span {
3 background: url('../img/light/left.png') no-repeat; 2 background: url('../img/light/left.png');
4} 3}
5 4
6a.top span { 5a.top span {
7 background: url('../img/light/top.png') no-repeat; 6 background: url('../img/light/top.png');
8} 7}
9 8
10
11a.fav span { 9a.fav span {
12 background: url('../img/light/star-on.png') no-repeat; 10 background: url('../img/light/star-on.png');
13} 11}
14
15a.fav span:hover { 12a.fav span:hover {
16 background: url('../img/light/star-off.png') no-repeat; 13 background: url('../img/light/star-off.png');
17} 14}
18 15
19a.fav-off span { 16a.fav-off span {
20 background: url('../img/light/star-off.png') no-repeat; 17 background: url('../img/light/star-off.png');
21} 18}
22
23a.fav-off span:hover { 19a.fav-off span:hover {
24 background: url('../img/light/star-on.png') no-repeat; 20 background: url('../img/light/star-on.png');
25} 21}
26 22
27a.archive span { 23a.archive span {
28 background: url('../img/light/checkmark-on.png') no-repeat; 24 background: url('../img/light/checkmark-on.png');
29} 25}
30
31a.archive span:hover { 26a.archive span:hover {
32 background: url('../img/light/checkmark-off.png') no-repeat; 27 background: url('../img/light/checkmark-off.png');
33} 28}
34 29
35a.archive-off span { 30a.archive-off span {
36 background: url('../img/light/checkmark-off.png') no-repeat; 31 background: url('../img/light/checkmark-off.png');
37} 32}
38
39a.archive-off span:hover { 33a.archive-off span:hover {
40 background: url('../img/light/checkmark-on.png') no-repeat; 34 background: url('../img/light/checkmark-on.png');
41} 35}
42 36
43a.twitter span { 37a.twitter span {
44 background: url('../img/light/twitter.png') no-repeat; 38 background: url('../img/light/twitter.png');
45} 39}
46 40
47a.shaarli span { 41a.shaarli span {
48 background: url('../img/light/shaarli.png') no-repeat; 42 background: url('../img/light/shaarli.png');
49} 43}
50 44
51a.flattr span { 45a.flattr span {
@@ -53,9 +47,9 @@ a.flattr span {
53} 47}
54 48
55a.email span { 49a.email span {
56 background: url('../img/light/envelop.png') no-repeat; 50 background: url('../img/light/envelop.png');
57} 51}
58 52
59a.delete span { 53a.delete span {
60 background: url('../img/light/remove.png') no-repeat; 54 background: url('../img/light/remove.png');
61} \ No newline at end of file 55} \ No newline at end of file
diff --git a/tpl/css/style.css b/tpl/css/style.css
index c056429d..d60b443c 100644
--- a/tpl/css/style.css
+++ b/tpl/css/style.css
@@ -270,14 +270,31 @@ footer {
270 270
271#inputform { 271#inputform {
272 display: none; 272 display: none;
273 text-align:center; 273 text-align: center;
274 max-width:300px; 274 max-width: 300px;
275 margin-left:auto; 275 margin-left: auto;
276 margin-right:auto; 276 margin-right: auto;
277 margin-top:5px; 277 margin-top: 5px;
278 padding-bottom: 5px; 278 padding-bottom: 5px;
279 background-color: rgba(0, 0, 0, 0.9); 279 background-color: rgba(0, 0, 0, 0.9);
280 opacity:0.8; 280 opacity: 0.8;
281 color:white; 281 color: #fff;
282 border-radius: 3px; 282 border-radius: 3px;
283} 283}
284
285a.back span,
286a.top span,
287a.fav span,
288a.fav span:hover,
289a.fav-off span,
290a.fav-off span:hover,
291a.archive span,
292a.archive span:hover,
293a.archive-off span,
294a.archive-off span:hover,
295a.twitter span,
296a.flattr span,
297a.email span,
298a.delete span {
299 background-repeat: no-repeat;
300}