Merge lp:~cjohnston/ubuntu-community-webthemes/mobile-use-summit-linaro into lp:~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme

[Chris Johnston]

Updates Summit to work with mobile theme

[James Tunnicliffe (dooferlad)]

In my testing lp:~dooferlad/ubuntu-community-webthemes/linaro-small-theme works, but this breaks it.

review: Disapprove

[Chris Johnston (cjohnston)]

You need to merge this and the MP for Summit. I moved the mobile stuff into
Summit since it is site specific.

=== modified file 'media/css/extra_styles.css'
--- media/css/extra_styles.css	2012-04-23 14:13:20 +0000
+++ media/css/extra_styles.css	2012-04-23 14:13:20 +0000
@@ -1,10 +1,10 @@
 /*
 *
-*	Extra styles for Summit
-*	Depends on
-*	core-reset.css
-*	core-grid.css
-*	core.css
+*   Extra styles for Summit
+*   Depends on
+*   core-reset.css
+*   core-grid.css
+*   core.css
 *
 */
 
@@ -126,12 +126,12 @@
 }
 
 .action-links {
-	margin-bottom: 20px;
-	padding: 20px;
-	background-color: #efefef;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-	border-radius: 4px;
+    margin-bottom: 20px;
+    padding: 20px;
+    background-color: #efefef;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+    border-radius: 4px;
 }
 
 
@@ -309,39 +309,6 @@
     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;
-}
-
 /*
 *
 *   For Linaro
 
=== modified file 'templates/website_base.html'
--- templates/website_base.html	2012-04-23 14:13:20 +0000
+++ templates/website_base.html	2012-04-23 14:13:20 +0000
@@ -64,14 +64,8 @@
                     </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>
 
 </header>
@@ -97,7 +91,7 @@
                 <!--
                 {% block search %}
                 <section id="searchbox-container">
-                		{% block search_box %}
+                        {% block search_box %}
                         <input name="search" id="searchbox" value="Search..." />
                         {% endblock %}
                 </section>