From patchwork Tue Nov 29 09:37:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 5359 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CF5B823E17 for ; Tue, 29 Nov 2011 09:42:30 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id B47FCA18071 for ; Tue, 29 Nov 2011 09:42:30 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id h2so1235327laa.11 for ; Tue, 29 Nov 2011 01:42:30 -0800 (PST) Received: by 10.152.104.1 with SMTP id ga1mr30645728lab.40.1322559750627; Tue, 29 Nov 2011 01:42:30 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs32853lal; Tue, 29 Nov 2011 01:42:29 -0800 (PST) Received: by 10.180.81.73 with SMTP id y9mr48808500wix.37.1322559438718; Tue, 29 Nov 2011 01:37:18 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id ea10si2448598wib.31.2011.11.29.01.37.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 01:37:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RVK7q-0007J8-Dc for ; Tue, 29 Nov 2011 09:37:18 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 5E5B2E1604 for ; Tue, 29 Nov 2011 09:37:18 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 312 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Tue, 29 Nov 2011 09:37:18 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14399"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 1a6d13ffb23277057de093be620b4c9e6c6aefb7 ------------------------------------------------------------ revno: 312 committer: Zygmunt Krynicki 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 === 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 %} - - +{% endblock %} + +{% block before_content %} + {% 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 @@ {% endblock header %} + {% block before_content %} + {% endblock %} + {% spaceless %}
{% block breadcrumb_container %}