From 6ff691979dd906ff4b4c70b3e5e1bbd4d906b87b Mon Sep 17 00:00:00 2001 From: Marcus Campbell Date: Mon, 20 Dec 2010 22:27:13 -0800 Subject: [PATCH] - .htaccess yoinked from Drupal - Minor CSS tweaks Signed-off-by: Marcus Campbell --- .htaccess | 99 ++++++++++++- scuttle.css | 419 ++++++++++++++++++++++++++-------------------------- 2 files changed, 301 insertions(+), 217 deletions(-) diff --git a/.htaccess b/.htaccess index de83899..cba1f4d 100644 --- a/.htaccess +++ b/.htaccess @@ -1,12 +1,95 @@ -# Rewrite clean URLs onto real files +# +# Apache/PHP settings for Scuttle +# + +# Don't show directory listings for URLs which map to a directory. +Options -Indexes + +# Follow symbolic links in this directory. +Options +FollowSymLinks + +# Force simple error message for requests for non-existent favicon.ico. + + # There is no end quote below, for compatibility with Apache 1.3. + ErrorDocument 404 "The requested file favicon.ico was not found. + + +# Set the default handler. +DirectoryIndex index.php + +# Override PHP settings. + +# PHP 4, Apache 1. + + php_value magic_quotes_gpc 0 + php_value register_globals 0 + php_value session.auto_start 0 + php_value mbstring.http_input pass + php_value mbstring.http_output pass + php_value mbstring.encoding_translation 0 + + +# PHP 4, Apache 2. + + php_value magic_quotes_gpc 0 + php_value register_globals 0 + php_value session.auto_start 0 + php_value mbstring.http_input pass + php_value mbstring.http_output pass + php_value mbstring.encoding_translation 0 + + + +# Requires mod_expires to be enabled. + + # Enable expirations. + ExpiresActive On + + # Cache all files for 2 weeks after access (A). + ExpiresDefault A1209600 + + + # Do not allow PHP scripts to be cached unless they explicitly send cache + # headers themselves. Otherwise all scripts would have to overwrite the + # headers set by mod_expires if they want another caching behavior. + ExpiresActive Off + + + +# Various rewrite rules. - - AcceptPathInfo On - - RewriteEngine On - RewriteBase / + RewriteEngine on + + # If your site can be accessed both with and without the 'www.' prefix, you + # can use one of the following settings to redirect users to your preferred + # URL, either WITH or WITHOUT the 'www.' prefix. Choose ONLY one option: + # + # To redirect all users to access the site WITH the 'www.' prefix, + # (http://example.com/... will be redirected to http://www.example.com/...) + # adapt and uncomment the following: + # RewriteCond %{HTTP_HOST} ^example\.com$ [NC] + # RewriteRule ^(.*)$ http://www.example.com/$1 [L,R=301] + # + # To redirect all users to access the site WITHOUT the 'www.' prefix, + # (http://www.example.com/... will be redirected to http://example.com/...) + # uncomment and adapt the following: + # RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC] + # RewriteRule ^(.*)$ http://example.com/$1 [L,R=301] + + # Modify the RewriteBase if you are using Scuttle in a subdirectory or in a + # VirtualDocumentRoot and the rewrite rules are not working properly. + # For example if your site is at http://example.com/scuttle uncomment and + # modify the following line: + # RewriteBase /scuttle + # + # If your site is running in a VirtualDocumentRoot at http://example.com/, + # uncomment the following line: + # RewriteBase / + + # Rewrite clean URLs onto real files. RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_URI} !=/favicon.ico RewriteCond %{REQUEST_FILENAME}.php -f - RewriteRule ^([^/]+)/?(.*) $1.php/$2 [L] - + RewriteRule ^([^/]+)/?(.*) $1.php/$2 [L,QSA] + \ No newline at end of file diff --git a/scuttle.css b/scuttle.css index b23fad8..c94341c 100644 --- a/scuttle.css +++ b/scuttle.css @@ -1,377 +1,380 @@ /* BASE */ * { - font-family: "trebuchet ms", tahoma, sans-serif; + font-family: helvetica, arial, sans-serif; } a { - color: #47A; - text-decoration: none; + color: #47A; + text-decoration: none; } a:hover { - color: #258; - text-decoration: underline; + color: #258; + text-decoration: underline; } a img { - border: 0; + border: 0; } body { - background-color: #FFF; - margin: 0; - padding: 0; + background-color: #FFF; + margin: 0; + padding: 0; } input[type=text], input[type=password], select, textarea { - border: 1px solid #AAA; - padding: 0.1em; + border: 1px solid #AAA; + padding: .1em; } input[type=text], input[type=password], textarea { - padding: 0.2em; + padding: .2em; } input[type=text]:focus, input[type=password]:focus, select:focus, textarea:focus { - border-color: #666; + border-color: #666; } p.error, p.success { - border: 1px solid; - font-size: small; - margin: 0.5em; - padding: 0.5em; - width: 70%; + border: 1px solid; + font-size: small; + margin: .5em; + padding: .5em; + width: 70%; } p.error { - background: #FCC; - border-color: #966; - color: #633; + background: #FCC; + border-color: #966; + color: #633; } p.success { - background: #CFC; - border-color: #696; - color: #363; + background: #CFC; + border-color: #696; + color: #363; } td#availability { - color: #285; - font-weight: bold; + color: #285; + font-weight: bold; } td#availability.not-available { - color: #F00; + color: #F00; } textarea { - font-size: small; - padding: 0.2em; + font-size: small; + padding: .2em; } th { - padding-right: 1em; - text-align: right; + padding-right: 1em; + text-align: right; } /* HEADER */ div#header { - background: #FFF url('bg_header.png') bottom repeat-x; - border-bottom: 3px solid #9CD; - clear: both; + background: #FFF url('bg_header.png') bottom repeat-x; + border-bottom: 3px solid #9CD; + clear: both; } div#header:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } * html div#header { - height: 1%; + height: 1%; } h1 { - float: left; - font-size: x-large; - font-weight: bold; - letter-spacing: 0.25em; - margin: 0; - padding: 1em; - text-transform: lowercase; + float: left; + font-size: x-large; + font-weight: bold; + margin: 0; + padding: 1em; + text-transform: lowercase; } html > body h1 { - background: url('logo.png') no-repeat 10px; - padding-left: 75px; + background: url('logo.png') no-repeat 10px; + padding-left: 75px; } html > body div#header.popup h1 { - background: url('logo_24.png') no-repeat 10px; - padding: 0.5em 0.5em 0.5em 50px; + background: url('logo_24.png') no-repeat 10px; + padding: .5em .5em .5em 50px; } h1 a { - color: #000; + color: #000; + text-shadow: 2px 2px 2px #9CD; } h1 a:hover { - color: #000; + color: #000; } h2 { - background: #666 url('bg_bar.png') center center repeat-x; - border-bottom: 3px solid #DDD; - clear: both; - color: #DDD; - font-size: medium; - letter-spacing: 0.1em; - margin: 0 0 1em 0; - padding: 0.5em 1em; - text-transform: lowercase; + background: #666 url('bg_bar.png') center center repeat-x; + border-bottom: 3px solid #DDD; + clear: both; + color: #DDD; + font-size: medium; + letter-spacing: .1em; + margin: 0 0 1em 0; + padding: .5em 1em; + text-shadow: 1px 1px 1px #333; + text-transform: lowercase; } /* NAVIGATION */ ul#navigation { - list-style-type: none; - margin: 0; - padding: 1.75em 1em; - text-transform: lowercase; - width: auto; + list-style-type: none; + margin: 0; + padding: 1.9em 1em; + text-transform: lowercase; + width: auto; } ul#navigation a { - font-size: medium; - font-weight: bold; - padding: 0.2em 0.5em; + font-size: medium; + font-weight: bold; + padding: .2em .5em; } ul#navigation a:hover { - background: #7AD; - color: #FFF; + background: #7AD; + color: #FFF; } ul#navigation li { - float: left; + float: left; } ul#navigation li.access { - float: right; + float: right; } /* BOOKMARKS */ ol#bookmarks { - list-style-type: none; - margin: 0; - padding: 0 1em; - width: 70%; + list-style-type: none; + margin: 0; + padding: 0 1em; + width: 70%; } html > body ol#bookmarks { - margin: 0 1em; - padding: 0; + margin: 0 1em; + padding: 0; } div.link a { - color: blue; - font-size: medium; + color: blue; + font-size: medium; } div.link a:visited { - color: purple; + color: purple; } div.meta { - color: #285; + color: #285; } div.meta span { - color: #F00; + color: #F00; } li.xfolkentry { - border-bottom: 1px solid #DDD; - margin-bottom: 0; - padding: 1em 0.5em; + border-bottom: 1px solid #DDD; + margin-bottom: 0; + padding: 1em .5em; } html > body li.xfolkentry { - border-bottom: 1px dotted #AAA; + border-bottom: 1px dotted #AAA; } li.xfolkentry div { - padding: 0.1em; + padding: .1em; } li.xfolkentry.deleted { - opacity: 0.5; + opacity: .5; } li.xfolkentry.private { - border-left: 3px solid #F00; + border-left: 3px solid #F00; } li.xfolkentry.shared { - border-left: 3px solid #FA0; + border-left: 3px solid #FA0; } /* SIDEBAR */ div#sidebar { - font-size: small; - position: absolute; - right: 1em; - top: 10em; - width: 25%; + font-size: small; + position: absolute; + right: 1em; + top: 10em; + width: 25%; } div#sidebar a { - color: #995; + color: #995; } div#sidebar a:hover { - color: #773; + color: #773; } div#sidebar div { - background: #FFF url('bg_sidebar.png') bottom repeat-x; - border: 1px solid #CC8; - color: #555; - margin-bottom: 1em; + background: #FFF url('bg_sidebar.png') bottom repeat-x; + border: 1px solid #CC8; + color: #555; + margin-bottom: 1em; } div#sidebar h2 { - background: transparent; - border: 0; - color: #995; - letter-spacing: 0; - margin: 0; - padding: 0.5em 0; + background: transparent; + border: 0; + color: #995; + letter-spacing: 0; + margin: 0; + padding: .5em 0; + text-shadow: none; } div#sidebar hr { - display: none; + display: none; } div#sidebar p { - margin: 1em; + margin: 1em; } div#sidebar p.tags a { - margin: 0; + margin: 0; } div#sidebar table { - margin: 0.5em 0.5em 0 0.5em; + margin: .5em .5em 0 .5em; } div#sidebar table td { - padding-bottom: 0.25em; - padding-right: 0.5em; + padding-bottom: .25em; + padding-right: .5em; } div#sidebar ul { - list-style-type: none; - margin: 0; - padding: 0.5em; + list-style-type: none; + margin: 0; + padding: .5em; } div#sidebar ul li { - margin: 0.5em 0; + margin: .5em 0; } /* TAGS */ p.tags { - line-height: 2.25em; - margin: 2em 10%; - text-align: justify; - vertical-align: middle; + line-height: 2.25em; + margin: 2em 10%; + text-align: justify; + vertical-align: middle; } p.tags a, p.tags span { - color: #47A; - margin-right: 0.5em; + color: #47A; + margin-right: .5em; } p.tags span:hover { - cursor: pointer; - text-decoration: underline; + cursor: pointer; + text-decoration: underline; } p.tags span.selected { - background: #CEC; + background: #CEC; } /* PROFILE */ table.profile th { - width: 10em; + width: 10em; } /* OTHER GUFF */ dd { - background: #CEC; - border-right: 4px solid #ACA; - color: #464; - padding: 6px; + background: #CEC; + border-right: 4px solid #ACA; + color: #464; + padding: 6px; } dd a { - color: #464; + color: #464; } dd a:hover { - color: #000 !important; - text-decoration: underline !important; + color: #000 !important; + text-decoration: underline !important; } dl { - font-size: small; - margin: 1em; - width: 70%; + font-size: small; + margin: 1em; + width: 70%; } dl#profile dd { - background: #CDE; - border-color: #ABC; - color: #247; + background: #CDE; + border-color: #ABC; + color: #247; } dl#profile dt { - background: #BCE; - border-color: #9AC; - color: #245; - display: block; - font-weight: bold; - padding: 6px; + background: #BCE; + border-color: #9AC; + color: #245; + display: block; + font-weight: bold; + padding: 6px; } dl#profile a { - color: #446; + color: #446; } dl#profile a:hover { - color: #000 !important; - text-decoration: underline !important; + color: #000 !important; + text-decoration: underline !important; } dl#meta dd { - line-height: 1.5em; + line-height: 1.5em; } dl#meta dt { - background: #BDB; - color: #353; - display: block; - font-weight: bold; - padding: 6px; + background: #BDB; + color: #353; + display: block; + font-weight: bold; + padding: 6px; } dt { - border-right: 4px solid #9B9; + border-right: 4px solid #9B9; } dt a { - background: #BDB; - color: #353; - display: block; - font-weight: bold; - padding: 6px; + background: #BDB; + color: #353; + display: block; + font-weight: bold; + padding: 6px; } dt a:hover { - background: #ACA; - border: 0; + background: #ACA; + border: 0; } form { - margin: 0; + margin: 0; } form#search { - background: #FFF; - color: #555; - font-size: small; - margin-bottom: 1em; + background: #FFF; + color: #555; + font-size: small; + margin-bottom: 1em; } form label, form td, form th { - font-size: small; + font-size: small; } form table { - margin: 0 1em; + margin: 0 1em; } h3 { - background: #DDD; - color: #555; - font-size: small; - letter-spacing: 0.2em; - margin: 2em 1em 1em 1em; - padding: 0.25em 0.75em; + background: #DDD; + color: #555; + font-size: small; + letter-spacing: .2em; + margin: 2em 1em 1em 1em; + padding: .5em .75em; + text-shadow: 1px 1px 1px #FFF; } li { - font-size: small; - margin-bottom: 0.5em; + font-size: small; + margin-bottom: .5em; } p { - font-size: small; - margin: 1em; + font-size: small; + margin: 1em; } p#sort { color: #CCC; @@ -380,61 +383,59 @@ p#sort { margin: 0; position: absolute; right: 0; - top: 7em; + top: 6.9em; } html > body p#sort { - margin-right: 0.75em; + margin-right: .75em; } p#sort a { background: #AAA; color: #555; font-weight: normal; - margin-right: 0.5em; + margin-right: .5em; padding: 0 1em; - border-radius: 0.25em; - -moz-border-radius: 0.25em; - -webkit-border-radius: 0.25em; + border-radius: .25em;. } html > body p#sort a { - margin-right: 0; + margin-right: 0; } p#sort a:hover { - background: #CCC; - text-decoration: none !important; + background: #CCC; + text-decoration: none !important; } p#sort span { - display: none; + display: none; } p.paging { - font-size: small; - margin-left: 1em; + font-size: small; + margin-left: 1em; } p.paging a, p.paging span.disable { - background: #888; - color: #FFF; - display: inline; - margin-right: 0.5em; - padding: 0.25em 1em; + background: #888; + color: #FFF; + display: inline; + margin-right: .5em; + padding: .25em 1em; } p.paging a:hover { - background: #666; + background: #666; } p.paging span { - display: none; + display: none; } p.paging span.disable { - background: #DDD; - color: #AAA; + background: #DDD; + color: #AAA; } div.collapsible p.tags { - line-height: 2.25em; - margin: 1em 2em; + line-height: 2.25em; + margin: 1em 2em; } th label { - padding-right: 1em; + padding-right: 1em; } ul { - margin-right: 1em; - width: 75%; + margin-right: 1em; + width: 75%; } -- 2.39.5