From 42b376a1ffc3738641ac3022917c2f62817a8de4 Mon Sep 17 00:00:00 2001
From: Máirín Duffy <duffy@redhat.com>
Date: Jul 26 2016 20:50:07 +0000
Subject: some padding / alignment adjustments so things line up with vertical nav


---

diff --git a/hubs/static/css/style.css b/hubs/static/css/style.css
index 09d6be9..f8636d6 100644
--- a/hubs/static/css/style.css
+++ b/hubs/static/css/style.css
@@ -77,17 +77,23 @@
       right: 0;
       z-index: 2;
     }*/
+    
+    /* line up header with cards below */
+    header .container {
+	padding-left: 1.75rem !important;
+	}
 
     header img.avatar {
         width: 70px;
         float: left;
-        margin: 0 15px;
+        margin-right: 15px;
         display: inline;
         border: 5px solid #fff;
     }
 
     header h2 {
         font-weight: 500;
+        padding-top: .5rem;
     }
 
     header a, header a:hover, .header a:focus {
@@ -98,7 +104,7 @@
       margin: 5px 5px 0 0;
     }
     .row {
-      padding: 5px;
+      padding-top: 5px;
       margin: auto 0px;
     }
     .padded {
@@ -133,6 +139,7 @@
       padding: 5px;
       /* TODO -- lots more nice styling here... */
     }
+
     .panel {
       visibility: hidden;
       max-height: 0px;
@@ -381,3 +388,19 @@ font-size: 32pt;
   height: 2em;
   width: 2em;
 }
+
+
+/** fedora bootstrap overrides **/
+
+/** tightening up card headers - they are too fat imho **/
+.card-header {
+  padding: 0.3rem 0.5rem;
+}
+
+
+/** too much padding over the user's subheader, was attached to .m-b-1 with 
+ * !important so difficult to override **/
+
+header h5.m-b-1 {
+  margin-top: 0.5rem!important;
+}
diff --git a/hubs/templates/hubs.html b/hubs/templates/hubs.html
index f384e37..99418cb 100644
--- a/hubs/templates/hubs.html
+++ b/hubs/templates/hubs.html
@@ -5,16 +5,55 @@
 
   <header class="p-t-2">
     <div class="container">
-      {% if hub.user_hub %}
-	    <img src="{{ hub.avatar }}" class="avatar" />
-		<h2 class="user m-b-0">{{ hub.name }}</h2>
-		<h5 class="m-t-1 m-b-1">{{ hub.summary }}</h5>
-	    <div class="clearfix"></div>
-      {% else %}
-      <h2 class="team">{{ hub.name }}</h2>
-      <h5 class="m-t-1 m-b-1">{{ hub.summary }}</h5>
-	  {% endif %}
+		
+	  <!-- Left side of header -->
+	  <div class="col-md-8">
+        {% if hub.user_hub %}
+	      <img src="{{ hub.avatar }}" class="avatar" />
+		  <h2 class="user m-b-0">{{ hub.name }}</h2>
+		  <h5 class="m-t-1 m-b-1">{{ hub.summary }}</h5>
+	      <div class="clearfix"></div>
+        {% else %}
+        <h2 class="team">{{ hub.name }}</h2>
+        <h5 class="m-t-1 m-b-1">{{ hub.summary }}</h5>
+	    {% endif %}
+	  </div>
+
+      <!-- right side of header -->
+      <div class="col-md-4 header-right">
+{% if g.auth.logged_in and hub.is_admin(g.auth.user) %}
+        {% if not edit %}
+          <div class="dropdown edit pull-xs-right showpointer">
+            <span class="dropdown-toggle edit-this-page" type="button"
+                  id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true"
+                  aria-expanded="true">
+              <span class="oi" data-glyph="pencil"></span> edit this page
+            </span>
+            <div class="dropdown-menu" aria-labelledby="dropdownMenu2">
+              <a class="dropdown-item" href="#">Customize Header</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item"
+                  href="{{ url_for('hub_edit', name=hub.name) }}">
+                Configure Hub
+              </a>
+              {% if not hub.user_hub %}
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item" href="#">Manage Members</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item" href="#">Archive Hub</a>
+              {% endif %}
+            </div>
+          </div>
+        {% else %}
+          <div id="save_edits_btn" class="pull-xs-right">
+            <span class="oi" data-glyph="data-transfer-download"></span>
+            Save changes
+          </div>
+        {% endif %}
+  {% endif %}
+  </div>
   	</div>
+
   </header>
 
 
@@ -45,39 +84,7 @@
 {%- endwith -%}
 
 <div class="container">
-  {% if g.auth.logged_in and hub.is_admin(g.auth.user) %}
-      <div class="row">
-        {% if not edit %}
-          <div class="dropdown edit pull-xs-right showpointer">
-            <span class="dropdown-toggle edit-this-page" type="button"
-                  id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true"
-                  aria-expanded="true">
-              <span class="oi" data-glyph="pencil"></span> edit this page
-            </span>
-            <div class="dropdown-menu" aria-labelledby="dropdownMenu2">
-              <a class="dropdown-item" href="#">Customize Header</a>
-              <div class="dropdown-divider"></div>
-              <a class="dropdown-item"
-                  href="{{ url_for('hub_edit', name=hub.name) }}">
-                Configure Hub
-              </a>
-              {% if not hub.user_hub %}
-              <div class="dropdown-divider"></div>
-              <a class="dropdown-item" href="#">Manage Members</a>
-              <div class="dropdown-divider"></div>
-              <a class="dropdown-item" href="#">Archive Hub</a>
-              {% endif %}
-            </div>
-          </div>
-        {% else %}
-          <div id="save_edits_btn" class="pull-xs-right">
-            <span class="oi" data-glyph="data-transfer-download"></span>
-            Save changes
-          </div>
-        {% endif %}
-      </div>
-  {% endif %}
-
+  
   <div class="row">
 	  
     <div class="col-md-{{ hub.left_width }}">