From 06d54358a4acc774e9ff754595bfe256d9de59a3 Mon Sep 17 00:00:00 2001
From: Andrew Powers <andrew@pagelines.com>
Date: Thu, 20 Jun 2013 16:48:26 -0700
Subject: [PATCH] Multisite fixes

---
 css/multisite.css              | 39 -------------------------------
 includes/library.templates.php |  4 ----
 less/pl-wordpress.less         | 42 ++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 43 deletions(-)
 delete mode 100644 css/multisite.css

diff --git a/css/multisite.css b/css/multisite.css
deleted file mode 100644
index 7bea7f43..00000000
--- a/css/multisite.css
+++ /dev/null
@@ -1,39 +0,0 @@
-#content.widecolumn{
-	width: 600px;
-	margin: 15px auto;
-}
-
-#multisite_area{
-	font-size: 1.1em;
-	line-height: 1.63em;
-}
-.mu_register h1, .mu_register h2, .mu_register h3{
-	text-align: center;
-	margin: 1.5em;
-}
-
-#multisite_area .mu_alert{
-	margin: 1em 0;
-	font-weight: normal;
-}
-
-.mu_register ul {
-	padding-left: 25px;
-	list-style-type: none;
-}
-
-.mu_register p{
-	font-size: 16px;
-	line-height: 1.6em;
-}
-
-p.submit, p.submit:hover, p.submit:active{
-	background: none;
-	border: none;
-	box-shadow:none;
-}
-
-#multisite_area .mu_register input[type="submit"]{
-	width: auto;
-	padding: 8px 18px;
-}
\ No newline at end of file
diff --git a/includes/library.templates.php b/includes/library.templates.php
index 3108482c..786f2cb9 100644
--- a/includes/library.templates.php
+++ b/includes/library.templates.php
@@ -288,10 +288,6 @@ function pagelines_head_common(){
 	// Allow for extension deactivation of all css
 	if(!has_action('override_pagelines_css_output')){
 
-		// Multisite CSS
-		if(is_multisite())
-			pagelines_load_css_relative('css/multisite.css', 'pagelines-multisite');
-
 		// Allow for PHP include of Framework CSS
 //		if( !apply_filters( 'disable_pl_framework_css', '' ) )
 //			pagelines_load_css(  PL_PARENT_URL.'/style.css', 'pagelines-framework', pagelines_get_style_ver( true ));
diff --git a/less/pl-wordpress.less b/less/pl-wordpress.less
index a9311c3c..b4aa2b7f 100644
--- a/less/pl-wordpress.less
+++ b/less/pl-wordpress.less
@@ -352,6 +352,48 @@ p.form-allowed-tags{
 
 }
 
+// ----------------------------------------------------------------------
+// MULTISITE
+// ----------------------------------------------------------------------
+
+#multisite_area{
+	font-size: 1.1em;
+	line-height: 1.63em;
+	.mu_register {
+		width: auto;
+		input[type="submit"]{
+			width: auto;
+			padding: 8px 18px;
+			font-size: @buttonFontSize;
+			font-family: @buttonFontFamily;
+		}
+		h1, h2, h3{
+			margin: 1em 0 .5em 0;
+		}
+		ul {
+			padding-left: 25px;
+			list-style-type: none;
+		}
+		p{
+			font-size: 16px;
+			line-height: 1.6em;
+			&.submit, 
+			&.submit:hover, 
+			&.submit:active{
+				background: none;
+				border: none;
+				box-shadow:none;
+				padding: 0;
+			}
+		}
+	}
+	.mu_alert{
+		margin: 1em 0;
+		font-weight: normal;
+	}
+}
+
+
 // ----------------------------------------------------------------------
 // Special/Misc WordPress Stuff
 // ----------------------------------------------------------------------