Merge lp:~dooferlad/ubuntu-community-webthemes/linaro-small-theme into lp:~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme

[Chris Johnston]

[lp:~dooferlad/ubuntu-community-webthemes/linaro-small-theme]

48. By James Tunnicliffe on 2012-04-24

More changes to make the site look nice at all screen widths

49. By James Tunnicliffe on 2012-04-24

Collapse padding on .row elements when screen width small

=== modified file 'media/css/core-grid.css'
--- media/css/core-grid.css	2012-03-23 22:38:31 +0000
+++ media/css/core-grid.css	2012-04-24 17:01:23 +0000
@@ -42,25 +42,56 @@
 .wrapper {
 	margin: 0 auto;
 	text-align: left;
-	padding:0 60px;
-	width: 65.333em; /* 980px / 15px (baseline font); 980px + (60px x 2) = 1100px */
-}
-
-.inner-wrapper {
-	background: #fff;
-	clear: both;
-	display: inline; /* HACK_IE_LTE_6: To fix IE 6 double margin bug. */
-	float: left;
-	padding: 0 1.333em; /* 20px / 15px */
-	position: relative;
-	width: 62.667em; /* 940px / 15px */
-}
-
-.row { /** Clear entire row. */
-	clear: both;
-	float: left;
-	margin: 0;
-	width: 100%;	
+	max-width: 65.333em; /* 980px / 15px (baseline font); 980px + (60px x 2) = 1100px */
+}
+
+@media screen and (min-width: 481px) {
+    .inner-wrapper {
+        background: #fff;
+        clear: both;
+        display: inline; /* HACK_IE_LTE_6: To fix IE 6 double margin bug. */
+        float: left;
+        position: relative;
+    }
+}
+
+@media screen and (max-width: 481px) {
+    .inner-wrapper {
+        background: #fff;
+        clear: both;
+        display: inline; /* HACK_IE_LTE_6: To fix IE 6 double margin bug. */
+        float: left;
+        padding: 0 0 0 0;
+        position: relative;
+    }
+}
+
+.inner-wrapper-full-width {
+    background: #fff;
+    clear: both;
+    display: inline; /* HACK_IE_LTE_6: To fix IE 6 double margin bug. */
+    float: left;
+    padding: 0 0 0 0;
+    position: relative;
+    width: 100%;
+}
+
+@media screen and (min-width: 481px) {
+    .row { /** Clear entire row. */
+        clear: both;
+        float: left;
+        margin: 0 20px;
+        width: 100%;
+    }
+}
+
+@media screen and (max-width: 481px) {
+    .row { /** Clear entire row. */
+        clear: both;
+        float: left;
+        margin: 0;
+        width: 100%;
+    }
 }
 
 /**
@@ -69,13 +100,27 @@
  * @section columns
  */
 
-.span-3, .span-4, .span-6, .span-5, .span-7, .span-8, .span-9, .span-12 {
-	clear: none;
-	display: inline; /* HACK_IE_LTE_6: To fix IE 6 double margin bug. */
-	float: left;
-	margin: 0 1.333em 1.333em 0;
-	padding: 0;
-	position: relative;
+@media screen and (min-width: 481px) {
+    .span-3, .span-4, .span-6, .span-5, .span-7, .span-8, .span-9, .span-12 {
+        clear: none;
+        display: inline; /* HACK_IE_LTE_6: To fix IE 6 double margin bug. */
+        float: left;
+        margin: 0 1.333em 1.333em 0;
+        padding: 0;
+        position: relative;
+    }
+}
+
+
+@media screen and (max-width: 481px) {
+    .span-3, .span-4, .span-6, .span-5, .span-7, .span-8, .span-9, .span-12 {
+        clear: none;
+        display: inline; /* HACK_IE_LTE_6: To fix IE 6 double margin bug. */
+        float: left;
+        margin: 0 0.5em 0.5em 0;
+        padding: 0;
+        position: relative;
+    }
 }
 
 .span-3 {
@@ -94,7 +139,7 @@
 	width: 36em; /* 540px / 15px */
 }
 .span-8 {
-	width: 41.333em; /* 620px / 15px */
+	max-width: 41.333em; /* 620px / 15px */
 }
 .span-9 {
 	width: 46.666em; /* 700px / 15px */
@@ -282,4 +327,4 @@
 }
 .clearfix {
 	display: block;
-}
\ No newline at end of file
+}

=== modified file 'media/css/core.css'
--- media/css/core.css	2012-03-24 23:52:17 +0000
+++ media/css/core.css	2012-04-24 17:01:23 +0000
@@ -143,6 +143,7 @@
     	-webkit-border-radius: 0 0 4px 4px;
     border-radius: 0 0 4px 4px;
     overflow: hidden;
+    margin: 0 20px;
 }
 
 header .nav-secondary li {
@@ -234,6 +235,7 @@
     	-moz-border-radius: 0 0 4px 4px;
     	-webkit-border-radius: 0 0 4px 4px;
     border-radius: 0 0 4px 4px;
+    margin: 0 20px;
 }
 
 .nav-secondary ul {
@@ -267,6 +269,7 @@
     box-shadow: 0 2px 3px #c9c9c9;
     position: relative;
     z-index: 1;
+    width: 100%;
 }
 
 .inner-wrapper div.row:first-child {

=== modified file 'media/css/extra_styles.css'
--- media/css/extra_styles.css	2012-03-25 15:38:13 +0000
+++ media/css/extra_styles.css	2012-04-24 17:01:23 +0000
@@ -79,7 +79,7 @@
 }
 
 table.basic {
-    width:542px;
+    max-width:542px;
     text-align:left;
     padding:0 8px;
     margin:20px auto;
@@ -309,6 +309,38 @@
     color: #dd4814;
 }
 
+/* Reset default unordered list display style to remove bulleting/spacing */
+#column-schedule ul {
+    list-style: none;
+}
+/* Stack LI elements horizontally instead of the default vertical orientation */
+#column-schedule li {
+    float: left;
+    margin-right: 1em;
+}
+
+/* Reset default unordered list display style to remove bulleting/spacing */
+#column-schedule-inner ul {
+    list-style: disc;
+    /*border-right: dotted;
+    border-right-width: 1px;*/
+}
+/* Stack LI elements horizontally instead of the default vertical orientation */
+#column-schedule-inner li {
+    float: none;
+    margin-right: 1em;
+    padding: 0em;
+    line-height: 1.5em;
+    margin-bottom: 0px;
+    margin-top: 0px;
+}
+
+/* Social widgets */
+.social-widget {
+    float: left;
+    display: inline-block;
+    margin-right: 2px;
+}
 
 /*
 *

=== modified file 'media/css/old/default.css'
--- media/css/old/default.css	2012-03-25 15:38:13 +0000
+++ media/css/old/default.css	2012-04-24 17:01:23 +0000
@@ -773,9 +773,9 @@
 }
 
 #the-logo {
-    background: url("../images/linaro-connect-logo.png");
+    background: url("../images/linaro-connect-logo-small.png");
     width: 118px;
-    height: 50px;
+    height: 48px;
     float: right;
 }
 

=== added file 'media/images/linaro-connect-logo-small.png'
Binary files media/images/linaro-connect-logo-small.png	1970-01-01 00:00:00 +0000 and media/images/linaro-connect-logo-small.png	2012-04-24 17:01:23 +0000 differ
=== modified file 'media/images/linaro-connect-logo.png'
Binary files media/images/linaro-connect-logo.png	2011-09-12 19:49:06 +0000 and media/images/linaro-connect-logo.png	2012-04-24 17:01:23 +0000 differ
=== modified file 'templates/website_base.html'
--- templates/website_base.html	2012-04-17 20:44:26 +0000
+++ templates/website_base.html	2012-04-24 17:01:23 +0000
@@ -64,8 +64,13 @@
                     </ul>
                 {% endblock %}
         </nav>
+<<<<<<< TREE
         <a class="logo-ubuntu" href="/">
                 <img width="108" height="50" src="{{ubuntu_website_media}}/images/linaro-connect-logo.png" alt="Linaro Connect Logo"/>
+=======
+        <a class="logo-ubuntu" href="http://connect.linaro.org/events/event/linaro-connect-q2-12/">
+                <img src="{{ubuntu_website_media}}/images/linaro-connect-logo-small.png" alt="Linaro Connect Logo"/>
+>>>>>>> MERGE-SOURCE
                 <h2 class="header-text"><a href="/">{% block logo_text %}Country Loco Team{% endblock %}</a></h2>
         </a>