From patchwork Tue Jul 26 09:36:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 3130 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 6760E24142 for ; Tue, 26 Jul 2011 09:36:26 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 08415A18764 for ; Tue, 26 Jul 2011 09:36:25 +0000 (UTC) Received: by qwb8 with SMTP id 8so152018qwb.11 for ; Tue, 26 Jul 2011 02:36:25 -0700 (PDT) Received: by 10.229.25.212 with SMTP id a20mr421381qcc.148.1311672985447; Tue, 26 Jul 2011 02:36:25 -0700 (PDT) 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.229.217.78 with SMTP id hl14cs105086qcb; Tue, 26 Jul 2011 02:36:24 -0700 (PDT) Received: by 10.216.145.149 with SMTP id p21mr4488593wej.91.1311672983975; Tue, 26 Jul 2011 02:36:23 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id m9si536095wed.140.2011.07.26.02.36.23; Tue, 26 Jul 2011 02:36:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Qle3r-0005OX-0J for ; Tue, 26 Jul 2011 09:36:23 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id B5ACC2E899C for ; Tue, 26 Jul 2011 09:36:22 +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: 221 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 221: Merge refinement of the "white" theme introduced last cycle Message-Id: <20110726093622.30391.51672.launchpad@loganberry.canonical.com> Date: Tue, 26 Jul 2011 09:36:22 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13503"; Instance="initZopeless config overlay" X-Launchpad-Hash: c59fa0af2e130cfaf08326e2084cf539ab555210 Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-server/theme/+merge/69180 proposed by: Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 221 [merge] committer: Zygmunt Krynicki branch nick: trunk timestamp: Tue 2011-07-26 11:34:04 +0200 message: Merge refinement of the "white" theme introduced last cycle added: lava_server/htdocs/images/dark-noise.png modified: lava_server/htdocs/css/default.css lava_server/templates/layouts/base.html lava_server/templates/layouts/content.html lava_server/templates/layouts/content_with_sidebar.html lava_server/templates/linaro_django_xmlrpc/_base.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-07-12 02:22:10 +0000 +++ lava_server/htdocs/css/default.css 2011-07-25 23:18:01 +0000 @@ -1,64 +1,75 @@ -body, p, input, th, td { +body, input, th, td { font-family: Ubuntu, Helvetica Neue, Verdana, sans-serif; - font-size: 9pt; + font-size: 10pt; } code { font-family: UbuntuBeta Mono, Lucida Console, Consolas, monospace; - font-size: 9pt; + font-size: 10pt; } body { - background-color: white; - color: black; - margin: 1em auto; + color: 333; + background-color: #f5f6f7; padding: 0; - width: 80%; - min-width: 800px; - overflow-y: scroll; + margin: 0; +} + +a { + color: #08C; +} + + +/* Selection style */ + +::selection { + color: white !important; + background-color: #222 !important; +} + +::-moz-selection { + color: white !important; + background-color: #222 !important; +} + +::-webkit-selection { + color: white !important; + background-color: #222 !important; +} + +/* The master container of all things, similar to body */ + +#lava-container { } /* Header */ #lava-server-header { -} - -/* Home link */ - -#lava-server-home { - margin-bottom: 1ex; -} - -/* User box */ + background: #706f6f url(../images/dark-noise.png); + color: #f1efef; + font-family: "Ubuntu Light", Helvetica Neue, Verdana, sans-serif; + font-size: 12pt; + box-shadow: 0 3px 3px rgba(127, 127, 127, 0.5); + text-shadow: 1px 1px 0px #333, 0 0 3px #000; + padding: 0.9ex 2ex; +} + +#lava-server-header a { + color: inherit; +} + +/* User Box (part of header) */ #lava-server-user-box { - float: right; + text-align: right; + font-size: 9pt; } #lava-server-user-box span.username { font-weight: bold; } -#lava-server-user-box .ui-button-text { - padding: 2px; - font-size: inherit; -} - -/* Main and sub toolbars */ - -.lava-server-toolbar { - margin: 1ex 0; - padding: 3pt; -} - -.lava-server-sub-toolbar { - font-size: smaller !important; -} - -.lava-server-sub-toolbar .ui-button-text { - padding: 2px; - font-size: inherit; -} +/* Navigation (part of header) */ #lava-server-navigation ul, #lava-server-extension-navigation ul { @@ -69,25 +80,29 @@ #lava-server-navigation ul li, #lava-server-extension-navigation ul li { + margin: 0 1ex 0 0; + padding: 0; list-style: none; display: inline-block; } -#lava-server-navigation, -#lava-server-extension-navigation { - margin-bottom: 3pt; +#lava-server-navigation ul li a, +#lava-server-extension-navigation ul li a { + font-family: Ubuntu Condensed, Helvetica Neue, Verdana, sans-serif; + text-decoration: none; } /* Breadcrumbs */ #lava-server-breadcrumbs { - font-size: 8pt; - margin: 1ex; + font-size: 10pt; + margin: 1ex 1em; + padding: 0; } #lava-server-breadcrumbs ul { display: inline-block; - margin: 0 3pt; + margin: 0; padding: 0; } @@ -96,43 +111,84 @@ display: inline-block; margin: 0; padding: 0; - font-weight: normal; } #lava-server-breadcrumbs ul li a { text-decoration: underline; + color: inherit; } #lava-server-breadcrumbs ul li:before { - content: "»"; - margin: 0 1ex; + content: "» "; } #lava-server-breadcrumbs ul li:first-child:before { content: ""; - margin: 0; } -/* Content table */ +/* Content */ #lava-server-content { + color: #444; + padding: 1ex 3em; + border: 1px solid #999; + Border-radius: 3px; + margin: 1ex; + min-width: 800px; + background-color: white; } #lava-server-sidebar { - margin: 1em 0; +} + +h1 { + color: #222; + border-bottom: 3pt solid #444; +} + +h2 { + color: #222; + border-bottom: 2pt solid #444; +} + +h3 { + color: #111; } /* Footer */ #lava-server-footer { +} + +/* Copyright */ +#lava-server-copyright-trigger, +#lava-server-copyright { + margin: 1ex; + font-family: Ubuntu Condensed, Helvetica Neue, Verdana, sans-serif; + text-align: center; +} + +#lava-server-copyright-trigger span { + color: #999; + border-radius: 6pt; + padding: 2pt 5pt; + cursor: pointer; +} + +#lava-server-copyright-trigger span:hover { + color: white; + background-color: #08C; +} + +#lava-server-copyright { clear: both; - color: gray; - font-size: smaller; - margin-top: 2em; - text-align: center; + color: #666; + margin: auto; + text-align: justify; + width: 800px; } -#lava-server-footer a { +#lava-server-copyright a { color: inherit !important; } @@ -158,10 +214,11 @@ /* Ajax notification bar */ -#ajax_notification { +#lava-server-working { background-color: white; box-shadow: 0 5px 5px rgba(0, 0, 0, 0.5); - color: black; + color: #555; + border-bottom: 1px solid #777; display: hidden; font-size: 12pt; font-weight: bold; @@ -174,7 +231,7 @@ z-index: 1000; } -#ajax_notification img { +#lava-server-working img { vertical-align: baseline; position: relative; top: 3px; === added file 'lava_server/htdocs/images/dark-noise.png' Binary files lava_server/htdocs/images/dark-noise.png 1970-01-01 00:00:00 +0000 and lava_server/htdocs/images/dark-noise.png 2011-07-25 23:18:01 +0000 differ === modified file 'lava_server/templates/layouts/base.html' --- lava_server/templates/layouts/base.html 2011-07-12 15:05:51 +0000 +++ lava_server/templates/layouts/base.html 2011-07-25 23:18:01 +0000 @@ -1,4 +1,3 @@ -{% load i18n %} @@ -14,18 +13,19 @@ {% block ajax_notification %} -
+ {% endblock %} === modified file 'lava_server/templates/layouts/content.html' --- lava_server/templates/layouts/content.html 2011-07-13 12:48:44 +0000 +++ lava_server/templates/layouts/content.html 2011-07-25 23:18:01 +0000 @@ -3,104 +3,110 @@ {% block body %} -{% block header %} - -
- - -
- + +
+ + {% block header %} + +
+ + +
{% if user.is_authenticated %} - {% trans "Signed in as" %} {{user}} - {% trans "sign out" %} + {% trans "Signed in as" %} {{user}}, + {% trans "sign out" %} {% if user.is_staff %} - {% trans " or visit " %}{% trans "admin interface" %} {% endif %} {% else %} - {% trans "You are not signed in" %} - - - {% endif %} -
- - - - - - {% block navigation %} -
- -
- {% endblock navigation %} - - - - {% block extension_navigation %}{% endblock %} - + {% trans "Welcome stranger" %}, + + {% endif %} +
+ + + + {% block navigation %} +
+ +
+ {% endblock navigation %} + + + + {% block extension_navigation %}{% endblock %} + + +
+
- You are here: + {% trans "You are here:" %}
- -
- - -{% endblock header %} - - -{% block content-and-sidebar %} -
- - - {% block content %}{% endblock %} - -
-{% endblock %} - - - + + + + + - + + {% endblock body %} === modified file 'lava_server/templates/layouts/content_with_sidebar.html' --- lava_server/templates/layouts/content_with_sidebar.html 2011-07-12 02:22:10 +0000 +++ lava_server/templates/layouts/content_with_sidebar.html 2011-07-25 23:18:01 +0000 @@ -2,14 +2,14 @@ {% block content-and-sidebar %} -
- -
- {% block sidebar %}{% endblock %} -
- +
+ +
+ {% block sidebar %}{% endblock %} +
+ {% block content %}{% endblock %}
=== modified file 'lava_server/templates/linaro_django_xmlrpc/_base.html' --- lava_server/templates/linaro_django_xmlrpc/_base.html 2011-07-13 18:25:34 +0000 +++ lava_server/templates/linaro_django_xmlrpc/_base.html 2011-07-25 23:18:01 +0000 @@ -7,9 +7,11 @@ {% endblock %} -{% block extension_navigation %} -