aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2015-02-14 13:49:36 +0100
committernodiscc <nodiscc@gmail.com>2015-02-14 13:49:36 +0100
commit97f7ac4dd496a932ace59b6e316a1089aaf0a267 (patch)
tree541e775e9d4d13903bbbe585f7733490bae09939 /inc
parentaa69403cfff6734243f74a14251afd775bacc11a (diff)
parenta6e0134d07f7a77f1da97d9d563e339057ff8d54 (diff)
downloadShaarli-97f7ac4dd496a932ace59b6e316a1089aaf0a267.tar.gz
Shaarli-97f7ac4dd496a932ace59b6e316a1089aaf0a267.tar.zst
Shaarli-97f7ac4dd496a932ace59b6e316a1089aaf0a267.zip
Merge pull request #109 from nodiscc/version-check
Update README and Shaarli's footer
Diffstat (limited to 'inc')
-rw-r--r--inc/reset.css6
-rw-r--r--inc/shaarli.css9
2 files changed, 7 insertions, 8 deletions
diff --git a/inc/reset.css b/inc/reset.css
new file mode 100644
index 00000000..e29699e2
--- /dev/null
+++ b/inc/reset.css
@@ -0,0 +1,6 @@
1/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */
2/*
3 Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html
4 version: 2.8.2r1
5 */
6html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} \ No newline at end of file
diff --git a/inc/shaarli.css b/inc/shaarli.css
index f6e580ba..bb564e99 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -1,11 +1,4 @@
1/* Cascading Stylesheet for Shaarli - http://sebsauvage.net/wiki/doku.php?id=php:shaarli */ 1/* Cascading Stylesheet for Shaarli - https://github.com/shaarli/Shaarli */
2
3/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */
4/*
5 Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html
6 version: 2.8.2r1
7 */
8html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}
9 2
10body { 3body {
11 font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; 4 font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;