Correct the ability to include a custom CSS style

This commit is contained in:
Tom Slominski
2015-03-22 16:07:58 +00:00
parent 58cbd80d67
commit 8e44c1d06b
4 changed files with 7 additions and 5 deletions

3
.gitignore vendored
View File

@@ -10,9 +10,10 @@
!footer.php !footer.php
!.gitignore !.gitignore
# Specifically ignore the config file and the DS_Store # But specifically ignore these things
public/config.php public/config.php
public/.DS_Store public/.DS_Store
public/custom.css
# Also specifically ignore the phpqrcode cache # Also specifically ignore the phpqrcode cache
public/phpqrcode/cache/* public/phpqrcode/cache/*

View File

@@ -27,6 +27,9 @@ isq_load_textdomain();
<meta name="viewport" content="width=device-width, initial-scale=1"> <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 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 --> <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 --> <!-- App icons generated using http://realfavicongenerator.net -->
<link rel="apple-touch-icon" sizes="57x57" href="public/images/app-icons/apple-touch-icon-57x57.png"> <link rel="apple-touch-icon" sizes="57x57" href="public/images/app-icons/apple-touch-icon-57x57.png">

View File

@@ -8,7 +8,8 @@
ISQ::$general = array( ISQ::$general = array(
'name' => 'URL shortener', // The name of your URL shortener 'name' => 'URL shortener', // The name of your URL shortener
'qr' => TRUE, // Do you want to display a QR code? '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 // MENU LINKS

View File

@@ -391,6 +391,3 @@ header {
#wrap > p { #wrap > p {
color: red; color: red;
} }
/* Importing custom user styles */
@import url("public/user-style.css");