aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-04-14 13:32:34 +0200
committerGitHub <noreply@github.com>2018-04-14 13:32:34 +0200
commit14dd77ad7ee02002b6b7fc84126253be5c65fa17 (patch)
tree6b622eb712cb66ae4e80bb84d85e084e235cc924 /tpl
parent237e7836c0adfd42b8c628e32af69a05c983ef0b (diff)
parent66d37a4fb49cc25142c768ed63351ea0f8881183 (diff)
downloadShaarli-14dd77ad7ee02002b6b7fc84126253be5c65fa17.tar.gz
Shaarli-14dd77ad7ee02002b6b7fc84126253be5c65fa17.tar.zst
Shaarli-14dd77ad7ee02002b6b7fc84126253be5c65fa17.zip
Merge pull request #1126 from kramred/master
load user css at last, after plugin css to enable changing plugin styles
Diffstat (limited to 'tpl')
-rw-r--r--tpl/default/includes.html6
-rw-r--r--tpl/vintage/includes.html2
2 files changed, 4 insertions, 4 deletions
diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 2c56d3c9..34e0ff01 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -7,10 +7,10 @@
7<link href="img/favicon.png" rel="shortcut icon" type="image/png" /> 7<link href="img/favicon.png" rel="shortcut icon" type="image/png" />
8<link href="img/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" /> 8<link href="img/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
9<link type="text/css" rel="stylesheet" href="css/shaarli.min.css?v={$version_hash}" /> 9<link type="text/css" rel="stylesheet" href="css/shaarli.min.css?v={$version_hash}" />
10{if="is_file('data/user.css')"}
11 <link type="text/css" rel="stylesheet" href="data/user.css#" />
12{/if}
13{loop="$plugins_includes.css_files"} 10{loop="$plugins_includes.css_files"}
14 <link type="text/css" rel="stylesheet" href="{$value}?v={$version_hash}#"/> 11 <link type="text/css" rel="stylesheet" href="{$value}?v={$version_hash}#"/>
15{/loop} 12{/loop}
13{if="is_file('data/user.css')"}
14 <link type="text/css" rel="stylesheet" href="data/user.css#" />
15{/if}
16<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle}"/> 16<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle}"/>
diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html
index 4ddfc840..410b466b 100644
--- a/tpl/vintage/includes.html
+++ b/tpl/vintage/includes.html
@@ -7,8 +7,8 @@
7<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" /> 7<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
8<link href="img/favicon.ico" rel="shortcut icon" type="image/x-icon" /> 8<link href="img/favicon.ico" rel="shortcut icon" type="image/x-icon" />
9<link type="text/css" rel="stylesheet" href="css/shaarli.min.css" /> 9<link type="text/css" rel="stylesheet" href="css/shaarli.min.css" />
10{if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if}
11{loop="$plugins_includes.css_files"} 10{loop="$plugins_includes.css_files"}
12<link type="text/css" rel="stylesheet" href="{$value}#"/> 11<link type="text/css" rel="stylesheet" href="{$value}#"/>
13{/loop} 12{/loop}
13{if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if}
14<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}"/> 14<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}"/>