diff options
author | ArthurHoaro <arthur@hoa.ro> | 2016-03-01 18:39:26 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2016-08-07 12:17:36 +0200 |
commit | fe1c966605fe3c0b9bf8357ec094d52273686e78 (patch) | |
tree | 6c4ad01b68da32cb136eeeb8a17c7fa4fb11ecf1 /tpl | |
parent | b74d833d6f129297a3353275e4d6823f57eaceb5 (diff) | |
download | Shaarli-fe1c966605fe3c0b9bf8357ec094d52273686e78.tar.gz Shaarli-fe1c966605fe3c0b9bf8357ec094d52273686e78.tar.zst Shaarli-fe1c966605fe3c0b9bf8357ec094d52273686e78.zip |
Linklist improvements
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/css/shaarli.css | 17 | ||||
-rw-r--r-- | tpl/default/linklist.paging.html | 15 | ||||
-rw-r--r-- | tpl/default/page.header.html | 24 |
3 files changed, 29 insertions, 27 deletions
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index e3961fc3..d9a48239 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css | |||
@@ -2,7 +2,7 @@ | |||
2 | * General | 2 | * General |
3 | */ | 3 | */ |
4 | body { | 4 | body { |
5 | 5 | background: url(../img/noise.png) #979797; | |
6 | } | 6 | } |
7 | 7 | ||
8 | .strong { | 8 | .strong { |
@@ -44,19 +44,19 @@ body { | |||
44 | .pure-u-0 { display: none !important; } | 44 | .pure-u-0 { display: none !important; } |
45 | @media screen and (min-width: 35.5em) { | 45 | @media screen and (min-width: 35.5em) { |
46 | .pure-u-sm-0 { display: none !important; } | 46 | .pure-u-sm-0 { display: none !important; } |
47 | .pure-u-sm-visible { display: inherit !important; } | 47 | .pure-u-sm-visible { display: inline-block !important; } |
48 | } | 48 | } |
49 | @media screen and (min-width: 48em) { | 49 | @media screen and (min-width: 48em) { |
50 | .pure-u-md-0 { display: none !important; } | 50 | .pure-u-md-0 { display: none !important; } |
51 | .pure-u-md-visible { display: inherit !important; } | 51 | .pure-u-md-visible { display: inline-block !important; } |
52 | } | 52 | } |
53 | @media screen and (min-width: 64em) { | 53 | @media screen and (min-width: 64em) { |
54 | .pure-u-lg-0 { display: none !important; } | 54 | .pure-u-lg-0 { display: none !important; } |
55 | .pure-u-lg-visible { display: inherit !important; } | 55 | .pure-u-lg-visible { display: inline-block !important; } |
56 | } | 56 | } |
57 | @media screen and (min-width: 80em) { | 57 | @media screen and (min-width: 80em) { |
58 | .pure-u-xl-0 { display: none !important; } | 58 | .pure-u-xl-0 { display: none !important; } |
59 | .pure-u-xl-visible { display: inherit !important; } | 59 | .pure-u-xl-visible { display: inline-block !important; } |
60 | } | 60 | } |
61 | 61 | ||
62 | /** | 62 | /** |
@@ -223,7 +223,10 @@ body { | |||
223 | */ | 223 | */ |
224 | #content { | 224 | #content { |
225 | position: relative; | 225 | position: relative; |
226 | box-shadow: 0 -2px 1em #797979; | 226 | /* https://css-tricks.com/fighting-the-space-between-inline-block-elements/ */ |
227 | margin-top: -4px; | ||
228 | /* Hack-ish way to only shadow the top part. */ | ||
229 | box-shadow: 0 -20px 20px -20px #797979; | ||
227 | z-index: 2; | 230 | z-index: 2; |
228 | background: url(../img/noise.png) #979797; | 231 | background: url(../img/noise.png) #979797; |
229 | } | 232 | } |
@@ -231,7 +234,7 @@ body { | |||
231 | /** | 234 | /** |
232 | * CONTENT - LINKLIST PAGING | 235 | * CONTENT - LINKLIST PAGING |
233 | */ | 236 | */ |
234 | @media screen and (min-width: 35.5em) { | 237 | @media screen and (max-width: 64em) { |
235 | .linklist-paging { | 238 | .linklist-paging { |
236 | margin: 2.1em 0 0 0; | 239 | margin: 2.1em 0 0 0; |
237 | } | 240 | } |
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index c8c13fe0..1a8256f3 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html | |||
@@ -25,17 +25,18 @@ | |||
25 | 25 | ||
26 | 26 | ||
27 | <div class="linklist-pages pure-u-1-3"> | 27 | <div class="linklist-pages pure-u-1-3"> |
28 | {if="$previous_page_url"} | ||
29 | <a href="{$previous_page_url}" class="paging_older"> | ||
30 | <i class="fa fa-long-arrow-left"></i> Older | ||
31 | </a> | ||
32 | {/if} | ||
33 | {if="$page_max>1"}{$page_current} / {$page_max}{/if} | ||
34 | {if="$next_page_url"} | 28 | {if="$next_page_url"} |
35 | <a href="{$next_page_url}" class="paging_newer"> | 29 | <a href="{$next_page_url}" class="paging_newer"> |
36 | Newer <i class="fa fa-long-arrow-right"></i> | 30 | <i class="fa fa-arrow-circle-left"></i> |
37 | </a> | 31 | </a> |
38 | {/if} | 32 | {/if} |
33 | {if="$page_max>1"}<span class="strong">{$page_current} / {$page_max}</span>{/if} | ||
34 | {if="$previous_page_url"} | ||
35 | <a href="{$previous_page_url}" class="paging_older"> | ||
36 | <i class="fa fa-arrow-circle-right"></i> | ||
37 | </a> | ||
38 | {/if} | ||
39 | |||
39 | </div> | 40 | </div> |
40 | 41 | ||
41 | <div class="linksperpage pure-u-1-3"> | 42 | <div class="linksperpage pure-u-1-3"> |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 3f2075c1..7a67fb2a 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -5,13 +5,14 @@ | |||
5 | <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}" | 5 | <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}" |
6 | class="pure-menu-link"> | 6 | class="pure-menu-link"> |
7 | <i class="fa fa-home"></i> | 7 | <i class="fa fa-home"></i> |
8 | {$GLOBALS['title']} | ||
8 | </a> | 9 | </a> |
9 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> | 10 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> |
10 | </div> | 11 | </div> |
11 | </div> | 12 | </div> |
12 | <div class="pure-u-1"> | 13 | <div class="pure-u-1"> |
13 | <div class="pure-menu menu-transform pure-menu-horizontal"> | 14 | <div class="pure-menu menu-transform pure-menu-horizontal pure-g"> |
14 | <ul class="pure-menu-list"> | 15 | <ul class="pure-menu-list pure-u-lg-11-12 pure-u-sm-1"> |
15 | <li class="pure-menu-item pure-menu-selected pure-u-0 pure-u-lg-visible"> | 16 | <li class="pure-menu-item pure-menu-selected pure-u-0 pure-u-lg-visible"> |
16 | <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}" | 17 | <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}" |
17 | class="pure-menu-link"> | 18 | class="pure-menu-link"> |
@@ -33,19 +34,10 @@ | |||
33 | <li class="pure-menu-item"> | 34 | <li class="pure-menu-item"> |
34 | <a href="?do=tools" class="pure-menu-link">Tools</a> | 35 | <a href="?do=tools" class="pure-menu-link">Tools</a> |
35 | </li> | 36 | </li> |
36 | {else} | ||
37 | <li class="pure-menu-item"> | ||
38 | <a href="?do=login" class="pure-menu-link">Login</a> | ||
39 | </li> | ||
40 | {/if} | 37 | {/if} |
41 | <li class="pure-menu-item"> | 38 | <li class="pure-menu-item pure-u-lg-0"> |
42 | <a href="{$feedurl}?do=rss{$searchcrits}" class="pure-menu-link">RSS Feed</a> | 39 | <a href="?do=atom{$searchcrits}" class="pure-menu-link">RSS Feed</a> |
43 | </li> | 40 | </li> |
44 | {if="$GLOBALS['config']['SHOW_ATOM']"} | ||
45 | <li class="pure-menu-item"> | ||
46 | <a href="{$feedurl}?do=atom{$searchcrits}" class="pure-menu-link">ATOM Feed</a> | ||
47 | </li> | ||
48 | {/if} | ||
49 | <li class="pure-menu-item"> | 41 | <li class="pure-menu-item"> |
50 | <a href="?do=tagcloud" class="pure-menu-link">Tag cloud</a> | 42 | <a href="?do=tagcloud" class="pure-menu-link">Tag cloud</a> |
51 | </li> | 43 | </li> |
@@ -71,6 +63,12 @@ | |||
71 | </li> | 63 | </li> |
72 | {/if} | 64 | {/if} |
73 | </ul> | 65 | </ul> |
66 | <div class="pure-u-lg-1-12 pure-u-sm-0 pure-u-lg-visible"> | ||
67 | <!--<i class="fa fa-user"></i>--> | ||
68 | <a href="?do=atom{$searchcrits}" class="pure-menu-link"> | ||
69 | <i class="fa fa-rss"></i> | ||
70 | </a> | ||
71 | </div> | ||
74 | </div> | 72 | </div> |
75 | </div> | 73 | </div> |
76 | </div> | 74 | </div> |