From 009ce9358168cc06c76fc2f4162829e552e633a3 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 14 Jan 2017 15:51:30 +0100
Subject: Move default template to vintage folder

---
 tpl/default/includes.html | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 tpl/default/includes.html

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
deleted file mode 100644
index 17b78b17..00000000
--- a/tpl/default/includes.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<title>{$pagetitle}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="format-detection" content="telephone=no" />
-<meta name="viewport" content="width=device-width,initial-scale=1.0" />
-<meta name="referrer" content="same-origin">
-<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
-<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
-<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
-<link type="text/css" rel="stylesheet" href="css/reset.css" />
-<link type="text/css" rel="stylesheet" href="css/shaarli.css" />
-{if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if}
-{loop="$plugins_includes.css_files"}
-<link type="text/css" rel="stylesheet" href="{$value}#"/>
-{/loop}
-<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}"/>
-- 
cgit v1.2.3


From 402b03464812aaec76bc841ca7dacb775baf1e03 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 14 Jan 2017 15:52:17 +0100
Subject: Introduce the new default Shaarli template

---
 tpl/default/includes.html | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 tpl/default/includes.html

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
new file mode 100644
index 00000000..ca5c4f33
--- /dev/null
+++ b/tpl/default/includes.html
@@ -0,0 +1,20 @@
+<title>{$pagetitle}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="format-detection" content="telephone=no" />
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
+<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
+<link href="img/favicon.png" rel="shortcut icon" type="image/png" />
+<link type="text/css" rel="stylesheet" href="css/pure.min.css" />
+<link type="text/css" rel="stylesheet" href="css/grids-responsive.min.css">
+<link type="text/css" rel="stylesheet" href="css/pure-extras.css">
+<link type="text/css" rel="stylesheet" href="css/font-awesome.min.css" />
+<link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" />
+<link type="text/css" rel="stylesheet" href="css/shaarli.css" />
+{if="is_file('inc/user.css')"}
+  <link type="text/css" rel="stylesheet" href="inc/user.css#" />
+{/if}
+{loop="$plugins_includes.css_files"}
+  <link type="text/css" rel="stylesheet" href="{$value}#"/>
+{/loop}
+<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle}"/>
\ No newline at end of file
-- 
cgit v1.2.3


From 7040169069322d72cec4276b7b812291b57a0d40 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 21 Feb 2017 14:16:48 +0100
Subject: Multiple minor improvements and bugfixes regarding the new templates:

  * Add API settings in `configure.html`
  * Fix textarea autoresize
  * Load user.css from data folder
  * Move fold/expand all button to the right and fix an issue with already folded items
  * Reset datetime display to international datetime
  * Temporarilly remove JS login panel (need improvement and integration with the plugin system)
  * Body background is slightly lighter
  * Fix an issue where thumbnails were hidden by description
  * Fix an issue where private orange bar wasn't displayed with thumbnails
  * Remove the gradient bar behind titles
  * Fix empty bookmarklet name in Firefox
---
 tpl/default/includes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index ca5c4f33..91c6ca3b 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -12,7 +12,7 @@
 <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" />
 <link type="text/css" rel="stylesheet" href="css/shaarli.css" />
 {if="is_file('inc/user.css')"}
-  <link type="text/css" rel="stylesheet" href="inc/user.css#" />
+  <link type="text/css" rel="stylesheet" href="data/user.css#" />
 {/if}
 {loop="$plugins_includes.css_files"}
   <link type="text/css" rel="stylesheet" href="{$value}#"/>
-- 
cgit v1.2.3