Fix grid, complete and clean up merge of scss-refactor and gui branch…

…, complete login, registration, edit profile, profile view, beginning course view
dmastylo · Oct 27, 2013 · d469ddb · d469ddb
1 parent 5bc4444
commit d469ddb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/main/c2g/static/css/common.scss b/main/c2g/static/css/common.scss
@@ -1,5 +1,4 @@
 @import "core/foundation";
-@import "datepicker";
 
 /**** UTILITIES ****/
 	/** Variables **/ 
@@ -148,58 +147,53 @@ nav.subpage-navbar {
 		@extend .sans;
 		@extend .light;
 	}
-/**
-	general link bar styles
-**/
-nav.top-bar{
+}
 
+/** general link bar styles **/
+nav.top-bar{
 	color: #fff;
-
 	@include grid-row;
-
 	header > span{
-		text-shadow: 1px -1px #000;margin-right:15px;
+		text-shadow: 1px -1px #000;
+		margin-right:15px;
 	}
-
-	a{
+	a {
 		display:inline-block;
 		padding:0em 1em 0em 1em;
 		color:#fff;
 		&.active{
-			color:#fff;pointer-events:none; cursor:default;
+			color:#fff;
+			pointer-events:none;
+			cursor:default;
 		}
 	}
 }
 
 div.red-bar-container, nav.red-bar{
-	background-color:#5B0000;
+	background-color: #5B0000;
 }
 nav.red-bar{
-
-	a{
+	a {
 		color:#ddd;
-
 		&:hover{
 			background-color: #761E1E;
 		}
-
 		&.active{
-			border-bottom: 6px solid #666;background-color:#470000;
+			border-bottom: 6px solid #666;
+			background-color:#470000;
 		}
-
 	}
 }
+
 div.grey-bar-container, nav.grey-bar{
 	background-color: #222;
 }
 nav.grey-bar{
-
-	a{
+	a {
 		&:hover{
 			background-color: #444;
 		}
 	}
-
 }
 
 #logged-in {
@@ -455,12 +449,10 @@ nav.grey-bar{
 }
 
 footer {
-
 	background-color: $brand-secondary;
 	padding-top: 2em;
 	padding-bottom: 2em;
 	font-size: 1em;
-
 	.brand {
 		@include grid-row();
 	}
@@ -649,6 +641,4 @@ footer {
 		@extend .dashboard-module-content;
 		a {margin-bottom: 0;}
 	}
-}
-
-@import "forms";
+}
diff --git a/main/templates/base.html b/main/templates/base.html
@@ -10,7 +10,6 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel='shortcut icon' type='image/x-icon' href='{{ STATIC_URL }}graphics/sites/{{ SITE_NAME_SHORT }}/favicon.ico' />
     {% block top_scripts %}
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/core/analogclock.css" />
     {% load compress %}
     {% compress css %}
     <link type="text/x-scss" rel="stylesheet" href="{{ STATIC_URL }}css/common.scss" />
@@ -144,11 +143,7 @@ <h1>Current courses available for signup</h1>
                 	{% endfor %}
                 {% endblock %}
 
-                <div class="row">
-                    <div class="large-12 main-column">
-                    {% block m_column_content %}{% endblock %}
-                    </div>
-                </div>
+                {% block m_column_content %}{% endblock %}
 
                 {% block r_column_content %}{% endblock %}
         {% endblock content %}

diff --git a/main/templates/course_base.html b/main/templates/course_base.html
@@ -140,7 +140,6 @@ <h2 id="main-nav-heading" class="hidden-accessible">{% trans 'Course Sections' %
                     {% endif %}
                 {% endif %}
             </ul>
-            <!-- <div id="PacTime" class="pull-right">{% now "jS M, Y - g:i A T" %}</div>-->
         </div>
     </div>
 </div>
-Original file line number
+Diff line change
@@ Expand Up @@
                         {% endif %}
                     {% endif %}
                 </ul>
-                <!-- <div id="PacTime" class="pull-right">{% now "jS M, Y - g:i A T" %}</div>-->
             </div>
         </div>
     </div>
@@ Expand Down @@