diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 312: Fix the index page to not include the logo inside breadcrumb area

Message ID 20111129093718.13982.31576.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki Nov. 29, 2011, 9:37 a.m. UTC 
------------------------------------------------------------
revno: 312
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: lava-server
timestamp: Tue 2011-11-22 18:36:14 +0100
message:
  Fix the index page to not include the logo inside breadcrumb area
modified:
  lava_server/htdocs/css/default.css
  lava_server/templates/index.html
  lava_server/templates/layouts/content.html


--
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk

You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_server/htdocs/css/default.css'
--- lava_server/htdocs/css/default.css	2011-11-22 17:29:36 +0000
+++ lava_server/htdocs/css/default.css	2011-11-22 17:36:14 +0000
@@ -201,39 +201,18 @@ 
   vertical-align: middle;
 }
 
-/* Breadcrumbs */
-
-#lava-breadcrumbs {
-  font-size: 10pt;
-  margin: 0;
-  padding: 0.5ex 1em;
-}
-
-#lava-breadcrumbs ul {
-  display: inline-block;
-  margin: 0 0 0 1ex;
-  padding: 0;
-}
-
-#lava-breadcrumbs ul li {
-  list-style: none;
-  display: inline;
-  margin: 0;
-  padding: 0;
-}
-
-#lava-breadcrumbs ul li a {
-  text-decoration: underline;
-  color: inherit;
-}
-
-#lava-breadcrumbs ul li:before {
-  content: " » ";
-}
-
-#lava-breadcrumbs ul li:first-child:before {
-  content: "";
-}
+/* Logo */
+
+#lava-logo {
+  min-width: 860px;
+  margin: 1em 3em;
+}
+
+#lava-logo img {
+  border: none;
+}
+
+/* Around content area */
 
 #lava-around-content {
   margin: 1em 3em 100px 3em;
@@ -265,9 +244,38 @@ 
   );
 }
 
-#lava-logo {
-  margin: 10px 0;
-  border: none;
+/* Breadcrumbs */
+
+#lava-breadcrumbs {
+  font-size: 10pt;
+  margin: 0;
+  padding: 0.5ex 1em;
+}
+
+#lava-breadcrumbs ul {
+  display: inline-block;
+  margin: 0 0 0 1ex;
+  padding: 0;
+}
+
+#lava-breadcrumbs ul li {
+  list-style: none;
+  display: inline;
+  margin: 0;
+  padding: 0;
+}
+
+#lava-breadcrumbs ul li a {
+  text-decoration: underline;
+  color: inherit;
+}
+
+#lava-breadcrumbs ul li:before {
+  content: " » ";
+}
+
+#lava-breadcrumbs ul li:first-child:before {
+  content: "";
 }
 
 #lava-content-and-sidebar,

=== modified file 'lava_server/templates/index.html'
--- lava_server/templates/index.html	2011-11-22 17:16:46 +0000
+++ lava_server/templates/index.html	2011-11-22 17:36:14 +0000
@@ -3,13 +3,16 @@ 
 
 
 {% block breadcrumb_container %}
-<!-- logo -->
-<a href="{% url lava.home %}"><img 
-  id="lava-logo"
-  src="{{ STATIC_URL }}lava-server/images/logo.png"
-  width="150"
-  height="70"
-  alt="Linaro logo"/></a>
+{% endblock %}
+
+{% block before_content %}
+<div id="lava-logo">
+  <a href="{% url lava.home %}"><img 
+    src="{{ STATIC_URL }}lava-server/images/logo.png"
+    width="150"
+    height="70"
+    alt="Linaro logo"/></a>
+</div>
 {% endblock %}
 
 

=== modified file 'lava_server/templates/layouts/content.html'
--- lava_server/templates/layouts/content.html	2011-11-22 17:16:46 +0000
+++ lava_server/templates/layouts/content.html	2011-11-22 17:36:14 +0000
@@ -219,6 +219,9 @@ 
   </script>
   {% endblock header %}
 
+  {% block before_content %}
+  {% endblock %}
+
   {% spaceless %}
   <div id="lava-around-content">
     {% block breadcrumb_container %}