From 8e44c1d06b1452238f832d70d75e522cf0ae4a9e Mon Sep 17 00:00:00 2001
From: Tom Slominski <tomslominski@gmail.com>
Date: Sun, 22 Mar 2015 16:07:58 +0000
Subject: [PATCH] Correct the ability to include a custom CSS style

---
 .gitignore               | 3 ++-
 header.php               | 3 +++
 public/config-sample.php | 3 ++-
 public/style.css         | 3 ---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00957ca..f9e2d43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,10 @@
 !footer.php
 !.gitignore
 
-# Specifically ignore the config file and the DS_Store
+# But specifically ignore these things
 public/config.php
 public/.DS_Store
+public/custom.css
 
 # Also specifically ignore the phpqrcode cache
 public/phpqrcode/cache/*
diff --git a/header.php b/header.php
index c9046f7..037186b 100644
--- a/header.php
+++ b/header.php
@@ -27,6 +27,9 @@ isq_load_textdomain();
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
 		<link rel="stylesheet" href="<?php echo YOURLS_SITE; ?>/public/style.css" /><!-- Theme CSS -->
+		<?php if ( ISQ::$general['customstyle'] ) { ?>
+			<link rel="stylesheet" href="<?php echo YOURLS_SITE; ?>/public/custom.css" /><!-- Custom CSS -->
+		<?php } ?>
 
 		<!-- App icons generated using http://realfavicongenerator.net -->
 		<link rel="apple-touch-icon" sizes="57x57" href="public/images/app-icons/apple-touch-icon-57x57.png">
diff --git a/public/config-sample.php b/public/config-sample.php
index 475fbe3..6d65a38 100644
--- a/public/config-sample.php
+++ b/public/config-sample.php
@@ -8,7 +8,8 @@
 ISQ::$general = array(
 	'name' => 'URL shortener', // The name of your URL shortener
 	'qr' => TRUE, // Do you want to display a QR code?
-	'clipboard' => 1 // Do you want to enable zeroClipboard? (uses flash)
+	'clipboard' => 1, // Do you want to enable zeroClipboard? (uses flash)
+	'customstyle' => TRUE // Do you want to enable the custom stylesheet, found in public/custom.css?
 );
 
 // MENU LINKS
diff --git a/public/style.css b/public/style.css
index 2824864..7f37fe0 100644
--- a/public/style.css
+++ b/public/style.css
@@ -391,6 +391,3 @@ header {
 #wrap > p {
 	color: red;
 }
-
-/* Importing custom user styles */
-@import url("public/user-style.css");