more skeleton migrations

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index ae4c42fc138f5de0ea404c71716365e8f55a8f87..7d1c4fed535b864209c2c67c1ab5219d340c1afb 100644 (file)
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -167,6 +167,16 @@ footer {
   clear: both;
 }
 
+.thumb_gallery {
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.profile_showcase .thumb_gallery {
+  margin-left: 0;
+  margin-right: 0;
+}
+
 .media_pane {
   width: 640px;
   margin-left: 0px;
@@ -181,15 +191,15 @@ footer {
 }
 
 .profile_sidebar {
-  width: 340px;
-  margin-right: 10px;
-  float: left;
+/*  width: 340px;*/
+/*  margin-right: 10px;*/
+/*  float: left;*/
 }
 
 .profile_showcase {
-  width: 580px;
-  margin-left: 10px;
-  float: left;
+/*  width: 580px;*/
+/*  margin-left: 10px;*/
+/*  float: left;*/
 }
 
 /* common website elements */
@@ -243,6 +253,17 @@ text-align: center;
   float: right;
 }
 
+.left_align {
+  float: right;
+}
+
+.pull-right {
+  float: right !important;
+}
+.pull-left {
+  float: left !important;
+}
+
 .clear {
   clear: both;
   display: block;
@@ -761,6 +782,7 @@ pre {
 }
 
 /* Media queries and other responsivisivity */
+/* initial GMG max 940 */
 @media screen and (max-width: 940px) {
   .media_pane {
     width: 100%;
@@ -838,6 +860,7 @@ pre {
   }
   
 }
+/* desktop resolutions */
 @media screen and (min-width: 960px) {
   .container .three.columns {
     width:180px;
@@ -845,25 +868,35 @@ pre {
     margin-right:3px;
   }
 }
+/* Tablet Portrait size to standard 960 (devices and browsers) */
 @media only screen and (min-width: 768px) and (max-width: 959px) {
   .container .three.columns {
     width:147px;
     margin-left:2px;
     margin-right:2px;
   }
+  .thumb_gallery {
+    margin-left: 0;
+    margin-right: 0;
+  }
 }
+/* All Mobile Sizes (devices and browser) */
 @media screen and (max-width: 767px) {
   .thumb_row {
     margin-bottom: 0;
   }
+  .thumb_gallery {
+    margin-left: 0;
+    margin-right: 0;
+  }
 }
+/* initial GMG tablet */
 @media screen and (max-width: 570px) {
   .media_thumbnail {
     width: 29%;
   }
-
 }
-
+/* initial GMG phone */
 @media screen and (max-width: 380px) {
   .media_thumbnail {
     width: 46%;

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 2d6f03d97bc678ccfaec95fa6d9ce9920efdc3d9..0d22608bc9d5238c2b13d7a116d67d03a47c319d 100644 (file)
--- 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 14a67431ef6e3c5d9b255af6e877414f28e03340..51baa9bb5b1cae253d0e950c228add94b0d62c6b 100644 (file)
--- 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...