diff options
author | Miloš Jovanović <mjovanovic@gmail.com> | 2015-03-10 14:44:51 -0500 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2015-03-11 19:19:04 +0100 |
commit | 610bf4186a1406e7aa852681b09c8cb788443e0b (patch) | |
tree | e2f80e09c8fd1e187d4cd227f36bd09968828e2f | |
parent | 3ef1da28e8cc5afcfe58be067e7e60528ce72f1a (diff) | |
download | Shaarli-610bf4186a1406e7aa852681b09c8cb788443e0b.tar.gz Shaarli-610bf4186a1406e7aa852681b09c8cb788443e0b.tar.zst Shaarli-610bf4186a1406e7aa852681b09c8cb788443e0b.zip |
Fix menu dynamic resize, padding, private icon pixelation
-rw-r--r-- | images/private.png | bin | 2636 -> 813 bytes | |||
-rw-r--r-- | inc/shaarli.css | 93 |
2 files changed, 58 insertions, 35 deletions
diff --git a/images/private.png b/images/private.png index 1364b355..8919d658 100644 --- a/images/private.png +++ b/images/private.png | |||
Binary files differ | |||
diff --git a/inc/shaarli.css b/inc/shaarli.css index a88143ca..56e2d8bc 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css | |||
@@ -84,21 +84,14 @@ h1 { | |||
84 | 84 | ||
85 | .linkeditbuttons { | 85 | .linkeditbuttons { |
86 | position: absolute; | 86 | position: absolute; |
87 | left: -1px; | 87 | left: 2px; |
88 | padding: 4px 2px 2px 2px; | 88 | padding: 4px 2px 2px 2px; |
89 | background-color: #f0f0f0; | ||
90 | 89 | ||
91 | -webkit-border-radius: 0px 6px 6px 0px; | 90 | -webkit-border-radius: 0px 6px 6px 0px; |
92 | -moz-border-radius: 0px 6px 6px 0px; | 91 | -moz-border-radius: 0px 6px 6px 0px; |
93 | -o-border-radius: 0px 6px 6px 0px; | 92 | -o-border-radius: 0px 6px 6px 0px; |
94 | -ms-border-radius: 0px 6px 6px 0px; | 93 | -ms-border-radius: 0px 6px 6px 0px; |
95 | border-radius: 0px 6px 6px 0px; | 94 | border-radius: 0px 6px 6px 0px; |
96 | |||
97 | -webkit-box-shadow: 0px 0px 3px 0px #333333; | ||
98 | -moz-box-shadow: 0px 0px 3px 0px #333333; | ||
99 | -o-box-shadow: 0px 0px 3px 0px #333333; | ||
100 | -ms-box-shadow: 0px 0px 3px 0px #333333; | ||
101 | box-shadow: 0px 0px 3px 0px #333333; | ||
102 | } | 95 | } |
103 | 96 | ||
104 | #pageheader #logo { | 97 | #pageheader #logo { |
@@ -111,12 +104,48 @@ h1 { | |||
111 | cursor: pointer; | 104 | cursor: pointer; |
112 | } | 105 | } |
113 | 106 | ||
107 | #pageheader #menu { | ||
108 | width: 100%; | ||
109 | } | ||
110 | |||
111 | #pageheader #menu ul { | ||
112 | margin: auto; | ||
113 | padding: 7px 0px 0px 0px; | ||
114 | float: none; | ||
115 | } | ||
116 | |||
117 | #pageheader #menu ul li { | ||
118 | list-style: none; | ||
119 | display: inline; | ||
120 | position: relative; | ||
121 | box-sizing: border-box; | ||
122 | } | ||
123 | |||
124 | #pageheader a { | ||
125 | background-color: #333333; | ||
126 | background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#000000)); | ||
127 | background: -webkit-linear-gradient(#333333, #000000); | ||
128 | background: -moz-linear-gradient(#333333, #000000); | ||
129 | background: -ms-linear-gradient(#333333, #000000); | ||
130 | background: -o-linear-gradient(#333333, #000000); | ||
131 | background: linear-gradient(#333333, #000000); | ||
132 | box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); | ||
133 | padding: 5px; | ||
134 | border-radius: 5px 5px 5px 5px; | ||
135 | margin: 10px 3px 3px 3px; | ||
136 | color: #A2DD42; | ||
137 | text-decoration: none; | ||
138 | line-height: 2.5; | ||
139 | white-space: nowrap; | ||
140 | } | ||
141 | |||
114 | #pageheader #linkcount { | 142 | #pageheader #linkcount { |
115 | float: right; | 143 | float: right; |
116 | font-style: italic; | 144 | font-style: italic; |
117 | color: #bbb; | 145 | color: #bbb; |
118 | text-align: right; | 146 | text-align: right; |
119 | padding-right: 5px; | 147 | padding-right: 5px; |
148 | margin: 3px 3px 0px 0px; | ||
120 | } | 149 | } |
121 | 150 | ||
122 | #pageheader { | 151 | #pageheader { |
@@ -133,23 +162,6 @@ h1 { | |||
133 | margin: auto; | 162 | margin: auto; |
134 | } | 163 | } |
135 | 164 | ||
136 | #pageheader a { | ||
137 | background-color: #333333; | ||
138 | background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#000000)); | ||
139 | background: -webkit-linear-gradient(#333333, #000000); | ||
140 | background: -moz-linear-gradient(#333333, #000000); | ||
141 | background: -ms-linear-gradient(#333333, #000000); | ||
142 | background: -o-linear-gradient(#333333, #000000); | ||
143 | background: linear-gradient(#333333, #000000); | ||
144 | box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); | ||
145 | padding: 5px; | ||
146 | border-radius: 5px 5px 5px 5px; | ||
147 | margin: 10px 3px 3px 3px; | ||
148 | color: #A2DD42; | ||
149 | float: left; | ||
150 | text-decoration: none; | ||
151 | } | ||
152 | |||
153 | #pageheader .search { | 165 | #pageheader .search { |
154 | width: 100%; | 166 | width: 100%; |
155 | white-space: nowrap; | 167 | white-space: nowrap; |
@@ -291,6 +303,7 @@ h1 { | |||
291 | .paging_linksperpage { | 303 | .paging_linksperpage { |
292 | float: right; | 304 | float: right; |
293 | padding-right: 5px; | 305 | padding-right: 5px; |
306 | margin: 0px 10px 2px 0px; | ||
294 | } | 307 | } |
295 | 308 | ||
296 | .paging_linksperpage form.linksperpage { | 309 | .paging_linksperpage form.linksperpage { |
@@ -388,12 +401,12 @@ a.qrcode img { | |||
388 | } | 401 | } |
389 | 402 | ||
390 | #linklist li.private { | 403 | #linklist li.private { |
391 | background: url('../images/private.png') no-repeat 10px center; | 404 | background: url('../images/private.png') no-repeat 4px center; |
392 | padding-left: 60px; | 405 | padding-left: 30px; |
393 | } | 406 | } |
394 | 407 | ||
395 | #linklist li { | 408 | #linklist li { |
396 | padding-left: 26px; | 409 | padding-left: 30px; |
397 | } | 410 | } |
398 | 411 | ||
399 | .private .linktitle a { | 412 | .private .linktitle a { |
@@ -468,9 +481,9 @@ a.qrcode img { | |||
468 | background: -o-linear-gradient(#F2F2F2, #ffffff); | 481 | background: -o-linear-gradient(#F2F2F2, #ffffff); |
469 | background: linear-gradient(#F2F2F2, #ffffff); | 482 | background: linear-gradient(#F2F2F2, #ffffff); |
470 | box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); | 483 | box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); |
471 | padding: 3px 3px 3px 20px; | 484 | padding: 3px 5px 3px 20px; |
472 | height: 20px; | 485 | height: 20px; |
473 | border-radius: 3px 3px 3px 3px; | 486 | border-radius: 5px; |
474 | cursor: pointer; | 487 | cursor: pointer; |
475 | background-image: url('../images/tag_blue.png'); | 488 | background-image: url('../images/tag_blue.png'); |
476 | background-repeat: no-repeat; | 489 | background-repeat: no-repeat; |
@@ -515,9 +528,10 @@ a.qrcode img { | |||
515 | #footer { | 528 | #footer { |
516 | font-size: 8pt; | 529 | font-size: 8pt; |
517 | text-align: center; | 530 | text-align: center; |
518 | border-top: 1px solid #ddd; | ||
519 | color: #888; | 531 | color: #888; |
520 | clear: both; | 532 | clear: both; |
533 | max-width: 30em; | ||
534 | margin: 15px auto 15px auto; | ||
521 | } | 535 | } |
522 | 536 | ||
523 | #footer a { | 537 | #footer a { |
@@ -613,7 +627,12 @@ a.qrcode img { | |||
613 | 627 | ||
614 | .thumbnail { | 628 | .thumbnail { |
615 | float: right; | 629 | float: right; |
616 | margin-left: 10px; | 630 | margin: 0px 10px 0px 10px; |
631 | } | ||
632 | |||
633 | .thumbnail img { | ||
634 | border-radius: 5px; | ||
635 | box-shadow: 0.5px 0.5px 0.5px 1px #dde4e6; | ||
617 | } | 636 | } |
618 | 637 | ||
619 | /* If you want thumbnails on the left: | 638 | /* If you want thumbnails on the left: |
@@ -938,7 +957,11 @@ div.dailyNoEntry { | |||
938 | display: none; | 957 | display: none; |
939 | } | 958 | } |
940 | 959 | ||
941 | #pageheader a { | 960 | #pageheader #menu ul { |
961 | text-align: center; | ||
962 | } | ||
963 | |||
964 | #pageheader #menu a { | ||
942 | padding: 5px; | 965 | padding: 5px; |
943 | border-radius: 5px 5px 5px 5px; | 966 | border-radius: 5px 5px 5px 5px; |
944 | margin: 3px; | 967 | margin: 3px; |
@@ -946,9 +969,9 @@ div.dailyNoEntry { | |||
946 | 969 | ||
947 | .searchform, .tagfilter { | 970 | .searchform, .tagfilter { |
948 | display: block !important; | 971 | display: block !important; |
949 | margin: 0px !important; | 972 | margin: 0px 3px 7px 0px !important; |
950 | padding: 0px !important; | 973 | padding: 0px !important; |
951 | width: 100% !important; | 974 | width: 97% !important; |
952 | } | 975 | } |
953 | 976 | ||
954 | .searchform input, .tagfilter input { | 977 | .searchform input, .tagfilter input { |