From 3bb58e6f0a10a81bd19d6a89b6f092b54afa52c9 Mon Sep 17 00:00:00 2001
From: jpope <jpope@jpope.org>
Date: Mon, 6 Jan 2014 10:52:11 -0600
Subject: more skeleton migrations

---
 mediagoblin/templates/mediagoblin/base.html            | 6 ++++++
 mediagoblin/templates/mediagoblin/user_pages/user.html | 9 +++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 2d6f03d9..0d22608b 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -56,8 +56,12 @@
       {% block mediagoblin_header %}
         <div class="container">
           <header>
+            <div class="row hell">
+            <div class="eight columns alpha omega">
             {%- include "mediagoblin/bits/logo.html" -%}
             {% block mediagoblin_header_title %}{% endblock %}
+            </div>
+            <div class="eight columns alpha omega pull-right">
             <div class="header_right">
               {%- if request.user %}
                 {% if request.user and 
@@ -105,6 +109,7 @@
                 </a>
               {%- endif %}
             </div>
+            </div><!--end eight columns pull-right-->
             <div class="clear"></div>
             {% if request.user and request.user.has_privilege('active') %}
               <div class="header_dropdown">
@@ -158,6 +163,7 @@
                 {% include 'mediagoblin/fragments/header_notifications.html' %}
               </div>
             {% endif %}
+            </div><!-- end row -->
           </header>
         </div>
       {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 14a67431..51baa9bb 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -41,6 +41,7 @@
 
 
 {% block mediagoblin_content -%}
+  <div class="six columns">
   <h1>
     {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
   </h1>
@@ -81,9 +82,9 @@
       </a>
     </p>
   </div>
-
+  </div><!--end six columns-->
   {% if media_entries.count() %}
-    <div class="profile_showcase">
+    <div class="ten columns profile_showcase">
       {{ object_gallery(request, media_entries, pagination,
                         pagination_base_url=user_gallery_url, col_number=3) }}
       {% include "mediagoblin/utils/object_gallery.html" %}
@@ -101,7 +102,7 @@
     </div>
   {% else %}
     {% if request.user and (request.user.id == user.id) %}
-      <div class="profile_showcase empty_space">
+      <div class="ten columns profile_showcase empty_space">
         <p>
           {% trans -%}
           This is where your media will appear, but you don't seem to have added anything yet.
@@ -113,7 +114,7 @@
         </a>
       </div>
     {% else %}
-      <div class="profile_showcase empty_space">
+      <div class="ten columns profile_showcase empty_space">
         <p>
           {% trans -%}
           There doesn't seem to be any media here yet...
-- 
cgit v1.2.3