aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'tpl')
-rw-r--r--tpl/default/configure.html4
-rw-r--r--tpl/default/css/shaarli.css31
-rw-r--r--tpl/default/daily.html2
-rw-r--r--tpl/default/fonts/Fira-Sans-regular.woffbin17100 -> 0 bytes
-rw-r--r--tpl/default/fonts/Fira-Sans-regular.woff2bin13836 -> 0 bytes
-rw-r--r--tpl/default/fonts/Roboto-Bold.woffbin0 -> 89584 bytes
-rw-r--r--tpl/default/fonts/Roboto-Bold.woff2bin0 -> 63320 bytes
-rw-r--r--tpl/default/fonts/Roboto-Regular.woffbin0 -> 89732 bytes
-rw-r--r--tpl/default/fonts/Roboto-Regular.woff2bin0 -> 63412 bytes
-rw-r--r--tpl/default/import.html1
-rw-r--r--tpl/default/install.html18
-rw-r--r--tpl/default/js/shaarli.js3
-rw-r--r--tpl/vintage/configure.html4
-rw-r--r--tpl/vintage/import.html2
14 files changed, 46 insertions, 19 deletions
diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index fd8ee9c2..7469ab59 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -206,7 +206,7 @@
206 <div class="pure-g"> 206 <div class="pure-g">
207 <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}"> 207 <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
208 <div class="form-label"> 208 <div class="form-label">
209 <label for="apiEnabled"> 209 <label for="enableApi">
210 <span class="label-name">{'Enable REST API'|t}</span><br> 210 <span class="label-name">{'Enable REST API'|t}</span><br>
211 <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span> 211 <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span>
212 </label> 212 </label>
@@ -214,7 +214,7 @@
214 </div> 214 </div>
215 <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}"> 215 <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
216 <div class="form-input"> 216 <div class="form-input">
217 <input type="checkbox" name="apiEnabled" id="apiEnabled" 217 <input type="checkbox" name="enableApi" id="enableApi"
218 {if="$api_enabled"}checked{/if}/> 218 {if="$api_enabled"}checked{/if}/>
219 </div> 219 </div>
220 </div> 220 </div>
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index 8fcd13af..73fade5f 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -35,14 +35,29 @@ pre {
35} 35}
36 36
37@font-face { 37@font-face {
38 font-family: 'Roboto Slab'; 38 font-family: 'Roboto';
39 font-weight: 400; 39 font-weight: 400;
40 font-style: normal; 40 font-style: normal;
41 src: 41 src:
42 local('Fira Sans'), 42 local('Roboto'),
43 local('Fira-Sans-regular'), 43 local('Roboto-Regular'),
44 url('../fonts/Fira-Sans-regular.woff2') format('woff2'), 44 url('../fonts/Roboto-Regular.woff2') format('woff2'),
45 url('../fonts/Fira-Sans-regular.woff') format('woff'); 45 url('../fonts/Roboto-Regular.woff') format('woff');
46}
47
48@font-face {
49 font-family: 'Roboto';
50 font-weight: 700;
51 font-style: normal;
52 src:
53 local('Roboto'),
54 local('Roboto-Bold'),
55 url('../fonts/Roboto-Bold.woff2') format('woff2'),
56 url('../fonts/Roboto-Bold.woff') format('woff');
57}
58
59body, .pure-g [class*="pure-u"] {
60 font-family: Roboto, Arial, sans-serif;
46} 61}
47 62
48/** 63/**
@@ -68,10 +83,6 @@ pre {
68 .pure-u-xl-visible { display: inline-block !important; } 83 .pure-u-xl-visible { display: inline-block !important; }
69} 84}
70 85
71.pure-g [class*="pure-u"]{
72 font-family: Roboto Slab, Arial, sans-serif;
73}
74
75/** 86/**
76 * Make pure-extras alert closable. 87 * Make pure-extras alert closable.
77 */ 88 */
@@ -504,7 +515,6 @@ pre {
504 color: #252525; 515 color: #252525;
505 text-decoration: none; 516 text-decoration: none;
506 vertical-align: middle; 517 vertical-align: middle;
507 font-family: Roboto Slab, Arial, sans-serif;
508} 518}
509 519
510.linklist-item-title .linklist-link { 520.linklist-item-title .linklist-link {
@@ -560,7 +570,6 @@ pre {
560.linklist-item-description { 570.linklist-item-description {
561 position: relative; 571 position: relative;
562 padding: 10px; 572 padding: 10px;
563 font-family: Roboto Slab, Arial, sans-serif;
564 word-wrap: break-word; 573 word-wrap: break-word;
565 color: #252525; 574 color: #252525;
566 line-height: 1.3em; 575 line-height: 1.3em;
diff --git a/tpl/default/daily.html b/tpl/default/daily.html
index d8c91078..29d845d5 100644
--- a/tpl/default/daily.html
+++ b/tpl/default/daily.html
@@ -44,7 +44,7 @@
44 </div> 44 </div>
45 </div> 45 </div>
46 <div> 46 <div>
47 <h3 class="window-subtitle">{function="strftime('%A %d, %B %Y', $day)"}</h3> 47 <h3 class="window-subtitle">{function="format_date($dayDate, false)"}</h3>
48 48
49 <div id="plugin_zone_about_daily" class="plugin_zone"> 49 <div id="plugin_zone_about_daily" class="plugin_zone">
50 {loop="$daily_about_plugin"} 50 {loop="$daily_about_plugin"}
diff --git a/tpl/default/fonts/Fira-Sans-regular.woff b/tpl/default/fonts/Fira-Sans-regular.woff
deleted file mode 100644
index 014ac317..00000000
--- a/tpl/default/fonts/Fira-Sans-regular.woff
+++ /dev/null
Binary files differ
diff --git a/tpl/default/fonts/Fira-Sans-regular.woff2 b/tpl/default/fonts/Fira-Sans-regular.woff2
deleted file mode 100644
index bf3ad9a4..00000000
--- a/tpl/default/fonts/Fira-Sans-regular.woff2
+++ /dev/null
Binary files differ
diff --git a/tpl/default/fonts/Roboto-Bold.woff b/tpl/default/fonts/Roboto-Bold.woff
new file mode 100644
index 00000000..3d86753b
--- /dev/null
+++ b/tpl/default/fonts/Roboto-Bold.woff
Binary files differ
diff --git a/tpl/default/fonts/Roboto-Bold.woff2 b/tpl/default/fonts/Roboto-Bold.woff2
new file mode 100644
index 00000000..bd05e2ea
--- /dev/null
+++ b/tpl/default/fonts/Roboto-Bold.woff2
Binary files differ
diff --git a/tpl/default/fonts/Roboto-Regular.woff b/tpl/default/fonts/Roboto-Regular.woff
new file mode 100644
index 00000000..464d2062
--- /dev/null
+++ b/tpl/default/fonts/Roboto-Regular.woff
Binary files differ
diff --git a/tpl/default/fonts/Roboto-Regular.woff2 b/tpl/default/fonts/Roboto-Regular.woff2
new file mode 100644
index 00000000..f9661967
--- /dev/null
+++ b/tpl/default/fonts/Roboto-Regular.woff2
Binary files differ
diff --git a/tpl/default/import.html b/tpl/default/import.html
index e6e521e8..1f040685 100644
--- a/tpl/default/import.html
+++ b/tpl/default/import.html
@@ -18,6 +18,7 @@
18 <div class="center" id="import-field"> 18 <div class="center" id="import-field">
19 <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}"> 19 <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}">
20 <input type="file" name="filetoupload"> 20 <input type="file" name="filetoupload">
21 <p><br>Maximum size allowed: <strong>{$maxfilesizeHuman}</strong></p>
21 </div> 22 </div>
22 23
23 <div class="pure-g"> 24 <div class="pure-g">
diff --git a/tpl/default/install.html b/tpl/default/install.html
index c5052a26..99aca193 100644
--- a/tpl/default/install.html
+++ b/tpl/default/install.html
@@ -7,6 +7,8 @@
7 7
8{$ratioLabel='1-4'} 8{$ratioLabel='1-4'}
9{$ratioInput='3-4'} 9{$ratioInput='3-4'}
10{$ratioLabelMobile='7-8'}
11{$ratioInputMobile='1-8'}
10 12
11<form method="POST" action="#" name="installform" id="installform"> 13<form method="POST" action="#" name="installform" id="installform">
12<div class="pure-g"> 14<div class="pure-g">
@@ -118,6 +120,22 @@
118 </div> 120 </div>
119 </div> 121 </div>
120 122
123 <div class="pure-g">
124 <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
125 <div class="form-label">
126 <label for="enableApi">
127 <span class="label-name">{'Enable REST API'|t}</span><br>
128 <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span>
129 </label>
130 </div>
131 </div>
132 <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
133 <div class="form-input">
134 <input type="checkbox" name="enableApi" id="enableApi" checked />
135 </div>
136 </div>
137 </div>
138
121 <div class="center"> 139 <div class="center">
122 <input type="submit" value="{'Install'|t}" name="Save"> 140 <input type="submit" value="{'Install'|t}" name="Save">
123 </div> 141 </div>
diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index 714420b7..4d47fcd0 100644
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -258,10 +258,9 @@ window.onload = function () {
258 * Remove CSS target padding (for fixed bar) 258 * Remove CSS target padding (for fixed bar)
259 */ 259 */
260 if (location.hash != '') { 260 if (location.hash != '') {
261 var anchor = document.querySelector(location.hash); 261 var anchor = document.getElementById(location.hash.substr(1));
262 if (anchor != null) { 262 if (anchor != null) {
263 var padsize = anchor.clientHeight; 263 var padsize = anchor.clientHeight;
264 console.log(document.querySelector(location.hash).clientHeight);
265 this.window.scroll(0, this.window.scrollY - padsize); 264 this.window.scroll(0, this.window.scrollY - padsize);
266 anchor.style.paddingTop = 0; 265 anchor.style.paddingTop = 0;
267 } 266 }
diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html
index 61907ddf..7adc7545 100644
--- a/tpl/vintage/configure.html
+++ b/tpl/vintage/configure.html
@@ -117,9 +117,9 @@
117 <tr> 117 <tr>
118 <td valign="top"><b>Enable REST API</b></td> 118 <td valign="top"><b>Enable REST API</b></td>
119 <td> 119 <td>
120 <input type="checkbox" name="apiEnabled" id="apiEnabled" 120 <input type="checkbox" name="enableApi" id="enableApi"
121 {if="$api_enabled"}checked{/if}/> 121 {if="$api_enabled"}checked{/if}/>
122 <label for="apiEnabled">&nbsp;Allow third party software to use Shaarli such as mobile application.</label> 122 <label for="enableApi">&nbsp;Allow third party software to use Shaarli such as mobile application.</label>
123 </td> 123 </td>
124 </tr> 124 </tr>
125 <tr> 125 <tr>
diff --git a/tpl/vintage/import.html b/tpl/vintage/import.html
index 071e1160..bb9e4a56 100644
--- a/tpl/vintage/import.html
+++ b/tpl/vintage/import.html
@@ -5,7 +5,7 @@
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <div id="uploaddiv"> 7 <div id="uploaddiv">
8 Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize} bytes). 8 Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize}).
9 <form method="POST" action="?do=import" enctype="multipart/form-data" 9 <form method="POST" action="?do=import" enctype="multipart/form-data"
10 name="uploadform" id="uploadform"> 10 name="uploadform" id="uploadform">
11 <input type="hidden" name="token" value="{$token}"> 11 <input type="hidden" name="token" value="{$token}">