Org name and edit links on same row

nadineproject · Dec 30, 2016 · e6c95de · e6c95de
1 parent a885727
commit e6c95de
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/members/static/css/members.css b/members/static/css/members.css
@@ -2184,6 +2184,7 @@ footer.sticky-footer {
 
 	.org-right-profile {
 		min-width: 515px;
+		padding-left: 0 !important;
 	}
 
 	.fc-center {
@@ -2205,12 +2206,6 @@ footer.sticky-footer {
 	}
 }
 
-@media only screen and (max-width: 510px) {
-	.org-img img {
-		/*Stop it from sliding across the screen*/
-	}
-}
-
 @media only screen and (max-width: 450px) {
 	.org-card {
 		margin-left: 0;

diff --git a/members/templates/members/org_view.html b/members/templates/members/org_view.html
@@ -80,21 +80,23 @@ <h4>Edit Organization Picture</h4>
   </div>
 </div>
 
-<div class='org-right-profile col s8 m8 l9'>
+<div class='org-right-profile col s12 m8 l9'>
 	<div class='org-info'>
-		<h3 class='oswald col s10' style='margin-bottom:1%;'>{{ organization.name }}</h3>
-		<div>
-			{% if organization.locked %}
-				<div class='col s1 tooltipped' data-position="bottom" data-tooltip='Locked'>
-					<img id='locked' alt='locked icon' src="{% static 'img/locked.png' %}"/>
-				</div>
-			{% endif %}
-			{% if can_edit %}
-				<a class='col s1 tooltipped' data-position="bottom" data-tooltip="Edit Details" href="{% url 'member_org_edit' organization.id %}"><img id='edit' alt='edit icon' style='height:30px;' src="{% static 'img/edit.png' %}"/></a>
-			{% endif %}
-			{% if request.user.is_staff %}
-				<a class='col s1 tooltipped' data-position="bottom" data-tooltip='Admin' href="{{ organization.admin_url }}"><img id='admin' alt='admin icon' src="{% static 'img/admin.png' %}"/></a>
-			{% endif %}
+		<div class='row'>
+			<h3 class='oswald col s9' style='margin-bottom:1%;'>{{ organization.name }}</h3>
+			<div>
+				{% if organization.locked %}
+					<div class='col s1 tooltipped' data-position="bottom" data-tooltip='Locked'>
+						<img id='locked' alt='locked icon' src="{% static 'img/locked.png' %}"/>
+					</div>
+				{% endif %}
+				{% if can_edit %}
+					<a class='col s1 tooltipped' data-position="bottom" data-tooltip="Edit Details" href="{% url 'member_org_edit' organization.id %}"><img id='edit' alt='edit icon' style='height:30px;' src="{% static 'img/edit.png' %}"/></a>
+				{% endif %}
+				{% if request.user.is_staff %}
+					<a class='col s1 tooltipped' data-position="bottom" data-tooltip='Admin' href="{{ organization.admin_url }}"><img id='admin' alt='admin icon' src="{% static 'img/admin.png' %}"/></a>
+				{% endif %}
+			</div>
 		</div>
 		<div class='col s12'>
 			<p style="font-style:italic;">