From 1eca0cb514eac14adef7fbc2473425542705a393 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Wed, 29 Aug 2012 14:54:13 +0100 Subject: [PATCH] 1.3 --- public/CHANGELOG | 6 ++ public/README | 9 ++- public/config.php | 13 ++-- public/mobile.css | 79 ++++++++++++++++++++ public/normal.css | 183 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 280 insertions(+), 10 deletions(-) create mode 100644 public/CHANGELOG create mode 100644 public/mobile.css create mode 100644 public/normal.css diff --git a/public/CHANGELOG b/public/CHANGELOG new file mode 100644 index 0000000..8d455a8 --- /dev/null +++ b/public/CHANGELOG @@ -0,0 +1,6 @@ +----------------- 1.3 ---------------- +- Added a mobile version of the theme which can be disabled in the config file +- Discreet gradient in the menu +- New Google+ sharer +- Bookmarklet code updated with code with YOURLS 1.5 +- Usual assortment of bug fixes, cleaned up code etc. diff --git a/public/README b/public/README index 4b2e5e5..5d1f966 100644 --- a/public/README +++ b/public/README @@ -1,11 +1,12 @@ -Infinity Squared, a beautiful theme for YOURLS, by Tom Slominski (http://tomslominski.net/) +Infinity Squared, a beautiful theme for YOURLS, by Tom Slominski (http://tomslominski.net/infinity-squared/) -See the project's page to view the latest installation and upgrade instructions -as well as the latest news on the project -http://tomslominski.net/infinity-squared/ +See the project's Wiki pages at GitHub for the latest installation instructions +https://github.com/tomslominski/infinity-squared qTip 2 is dual licensed under MIT or GPLv2 licenses http://en.wikipedia.org/wiki/MIT_License http://en.wikipedia.org/wiki/GNU_General_Public_License Formalize and the theme itself are also licenced on GPLv2. + +To update the theme from a previous version, backup your public/config.php and merge changes from new config.php file into your old one, keeping your old config the same. Next, delete public/, upload new files (replacing the old ones if there's any left) and restore your modified config.php. diff --git a/public/config.php b/public/config.php index faed3a6..57226d5 100644 --- a/public/config.php +++ b/public/config.php @@ -2,17 +2,18 @@ // General settings // 1 to enable, 0 to disable ISQ::$general = array( - 'name' => 'Edit public/config.php to set up ∞²', // The name of your URL shortener - 'qr' => 1 // Do you want to display a QR code? + 'name' => 'kwl.me', // The name of your URL shortener + 'qr' => 1, // Do you want to display a QR code? + 'mobile' => 1 // Do you want to display a QR code? ); // Menu- The width of ∞² menu allows you to have about 10 links // Leave empty to disable ISQ::$links = array( - 'name_1' => '', - 'url_1' => '', - 'name_2' => '', - 'url_2' => '', + 'name_1' => 'Blog', + 'url_1' => 'http://tomslominski.net/', + 'name_2' => 'Get ∞²!', + 'url_2' => 'http://tomslominski.net/infinity-squared/', 'name_3' => '', 'url_3' => '', 'name_4' => '', diff --git a/public/mobile.css b/public/mobile.css new file mode 100644 index 0000000..209d1c3 --- /dev/null +++ b/public/mobile.css @@ -0,0 +1,79 @@ +body { + background:white; + color:#000; + font-family:'Ubuntu', sans-serif, Helvetica, Arial; + font-size: 62.5%; + width:100%; + margin:0; +} +a { + color:#013F6D; + text-decoration:none; +} +a:visited { + color:#013F6D; + text-decoration:none; +} +p { + font-size: 1.2em; +} +h1 { + background: url(img/noise.png) #013F6D; + width:100%; + text-align:center; + color:white; + font-size:7em; + border-top:4px #000 solid; + margin:0; + top:0 +} +h1 a, h1 a:visited { + color:white; +} +/* Menu */ +.menu { + background: #000000; /* Old browsers */ + background: -moz-linear-gradient(top, #000000 0%, #141414 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #000000 0%,#141414 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #000000 0%,#141414 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #000000 0%,#141414 100%); /* IE10+ */ + background: linear-gradient(to bottom, #000000 0%,#141414 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#141414',GradientType=0 ); /* IE6-9 */ + display: block; + float: left; + margin:0; + padding:0; + width:100%; + color:#FFF; + font-size:1.2em; + border-bottom:1px grey solid; + margin-bottom:4%; +} +.menu a { + color: #FFF; + text-decoration: none; + display: block; +} +.menu li { + list-style: none; + float: left; + line-height:38px; + padding: 1% 3%; +} + +/* Getting down to business */ +.paragraph { + padding-left: 2%; +} +input { + width:98%; + margin-top:-10px; +} + +/* Footer */ +footer { + padding-left: 2%; + line-height:150%; + margin-bottom:0; + text-align:center; +} diff --git a/public/normal.css b/public/normal.css new file mode 100644 index 0000000..95cac23 --- /dev/null +++ b/public/normal.css @@ -0,0 +1,183 @@ +/* Main */ +body { + background:#F1F1F1; + color:#000; + font-family:'Ubuntu', sans-serif, Helvetica, Arial; + font-size: 62.5%; +} +::selection { + background: #013F6D; /* Safari */ + color:#FFF; +} +::-moz-selection { + background: #013F6D; /* Firefox */ + color:#FFF; +} +h2 { + color:#000; + margin-bottom:-8px; +} +a { + color:#013F6D; + text-decoration:none; +} +a:visited { + color:#013F6D; + text-decoration:none; +} +p { + font-size: 1.2em; +} +/* Header */ +.header { + width:95%; + padding:2.5%; + margin: 0 auto; +} +h1 { + background: url(img/noise.png) #013F6D; + width:100%; + text-align:center; + color:#FFFFFF; + font-size:7em; + border-top:4px #000 solid; + margin-top:0; + margin-bottom:0; +} +h1 a { + color:#FFF; + text-decoration:none; +} +h1 a:hover { + border-bottom: #FFF 1px dashed; +} +h1 a:visited { + color:#FFF; + text-decoration:none; +} +.menu { + background: #000000; /* Old browsers */ + background: -moz-linear-gradient(top, #000000 0%, #141414 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #000000 0%,#141414 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #000000 0%,#141414 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #000000 0%,#141414 100%); /* IE10+ */ + background: linear-gradient(to bottom, #000000 0%,#141414 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#141414',GradientType=0 ); /* IE6-9 */ + display: block; + float: left; + margin: 0 auto; + width:96%; + color:#FFF; + padding: 0 2% 0 2%; + margin-bottom:30px; + font-size:1.2em; +} +.menu a { + color: #FFF; + text-decoration: none; + line-height:38px; + display: block; + padding: 0 10px; +} +.menu a:hover { + background:#292929; +} +.menu li { + list-style: none; + float: left; + line-height:38px; + width:auto; +} +/* Container */ +#container { + width: 60%; + margin-left: auto; + margin-right: auto; + background-color: #FFF; + margin-top: 20px; +} +.paragraph { + padding:0 2.5% 0 2.5%; +} +.right { + width: 60%; + float: right; +} +.bookmarklet { + border-radius: 11px; + background: #ddd url(../img/button.png) repeat-x; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(1, #ddd)); + background: -moz-linear-gradient(top center, #fff 0%, #ddd 100%); + border: 1px solid; + border-color: #ddd #bbb #999; + cursor: pointer; + color: #333; + font: bold 12px/1.2 Arial, sans-serif; + outline: 0; + overflow: visible; + padding: 3px 10px 4px; + text-shadow: #fff 0 1px 1px; + width: auto; + text-decoration:none; +} +/* Tooltips */ +.ui-tooltip-titlebar, +.ui-tooltip-content{ + border-color: #013F6D; + background-color: #013F6D; + color: #FFF; +} +/* Output */ +.output { + border: 3px #013F6D solid; + padding: 4px; + background: url(img/noise.png); + border-radius: 10px; + width:600px; +} +.output p { + margin:2px; +} +.output a, .output a:visited { + color:#013F6D; + text-decoration:none; +} +.output a:hover { + border-bottom: #013F6D 1px dashed; +} +.share-button, .twitter-share-button { + padding-right:3px; +} +/* Footer */ +.footer { + text-align:center; + border-top:3px solid #000; + margin-top:30px; +} +.footer p { + padding:20px 0 20px 0; + margin:0 auto; +} +.footer a { + color:#013F6D; +} +.footer a:hover { + text-decoration:none; + border-bottom:dashed 1px #013F6D; +} +.footer a:visited { + color:#013F6D; +} +/* Other */ +div#copybox { + width:600px; + height:auto; +} +div#sharebox { + height:auto; + width:600px; + margin-top: 20px +} +.error { + color:red; +}