Permalink
Browse files

Hopefully fix #80, remove unused CSS/skin stuff, shrink CSS.

  • Loading branch information...
1 parent 278ab6f commit a025e04b7c6ada84e98c0fc30ffaf03b0d8479b0 @dracos dracos committed Jul 14, 2011
View
@@ -19,7 +19,8 @@ RewriteEngine on
#RewriteLogLevel 3
# Channel 4 branded pages
-RewriteRule ^/mps/(c4|c4x)/$ /mps/index.php?$1=1 [QSA]
+RewriteRule ^/mps/(c4|c4x)/$ /mps/ [R]
+RewriteRule ^/mp/(c4|c4x)/(['a-zA-Z_+-]+)/([\(\)\.a-zA-Z_+,'-]+)$ /mp/$2/$3 [R]
# List of rep pages
RewriteRule ^/(msp|mla|peer)s/$ /mps/index.php?$1=1 [QSA]
@@ -53,7 +54,6 @@ RewriteRule ^/(peer|royal|mla|msp)/(.+) /mp/$2?$1=1 [QSA]
RewriteRule ^/calendar/([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])$ /calendar/index.php?d=$1
# MP pages
-RewriteRule ^/mp/(c4|c4x)/(['a-zA-Z_+-]+)/([\(\)\.a-zA-Z_+,'-]+)$ /mp/index.php?$1=1&n=$2&c=$3
RewriteRule ^/mp/(['a-zA-Z_+-]+)/([\(\)\.a-zA-Z_+,'-]+)$ /mp/index.php?n=$1&c=$2 [QSA]
RewriteRule ^/mp/(['a-zA-Z_\ +-]+)\ mp/?$ /mp/index.php?n=$1 [QSA]
RewriteRule ^/mp/(['a-zA-Z_\ +-]+)/?$ /mp/index.php?n=$1 [QSA]
View
@@ -1,32 +0,0 @@
-<?php
-
-$this_page = "skin";
-
-include_once "../../includes/easyparliament/init.php";
-
-$PAGE->page_start();
-
-$PAGE->stripe_start();
-
-$URL = new URL($this_page);
-
-?>
-
-<ul>
-
-<?php $URL->insert(array('newskin'=>'default')); ?>
-<li><a href="<?php echo $URL->generate(); ?>">Default skin.</a></li>
-
-<?php $URL->insert(array('newskin'=>'none')); ?>
-<li><a href="<?php echo $URL->generate(); ?>">No stylesheets.</a></li>
-
-</ul>
-
-
-<?php
-
-$PAGE->stripe_end();
-
-$PAGE->page_end();
-
-?>
@@ -1,7 +0,0 @@
-body {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- }
-
-h2, h3, h4, h5, p, th, td, caption {
- font-family: Verdana, Arial, Helvetica, sans-serif;
-}
@@ -1,14 +0,0 @@
-body {
- font-family: Arial, Helvetica, sans-serif;
- }
-
-h2, h3, h4, h5, p, th, td, caption {
- font-family: Arial, Helvetica, sans-serif;
-}
-
-.error {
- color: #133885;
- }
-/*
-.block h4 { background-color: #FFFFFF }
-*/
@@ -1,149 +0,0 @@
-body {
- width: 770px;
-}
-
-h2 {
- color: #133885;
- }
-
-h3 {
- color: #133885;
- }
-
-h4 {
- color: #FF6600;
- }
-
-a {
- color: #FF6600;
- font-weight: bold;
-}
-
-a:visited {
- color: #999999;
- font-weight: bold;
- }
-a:active, a:hover {
- color: #7a619f;
- font-weight: bold;
-}
-
-li {
- margin: 0 0 0.5em 1.2em;
- color: #133885;
- }
-
-input.submit {
- font-weight: bold;
- color: #133885;
- }
-
-#title {
- padding: 0;
- }
-
-#search {
- background-color: #658CDD;
- }
-
-#menu {
- background-color: #133885;
- }
-
-#footer {
- background-color: #133885;
- color: #FFFFFF;
- }
-
-#bottommenu {
- background-color: #658CDD;
- }
-
-#topmenu a,
-#bottommenu a {
- background: #133885;
- color: #FFFFFF;
- }
-
-#bottommenu a {
- border: 1px solid #658cdd; /* not #133885 */
- background: #658cdd; /* not #133885 */
- color: #fff;
- }
-
-#topmenu a.on,
-#topmenu a:hover {
- background: #658CDD;
- color: #fff;
- }
-
-#topmenu a.on {
- border-bottom: 1px solid #658cdd; /* not #133885 */
- }
-
-div.stripe-side {
- background: #FF6600;
- }
-
-div.stripe-2,
-div.stripe-2-on {
- background: #FFDE00;
- }
-
-div.stripe-2 div.main,
-div.stripe-2-on div.main {
- background: #FFDE00;
- }
-div.main p.italic,
-div.main p.indentitalic {
- color: #133885;
- }
-
-
-div.block {
- border: 1px solid #133885;
- }
-
-div.block h4 {
- background: #133885;
- color: #658CDD;
- }
-
-div.block div.blockbody {
- background-color: #FFFFFF;
- }
-
-div.sidebar div.block {
- border: 1px solid #133885;
- }
-div.sidebar div.block h4 {
- background: #133885;
- color: #fff;
- }
-div.extra a {
- color: #FF6600;
- }
-table.people th {
- background: #133885;
- color: #FFFFFF;
- }
-table.people td.row-1 {
- background: #658CDD;
- }
-table.people td.row-2 {
- background: #FF6600;
- }
-table.people td.row-1 a, table.people td.row-2 a {
- color: #000000;
-}
-table.people td.row-1 a:hover, table.people td.row-2 a:hover {
- color: #7a619f;
-}
-
-#topmenu {
- padding-right: 5px;
-}
-#topmenu ul {
- margin-left: 5px;
-}
-
Oops, something went wrong.

0 comments on commit a025e04

Please sign in to comment.