Change margins and columns for org list and view

nadineproject · Dec 30, 2016 · 638ccbf · 638ccbf
1 parent 623e329
commit 638ccbf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/members/static/css/members.css b/members/static/css/members.css
@@ -215,6 +215,10 @@ p {
 }
 
 /* Body */
+.row.main {
+	margin-bottom: 0;
+}
+
 .messages {
 	margin-top: 3%;
 }
@@ -714,7 +718,7 @@ textarea#id_bio {
 }
 
 .org-list {
-	padding-left: 5%;
+	margin-left: 5%;
 }
 
 .org-card {
@@ -1915,6 +1919,7 @@ footer.sticky-footer {
 }
 
 @media only screen and (max-width: 1100px) {
+
 	p.pf-input.form-url.col.s6.offset-s2, p.cap-label.col.s6.offset-s2  {
 		margin-left: 0;
 	}
@@ -1940,7 +1945,6 @@ footer.sticky-footer {
 		width: 2%;
 	}
 
-
 	#profile_form, #registration_form {
 		margin-left: 2%;
 		min-width: 600px;
@@ -1968,6 +1972,9 @@ footer.sticky-footer {
 	.eModal-content {
 		margin-top: 10%;
 	}
+	.org-list {
+		margin-left: 10%;
+	}
 }
 
 

diff --git a/members/templates/members/calendar.html b/members/templates/members/calendar.html
@@ -124,7 +124,7 @@ <h2 id='add-event-header'>Add Event to Public Calendar</h2>
   <script>
     $(document).ready(function() {
 			$('.button-collapse').sideNav();
-      
+
       $('.timepicker').timepicker({
         timeFormat: 'h:mm p',
         interval: 30,
@@ -211,7 +211,7 @@ <h2 id='add-event-header'>Add Event to Public Calendar</h2>
             center: 'title',
             right: 'month,basicWeek,basicDay'
           };
-          options.defaultView = 'basicWeek';
+          options.defaultView = 'listWeek';
         } else {
           options.header = {
             left: 'prev,next today',

diff --git a/members/templates/members/org_list.html b/members/templates/members/org_list.html
@@ -4,14 +4,23 @@
 {% block sub-title %}Organization | {% endblock %}
 
 {% block style %}
+@media only screen and (max-width: 1100px) {
+	.row .col.offset-s1.s10 {
+		margin-left: 0;
+	}
+
+	.row .col.s10 {
+		width: 100%;
+	}
+}
 {% endblock %}
 
 {% block content %}
 <h3 class='oswald' style='text-align:center;'>Organizations at {{ site.name }}</h3>
 <div class='ui-widget row'>
 	<form class='col s12 m7 l7 offset-m6 offset-l6' id='org-search-form' action="." method='POST'>
 		{% csrf_token %}
-		<input class='col s9' id='org-search' name='terms' type='text' placeholder="Search for an Organization" />
+		<input class='col s8' id='org-search' name='terms' type='text' placeholder="Search for an Organization" />
 		<input class='btn search-btn col s3 m2 l2' type='submit' value='Search' />
 	</form>
 </div>

diff --git a/members/templates/members/org_view.html b/members/templates/members/org_view.html
@@ -37,7 +37,7 @@
       position: absolute;
     }
 
-    .row {
+		.row {
       margin-bottom: 0;
     }
   }