From 67accf5f96bde6b6a49c74dd96e545c77466ea10 Mon Sep 17 00:00:00 2001
From: ptrourke <ptrourke@users.noreply.github.com>
Date: Wed, 12 Nov 2014 11:46:50 -0500
Subject: [PATCH] Revert layout.css changes; some styles apparently WERE still
 used.

---
 .../exhibit/static/freemix/css/layout.css     | 119 ++++++++++++++++++
 viewshare/urls.py                             |   2 +-
 2 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/viewshare/apps/exhibit/static/freemix/css/layout.css b/viewshare/apps/exhibit/static/freemix/css/layout.css
index bd58e0d3..9021c8eb 100644
--- a/viewshare/apps/exhibit/static/freemix/css/layout.css
+++ b/viewshare/apps/exhibit/static/freemix/css/layout.css
@@ -1,3 +1,122 @@
+/**
+* TODO: PyCharm is not finding all uses of layout.css styles.
+*
+*/
+
+
+/**
+ * From http://matthewjamestaylor.com/blog/perfect-3-column.htm
+ * and accompanying other layouts.  Parts irrelevant to layout
+ * excised, some clear: attributes removed to better fit with
+ * embedding.
+ */
+
+
+
+.colhead {
+	float: left;
+	width: 98%;
+    padding: 0.25em 1%;
+    }
+
+.colmask {
+	position: relative;
+	float: left;
+	width: 100%;
+	overflow: hidden;
+	}
+/* common column settings */
+
+ .colright,
+.colmid,
+.colleft {
+	float: left;
+	width: 100%;
+	position: relative;
+	}
+
+.col1,
+.col2,
+.col3 {
+	float: left;
+	position: relative;
+	padding: 0 0 1em 0;
+	}
+/* Three-column settings */
+.threecol .colmid {
+	right: 25%;
+	}
+
+.threecol .colleft {
+	right: 50%;
+	}
+
+.threecol .col1 {
+	width: 46%;
+	left: 102%;
+	}
+
+.threecol .col2 {
+	width: 21%;
+	left: 31%;
+	}
+
+.threecol .col3 {
+	width: 21%;
+	left: 85%;
+	}
+/* Two-column right focus */
+.leftmenu .colleft {
+    right: 75%;
+    }
+
+.leftmenu .col1 {
+    left: 102%;
+    width: 71%;
+    }
+
+.leftmenu .col2 {
+    left: 6%;
+    width: 21%;
+    }
+/* Two-column left focus */
+.rightmenu .colleft {
+    right: 25%;
+    }
+
+.rightmenu .col1 {
+    left: 27%;
+    width: 71%;
+    }
+
+.rightmenu .col2 {
+    left: 31%;
+    width: 21%;
+    }
+/* Two equal columns */
+.doublepage .colleft {
+    right: 50%;
+    }
+
+.doublepage .col1 {
+    left: 52%;
+    width: 46%;
+    }
+
+.doublepage .col2 {
+    left: 56%;
+    width: 46%;
+    }
+/* One-column */
+.fullpage .col1 {
+    left: 2%;
+    width: 96%;
+    }
+
+
+
+
+
 /*!
  * Bootstrap Responsive v2.3.2
  *
diff --git a/viewshare/urls.py b/viewshare/urls.py
index 8c7e5b60..b3ac2406 100644
--- a/viewshare/urls.py
+++ b/viewshare/urls.py
@@ -63,7 +63,7 @@
 urlpatterns += patterns('',
 
 
-    #Old help page URLs. OK to use optional trailing slash on redirects; avoid it on template views. 
+    #Old help page URLs. OK to use optional trailing slash on redirects; avoid it on template views.
 
     url(r'^import/?$',
         RedirectView.as_view(url="http://viewshare.uservoice.com/knowledgebase/articles/243875-importing-data-into-viewshare"),