ubuntu-packaging-guide-team team mailing list archive
-
ubuntu-packaging-guide-team team
-
Mailing list archive
-
Message #00758
[Merge] lp:~andrewsomething/ubuntu-packaging-guide/css-review into lp:ubuntu-packaging-guide
Andrew Starr-Bochicchio has proposed merging lp:~andrewsomething/ubuntu-packaging-guide/css-review into lp:ubuntu-packaging-guide.
Requested reviews:
Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)
Related bugs:
Bug #996682 in Ubuntu Packaging Guide: "Trim down CSS"
https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/996682
For more details, see:
https://code.launchpad.net/~andrewsomething/ubuntu-packaging-guide/css-review/+merge/105376
This removes css and images that came from the django theme and the loco portal. It seems they weren't really being used. There are many un-used selectors in the remaining files, but they all come from the developer portal. I think it might be enough to keep the borrowed code down to a single project. It will keep it simpler to keep in sync.
If nothing else, it is a good start. It removes nearly 2,000 lines:
$ bzr diff --stat -r89
BORROWED-CODE | 8 -
themes/ubuntu/layout.html | 31 -
themes/ubuntu/static/default.css_t | 62 -
themes/ubuntu/static/light-django-theme.css | 1265 --------------------------
themes/ubuntu/static/newstyle.css | 592 ------------
themes/ubuntu/theme.conf | 1 -
6 files changed, 0 insertions(+), 1959 deletions(-)
--
https://code.launchpad.net/~andrewsomething/ubuntu-packaging-guide/css-review/+merge/105376
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~andrewsomething/ubuntu-packaging-guide/css-review into lp:ubuntu-packaging-guide.
=== modified file 'BORROWED-CODE'
--- BORROWED-CODE 2012-02-24 10:46:44 +0000
+++ BORROWED-CODE 2012-05-10 19:16:22 +0000
@@ -1,11 +1,3 @@
-themes/ubuntu/static/newstyle.css
-themes/ubuntu/static/images/*
- From http://loco.ubuntu.com/media/css/newstyle.css
- http://loco.ubuntu.com/media/images
-
-themes/ubuntu/static/light-django-theme.css
- From lp:ubuntu-community-webthemes/light-django-theme
-
themes/ubuntu/static/{reset,960,base,home}.css
themes/ubuntu/static/images/{background-header-home.png,background-footer.png,sec-nav-hover.gif}
From lp:ubuntudeveloperportal
=== modified file 'themes/ubuntu/layout.html'
--- themes/ubuntu/layout.html 2012-02-24 10:51:37 +0000
+++ themes/ubuntu/layout.html 2012-05-10 19:16:22 +0000
@@ -22,7 +22,6 @@
{%- macro relbar() %}
<div class="header-content">
<div class="clearfix">
- <!--<img class="arrow-nav" src="http://developer.ubuntu.com/wp-content/themes/wordpress-theme-ubuntudeveloper/img/arrow-nav.png"; width="9" height="5" alt="" />-->
<div class="header-navigation-secondary">
<div>
<nav role="navigation">
@@ -98,12 +97,10 @@
{%- block htmltitle %}
<title>{{ title|striptags|e }}{{ titlesuffix }}</title>
{%- endblock %}
- <!--<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />-->
<link rel="stylesheet" href="{{ pathto('_static/reset.css', 1) }}" type="text/css" />
<link rel="stylesheet" href="{{ pathto('_static/960.css', 1) }}" type="text/css" />
<link rel="stylesheet" href="{{ pathto('_static/base.css', 1) }}" type="text/css" />
<link rel="stylesheet" href="{{ pathto('_static/home.css', 1) }}" type="text/css" />
- <!--<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />-->
{%- for cssfile in css_files %}
<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
{%- endfor %}
@@ -157,23 +154,6 @@
</head>
<body class="home">
-<!--
-<aside id="top-nav">
- <div class="container">
-
- <section id="top-login">
- <a class="top-login-item" href="/openid/login?next=/events/" title="Login">Login</a>
- </section>
- <nav id="top-related">
- <a class="top-nav-item" href="http://www.ubuntu.com";>Ubuntu.com</a>
- <a class="top-nav-item" href="http://www.ubuntu.com/community";>Community</a>
- <a class="top-nav-item" href="http://www.ubuntu.com/support";>Support</a>
- <a class="top-nav-item" href="http://www.ubuntu.com/partners";>Partners</a>
- </nav>
- </div>
-</aside>
--->
-
<div class="header-navigation">
<div>
<nav role="navigation">
@@ -195,16 +175,6 @@
{%- block relbar1 %}{{ relbar() }}{% endblock %}
-<!--
-<header id="page-header">
- <div class="container" >
- <nav id="main-nav">
- <a class="main-nav-item " title="Index" href="index.html">Index</a>
- </nav>
- </div>
-</header>
--->
-
{%- block header %}{% endblock %}
{%- block content %}
@@ -255,7 +225,6 @@
{% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/";>Sphinx</a> {{ sphinx_version }}.{% endtrans %}
{%- endif %}
- <!--<p>© 2012 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd. <a class="link-bug" href="https://bugs.launchpad.net/ubuntudeveloperportal/+filebug";>Report a bug on this site</a></p>-->
</div>
</footer>
{%- endblock %}
=== removed file 'themes/ubuntu/static/default.css_t'
--- themes/ubuntu/static/default.css_t 2011-07-22 11:34:39 +0000
+++ themes/ubuntu/static/default.css_t 1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
-* License: GPLv2
-* Author : Alexander Fougner <fougner89 at gmail dot com>
-* Source : http://loco.ubuntu.com/media/css/newstyle.css
-* https://code.launchpad.net/~ubuntu-website-community/ubuntu-website/light-django-theme
-*/
-
-@import url("light-django-theme.css");
-@import url("newstyle.css");
-
-body {
- background: url("images/dotted.png") repeat scroll 0 0 #FFFFFF;
-}
-
-#page-header {
- background: url("images/header.png") repeat-x scroll 0 0 #DD4814;
-}
-
-div.sphinxsidebar {
- float:right;
- background: #f5f5f5;
- border: 1px solid #ddd;
- padding: 15px;
- margin: 10px;
- width: 230px;
-background: #F7F7F7;
-border-radius: 8px;
-}
-
-div.sphinxsidebar ul {
- margin-left: 10px;
-}
-
-pre {
- font-family: monospace;
- border: 1px solid #ddd;
- background: #f5f5f5;
- margin: 5px;
- padding: 5px;
-}
-
-a.headerlink {
- visibility: hidden;
-}
-
-h1:hover > a.headerlink,
-h2:hover > a.headerlink,
-h3:hover > a.headerlink,
-h4:hover > a.headerlink,
-h5:hover > a.headerlink,
-h6:hover > a.headerlink,
-dt:hover > a.headerlink {
-visibility: visible;
-}
-
-form.search_form input, #searchbox {
-height: auto;
-}
-
-#page-footer .container div.copyright {
-padding: 10px;
-}
=== removed file 'themes/ubuntu/static/images/dotted.png'
Binary files themes/ubuntu/static/images/dotted.png 2011-07-20 14:16:22 +0000 and themes/ubuntu/static/images/dotted.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'themes/ubuntu/static/images/favicon.ico'
Binary files themes/ubuntu/static/images/favicon.ico 2011-07-20 14:16:22 +0000 and themes/ubuntu/static/images/favicon.ico 1970-01-01 00:00:00 +0000 differ
=== removed file 'themes/ubuntu/static/images/footer.png'
Binary files themes/ubuntu/static/images/footer.png 2011-07-20 14:16:22 +0000 and themes/ubuntu/static/images/footer.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'themes/ubuntu/static/images/header.png'
Binary files themes/ubuntu/static/images/header.png 2011-07-20 14:16:22 +0000 and themes/ubuntu/static/images/header.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'themes/ubuntu/static/images/search.png'
Binary files themes/ubuntu/static/images/search.png 2011-07-20 14:16:22 +0000 and themes/ubuntu/static/images/search.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'themes/ubuntu/static/light-django-theme.css'
--- themes/ubuntu/static/light-django-theme.css 2011-07-20 14:15:26 +0000
+++ themes/ubuntu/static/light-django-theme.css 1970-01-01 00:00:00 +0000
@@ -1,1265 +0,0 @@
-/*- LICENSE
--------------------------------------------------------------------------------------------------------- */
-/*
- Author: Matteo Lissandrini - kuzeko http://www.kuzeko.com
-
-// Licensed under the Creative Commons Attribution-Share Alike 3.0 License - http://creativecommons.org/licenses/by-sa/3.0/
-// - Free for use in both personal and commercial projects
-// - Attribution requires leaving author name, author link, and the license info intact.
-*/
-
-/*- reset
--------------------------------------------------------------------------------------------------------- */
-
-/*
-Reset derived and adapted from
-html5doctor.com Reset Stylesheet
-v1.4.1
-2010-03-01
-Author: Richard Clark - http://richclarkdesign.com
-*/
-
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, menu, nav, section, time, mark, audio, video {
- background: transparent;
- border: 0;
- font-family: inherit;
- font-weight: inherit;
- font-style: inherit;
- font-size: 100%;
- margin: 0;
- outline: 0;
- padding: 0;
- vertical-align: baseline;
-}
-
-blockquote:before, blockquote:after, q:before, q:after {
- content: ''
-}
-
-nav ul {
- list-style: none
-}
-
-td li, li li {
- font-size: 13px;
- line-height: 1.4;
-}
-
-:focus /* remember to define focus styles! */ {
- outline: 0
-}
-
-body {
- line-height: 1
-}
-
-article, aside, details, dialog, figure, footer, header, hgroup, nav, section {
- display: block
-}
-
-ol, ul {
- list-style-position: inside
-}
-
-blockquote, q {
- quotes: none
-}
-
-a {
- cursor: pointer;
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- color: #DD4814;
- vertical-align: baseline;
- background: transparent;
- text-decoration: none;
-}
-
-ins {
- background-color: #ff9;
- color: #000;
- text-decoration: none;
-}
-
-mark {
- background-color: #ff9;
- color: #000;
- font-style: italic;
- font-weight: bold;
-}
-
-del {
- text-decoration: line-through
-}
-
-abbr[title], dfn[title] {
- border-bottom: 1px dotted #000;
- cursor: help;
-}
-
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-hr {
- display: block;
- height: 1px;
- border: 0;
- border-top: 1px solid #cccccc;
- margin: 1em 0;
- padding: 0;
-}
-
-input, select {
- vertical-align: middle
-}
-
-textarea {
- overflow: auto
-}
-
-/* ----------------------------------------------------------------------------------------------------- */
-
-/*- Typography
--------------------------------------------------------------------------------------------------------- */
-
-body {
- font-family: 'Ubuntubeta','Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif;
- font-size: 100%;
- line-height: 1.5em;
-}
-
-h1, h2, h3 {
- color: #333333;
- font-weight: normal;
- margin: 0px;
-}
-
-h1 {
- font-size: 36px;
- line-height: 40px;
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-h2 {
- font-size: 24px;
- line-height: 28px;
- font-weight: normal;
- margin-top: 16px;
- margin-bottom: 8px;
-}
-
-h3 {
- font-size: 16px;
- line-height: 20px;
- font-weight: normal;
- margin-top: 16px;
- margin-bottom: 8px;
-}
-
-p {
- font-size: 13px;
- line-height: 1.4;
-}
-
-dt {
- font-size: 0.75em;
- font-weight: bold;
- /* 16x0.75 =12 */
-}
-
-li {
- font-size: 13px;
- line-height: 1.4;
-}
-
-strong {
- font-weight: bold
-}
-
-em {
- font-style: italic
-}
-
-table.basic {
- font-size:0.75em;
- line-height:1.3333em; /* 16x0.75 =12 */
-}
-table.basic thead th, table.basic thead a {
- font-weight:bold;
-}
-
-table.basic thead a , table.basic tfoot a {
- text-decoration:underline;
-}
-
-#top-logo {
- font-size: 0.875em;
- /* 16x0.75 =12 */
-}
-
-#top-nav {
- font-size:0.625em;
- /* 16x0.625=10 */
-}
-
-#main-nav {
- font-size: 0.875em;
- /* 16x0.875=14 */
-}
-
-#sub-nav {
- font-size: 0.75em;
- /* 16x0.75 =12 */
-}
-
-/* Form typography */
-form .smalltext {
- font-size:0.625em;
- line-height: 1.4em;
-}
-
-legend span.supporting, label, form .error {
- font-size: 0.75em;
- line-height: 1.2em;
-}
-
-legend {
- font-size: 1em;
- line-height: 1em;
-}
-
-input[type="text"], input[type="password"], select {
- font-size: 0.75em;
-}
-
-input[type="submit"] {
- font-size: 1em;
- line-height: 1.25em;
-}
-/* END Form typography */
-
-.showcase-text {
- font-size: 0.875em;
- /* 16x0.875=14 */
-}
-
-.footer-item {
- font-size: 0.75em;
- /* 16x0.625=12 */
-}
-
-/*- Layout
--------------------------------------------------------------------------------------------------------- */
-
-.container {
- clear: both;
- margin: 0 auto;
- padding: 0;
- position: relative;
- width: 980px;
-}
-
-#top-nav {
- margin:0 auto;
- line-height: 2em;
- height: 20px;
-}
-
-.top-nav-item {
- display:inline-block;
- margin-right: 14px;
- line-height:2em;
-}
-
-#top-login {
- display:inline-block;
- margin-left:15px;
-}
-
-.top-login-item {
- display:inline-block;
- padding:0 8px;
- line-height:2em;
-}
-
-#top-related {
- float:right;
- margin-right:2px;
-}
-
-#main-nav {
- float: left;
- width: 770px;
-}
-
-.main-nav-item {
- margin: 5px 10px;
- padding: 10px;
-}
-
-.main-nav-item, .main-nav-item:visited {
- border-right: 1px solid #EF7149;
- border-bottom: 0;
- border-top: 0;
- color: #fff;
- display: block;
- float: left;
- height: 70px;
- line-height: 70px;
- margin: 0px;
- padding: 0 15px;
- text-shadow: 1px 1px 1px #333;
-}
-
-.main-nav-item.current, .main-nav-item:hover, .main-nav-item:active, .main-nav-item:focus {
- background: url(../images/mainnav.png) 0 0 repeat
-}
-
-#top-logo {
- float: right;
- margin: 5px 10px 5px 0px;
- padding: 10px 10px 0px 0px;
- width: 180px;
-}
-
-#page-related {
- background-image: none;
- margin: 0 auto;
- padding: 0 10px 10px;
- position: relative;
- width: 960px;
-}
-
-#sub-nav-container {
- height: 40px;
- margin: 0 10px;
- width: 940px;
-}
-
- #sub-nav-container /* progressive */ {
- -webkit-border-bottom-left-radius: 8px;
- -webkit-border-bottom-right-radius: 8px;
- -moz-border-radius-bottomleft: 8px;
- -moz-border-radius-bottomright: 8px;
- -webkit-box-shadow: 0px 1px 1px #ccc;
- -moz-box-shadow: 0 1px 1px #DFDFDF;
- }
-
-#sub-nav {
- float: left;
- padding: 0px 10px;
-}
-
-.sub-nav-item {
- margin: 5px 10px;
- padding-right: 10px;
-}
-
-.sub-nav-item, .sub-nav-item:visited {
- color: #333;
- display: block;
- float: left;
- line-height: 40px;
- margin: 0px;
- padding: 0 15px;
-}
-
-.sub-nav-item.current, .sub-nav-item:hover, .sub-nav-item:active, .sub-nav-item:focus {
- background-color: #efefef;
- color: #DD4814;
-}
-
-#pop-up-container {
- float: left;
- padding: 10px;
-}
-
-#pop-up-text {
- float: left
-}
-
-#login-container {
- float: left;
- width: 620px;
-}
-
-table.basic {
- width:542px;
- text-align:left;
- padding:0 8px;
- margin:20px auto;
-}
-
-table.basic.wide {
- width:100%;
-}
-
-table.basic td, table.basic th {
- padding:4px 8px;
-}
-
-#searchbox-container {
- float: right;
- margin: 0px 10px 5px 0px;
- padding: 0 0 0 10px;
- width: auto;
-}
-
-/* Form Layout */
-form {
- width: 542px;
- margin: 0 auto;
-}
-
-form ul.errorlist {
- display: inline-block;
- line-height: 1em;
- vertical-align: top;
-}
-
-form .error {
- width: 184px; /* 224 - 30 */
- height: 20px;
- display: inline-block;
- padding-left: 30px;
- line-height: 1em;
- vertical-align: top;
- padding-top: 4px;
-}
-
-form .help {
- position: absolute;
- z-index: 10;
- right: 16px;
- width: 20px;
-}
-
-label {
- display: block;
- margin-bottom: 4px;
-}
-
-label.inline {
- display: inline-block;
- vertical-align: middle;
-}
-
-legend {
- width: 100%;
- position: relative;
- padding: 8px;
- margin: 0 -8px;
-}
-
-legend span.supporting {
- position: absolute;
- right: 8px;
-}
-
-fieldset {
- position: relative;
- margin-bottom: 16px;
- padding: 8px;
-}
-
-input[type="text"], input[type="password"], select, textarea {
- width: 286px;
- height: 20px;
- margin-right: 16px;
- margin-bottom: 8px;
-}
-
-textarea, select[multiple="multiple"] {
- min-width: 286px;
- max-width: 286px;
- min-height: 20px;
- height: 100px;
-}
-
-input[type="checkbox"], input[type="radio"] {
- margin-top: 0px;
- margin-bottom: 8px;
-}
-
-input[type="text"]:focus, input[type="password"]:focus {
- width: 284px;
- height: 18px;
-}
-
-input[type="text"].small, input[type="password"].small, select.small {
- width: 134px;
-}
-
-input[type="text"].small:focus, input[type="password"].small:focus, select.small:focus {
- width: 132px;
-}
-
-input[type="submit"] {
- padding: 10px 8px;
-}
-/* END Form Layout */
-
-.showcase-item {
- float: left;
- margin: 5px 10px;
- padding: 10px;
- width: 280px;
-}
-
-.showcase-heading {
- margin: 5px 0px 10px;
- width: 280px;
-}
-
-.showcase-subheading {
- margin: 5px 0px 10px;
- width: 280px;
-}
-
-.showcase-text {
- margin: 5px 0px 10px;
- width: 280px;
-}
-
-.showcase-figure {
- float: left;
- margin: 5px 10px;
- padding: 10px;
- position: relative;
- width: 600px;
-}
-
-.showcase-img {
- display: block;
- margin: 0px;
- padding: 0px;
- position: relative;
- width: 600px;
-}
-
-.showcase-caption {
- position: absolute;
- bottom: 0px;
- left: 0px;
- margin: 0px 10px 10px;
- padding: 10px;
- width: 580px;
-}
-
-#showcase-nav {
- clear: both;
- margin: 5px 10px;
- padding: 0px 10px;
- width: 920px;
-}
-
- #showcase-nav /* progressive */ {
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- -moz-box-shadow: 0px 1px 1px #dfdfdf;
- -webkit-box-shadow: 0px 1px 1px #ccc;
- }
-
-.showcase-nav-item {
- padding-right: 10px
-}
-
-.showcase-nav-item, .showcase-nav-item:visited {
- color: #333;
- display: block;
- float: left;
- line-height: 40px;
- margin: 0 1px;
- padding: 0 15px;
-}
-
-.showcase-nav-item:hover, .showcase-nav-item:active, .showcase-nav-item:focus {
- border: 1px solid #ddd;
- border-top: 0px solid;
- border-bottom: 0px solid;
- background-color: #efefef;
- color: #DD4814;
- margin: 0;
-}
-
-.main-content {
- clear: both;
- float: left;
- margin: 5px 10px;
- padding: 10px;
- width: 920px;
-}
-
-.minor-content {
- float: left;
- margin: 5px 10px;
- padding: 10px;
- width: 440px;
-}
-
-.side-content {
- float: left;
- margin: 5px 10px;
- padding: 10px;
- width: 280px;
-}
-
-.sub-content {
- float: left;
- margin: 5px 10px;
- padding: 10px;
- width: 120px;
-}
-
-p {
- padding: 5px 0px 10px
-}
-
-.divide {
- border: 0px solid;
- clear: both;
- font-size: 0px;
- height: 1px;
- margin: -1px 0px 0px;
-}
-
-.divide-showcase {
- border: 0px solid;
- clear: both;
- font-size: 0px;
- height: 1px;
- margin: -1px 0px 25px;
-}
-
-#blog-posts {
- float: left;
- margin: 5px 10px;
- padding: 10px;
- width: 600px;
-}
-
-.blog-post {
- clear: both;
- margin-bottom: 10px;
- padding-bottom: 10px;
-}
-
-.post-figure {
- float: right;
- margin: 10px 0px 10px 10px;
- padding: 0px;
- position: relative;
- width: 260px;
-}
-
-.post-img {
- display: block;
- margin: 0px;
- padding: 0px;
- position: relative;
- width: 260px;
-}
-
-.post-img-caption {
- position: absolute;
- bottom: 0px;
- left: 0px;
- padding: 10px;
- width: 240px;
-}
-
-.comments-count {
- clear: both;
- display: block;
- font-style: italic;
- color: #999;
- text-align: right;
-}
-
-#blog-aside {
- float: left;
- margin: 5px 10px;
- padding: 0px;
- width: 300px;
-}
-
-.widgets-aside {
- float: left;
- margin: 5px 0px 15px;
- padding: 10px;
- width: 280px;
-}
-
- .widgets-aside /* progressive */ {
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- -moz-box-shadow: 0px 1px 1px #dfdfdf;
- -webkit-box-shadow: 0px 1px 1px #ccc;
- }
-
-.pagination {
- clear: both;
- text-align: center;
-}
-
-.footer-content {
- float: left;
- margin: 5px 10px;
- padding: 10px;
- width: 120px;
-}
-
- .footer-content dd {
- margin-bottom: 15px
- }
-
-.foot-note {
- clear: both;
- margin: 15px 10px 0px;
- padding: 10px;
- width: 920px;
-}
-
-.plugin {
- margin: 0 -10px;
- padding: 0px;
- width: 980px;
-}
-
-/*- Decoration
--------------------------------------------------------------------------------------------------------- */
-
-body {
- background: url("../images/dotted.png") repeat scroll 0 0 #FFFFFF;
- color: #333333;
-}
-
-#top-nav {
- background-color:#ffffff;
-}
-
-.top-nav-item, .top-nav-item:visited {
- color:#333333;
-}
-
-.top-nav-item:hover {
- text-decoration: underline;
-}
-
-.top-login-item {
- color:#dd4814;
-}
-
-.top-login-item:hover {
- text-decoration: underline;
-}
-
-#page-header {
- background: url("../images/header.png") repeat-x scroll 0 0 #DD4814;
- height: 70px;
-}
-
- #page-header .container {
- background: url("../images/header.png") repeat-x scroll 0 0 #DD4814
- }
-
-#top-logo {
- color: #fff;
- line-height: 1.5em;
- text-align: right;
-}
-
-#the-logo {
- background: url("http://www.ubuntu.com/sites/default/themes/ubuntu10/logo.png";);
- width: 118px;
- height: 27px;
- display: block;
- clear: both;
- float: right
-}
-
-#loco {
- clear: both;
- display: block;
- float: right;
- color: #fff;
-}
-
-#main-nav {
- border-left: 1px solid #EF7149;
- z-index: 10;
-}
-
-#page-related {
- background-color: #FFFFFF
-}
-
-#sub-nav-container {
- background-color: #F7F7F7;
- border-bottom-left-radius: 8px;
- border-bottom-right-radius: 8px;
-}
-
-#pop-up-text {
- font-weight: bold;
- line-height: 20px;
- padding: 0px 5px;
-}
-
-.login-label {
- height: 16px;
- margin: 7px 0px 7px 9px;
- padding: 3px;
-}
-
-#username, #password {
- background-color: #f0f0f0;
- border: 1px solid #CCCCCC;
- height: 16px;
- margin: 7px 0px 7px 9px;
- padding: 3px;
- width: 110px;
-}
-
-#login {
- background-color: #f0f0f0;
- border: 1px solid #CCCCCC;
- height: 24px;
- margin: 7px 9px 7px 7px;
- padding: 2px;
-}
-
-#login:hover {
- background-color: #f7f7f7;
- border: 1px solid #DD4814;
-}
-
-#join:hover, #join:active, #join:focus {
- color: #DD4814;
- text-shadow: 1px 1px 2px #999;
-}
-
-#join, #join:visited {
- color: #333
-}
-
-/* Form decoration */
-form ul {
- list-style-type: none;
-}
-
-form .error {
- background-image: url('../images/error.png');
- background-repeat: no-repeat;
-}
-
-form .help {
- background-image: url('../images/help.png');
- background-repeat: no-repeat;
-}
-
-form .smalltext {
- color: #333333;
-}
-
-label {
- color: #333333;
-}
-
-label.required:after {
- color: #DD4814;
- content: " *";
-}
-
-legend {
- background-color: #aea79f;
- color: #ffffff;
-}
-
-legend span.supporting {
- color: #ffffff;
-}
-
-legend span.supporting:before {
- color: #DD4814;
- content: "* ";
-}
-
-fieldset {
- background-color: #dfdcd9;
-}
-
-input[type="text"], input[type="password"], select, textarea {
- color: #333333;
- border: 1px solid #ccc1c1;
- background-color: white;
-}
-
-input[type="submit"][disabled="disabled"], input[type="submit"][disabled="disabled"]:hover {
- background-color:#AEA79F;
- text-shadow: none;
-}
-
-input[type="text"]:focus, input[type="password"]:focus {
- border: 2px solid #dd4814;
- color: #333333;
-}
-
-select:focus {
- border: 2px solid #dd4814;
- color: #333333;
-}
-
-input[type="text"].error, input[type="password"].error, select.error {
- border: 2px solid #dd4814;
- color: #dd4814;
-}
-
-input[type="submit"] {
- border-radius: 4px;
- background: #dd4814 url('../images/gradient.png') repeat-x;
- color: #ffffff;
- border: none;
- text-shadow: black 0px 1px 2px;
-}
-
-input[type="submit"]:hover {
- background-color: #b83a0f;
-}
-
-input[type="submit"]:active {
- background-color: #962d0c;
-}
-/* END Form decoration */
-
-
-FORM.search_form INPUT, #searchbox {
- background-color: #f0f0f0;
- border: 1px solid #CCCCCC;
- height: 16px;
- margin: 7px 0px 7px 9px;
- padding: 3px;
- width: 180px;
-}
-
-FORM.search_form INPUT, #searchbox:focus {
- background-color: #f7f7f7;
- border: 1px solid #DD4814;
-}
-
-#go-search {
- background-color: #f0f0f0;
- border: 1px solid #CCCCCC;
- height: 24px;
- margin: 7px 9px 7px 0px;
- padding: 2px;
-}
-
-#go-search:hover {
- background-color: #f7f7f7;
- border: 1px solid #DD4814;
-}
-
-#more-search:hover, #more-search:active, #more-search:focus {
- background-color: #f7f7f7;
- border: 1px solid #DD4814;
- color: #DD4814;
- text-shadow: 1px 1px 2px #999;
-}
-
-#more-search, #more-search:visited {
- background-color: #f0f0f0;
- border: 1px solid #CCCCCC;
- color: #333;
- height: 16px;
- margin: 7px 7px 7px 0px;
- padding: 1px 3px;
-}
-
-table.basic thead {
- background-color:#aea79f;
-}
-
-table.basic tfoot, table.basic tr.subsection {
- background-color:#dfdcd9;
-}
-
-table.basic tbody tr {
- border-bottom:1px dotted #cccccc;
-}
-
-table.basic thead th {
- color:#ffffff;
-}
-
-table.basic tfoot td, table.basic tbody td {
- color:#333333;
-}
-
-table.basic thead a {
- color:#ffffff;
-}
-
-table.basic tfoot a {
- color:#333333;
-}
-
-table.basic tbody a {
- color:#dd4814;
-}
-
-.showcase-caption {
- background-color: #000;
- background-color: rgba(0,0,0,0.4);
- color: #fff;
-}
-
-#showcase-nav {
- background-color: #f7f7f7;
- border-radius: 8px;
- box-shadow: 0px 1px 1px #dfdfdf;
- height: 40px;
-}
-
-#main-section .container {
- background-color: #fff;
- background-image: none;
- padding: 0px 10px 10px;
- position: relative;
- width: 960px;
-}
-
-.alone, .leading, .aggregator {
- background-color: #f7f7f7;
- border-radius: 8px;
- box-shadow: 0px 1px 1px #dfdfdf;
- float: left;
-}
-
- .alone, .leading, .aggregator /* progressive */ {
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- -moz-box-shadow: 0px 1px 1px #dfdfdf;
- -webkit-box-shadow: 0px 1px 1px #ccc;
- }
-
- .aggregator .first {
- margin-left: 0px
- }
-
- .aggregator .last {
- margin-right: 0px
- }
-
-.aggregator {
- margin: 5px 10px
-}
-
-.post-header {
- border-bottom: 1px dotted #333333;
- margin-bottom: 10px;
- padding-bottom: 5px;
-}
-
-.post-meta {
- color: #999;
- font-size: 0.85em;
- font-style: italic;
-}
-
-.post-title-link:hover, .post-title-link:active, .post-title-link:focus {
- color: #DD4814;
- text-shadow: 1px 1px 2px #999;
-}
-
-.post-title-link, .post-title-link:visited {
- color: #333
-}
-
-.post-img-caption {
- background-color: #000;
- background-color: rgba(0,0,0,0.4);
- color: #fff;
-}
-
-.pagination {
- border-top: 1px solid #333;
- color: #fff;
- margin-top: 15px;
- padding-top: 15px;
-}
-
-.pagination-item {
- border-bottom: 1px solid #333;
- color: #333;
- margin-right: 5px;
- padding: 2px 6px;
-}
-
-.pagination-item:hover {
- border-bottom: 1px solid #DD4814;
- background-color: #f7f7f7;
- color: #DD4814;
-}
-
-.pagination-item.current {
- background-color: #f7f7f7;
- border-bottom: 1px solid #333;
- color: #333;
- font-weight: bold;
-}
-
-.widgets-aside {
- background-color: #f7f7f7;
- border-radius: 8px;
- box-shadow: 0px 1px 1px #dfdfdf;
-}
-
-.widget-links {
- list-style: none
-}
-
-.a-item {
- display: block;
- margin-top: 3px;
-}
-
-.side-link:hover, .side-link:active, .side-link:focus {
- background-color: #fff;
- border-right: 3px solid #DD4814;
- color: #DD4814;
- text-decoration: none;
-}
-
-.side-link, .side-link:visited {
- color: #333333;
- display: block;
- padding-right: 3px;
-}
-
-#login-widget {
- text-align: center
-}
-
-#page-footer {
- background: url("../images/footer.png") repeat-x scroll 0 0 #EEECEA
-}
-
- #page-footer .container {
- background: url("../images/footer.png") repeat-x scroll 0 0 #EEECEA;
- padding: 0px 10px;
- width: 960px;
- }
-
- #page-footer .container div.copyright {
- font-size: 10px;
- line-height: 14px;
- color: #aea79f;
- }
-
-.footer-links {
- list-style: none
-}
-
-.footer-item {
- border-bottom: 1px dotted #333;
- display: block;
- margin-top: 3px;
-}
-
-.foot-note {
- color: #999;
- font-style: italic;
-}
-
-.footer-link:hover, .footer-link:active, .footer-link:focus {
- color: #DD4814;
- text-decoration: underline;
-}
-
-.footer-link, .footer-link:visited {
- color: #333333
-}
-
-.footer-link-main:hover, .footer-link-main:active, .footer-link-main:focus {
- color: #DD4814;
- text-decoration: underline;
-}
-
-.footer-link-main, .footer-link-main:visited {
-
-}
-
-/*- Forum Decoration [Demo]
--------------------------------------------------------------------------------------------------------- */
-
-.forum-title {
- background-color: #efefef;
- margin: 10px 0px;
- padding: 20px;
-}
-
-.forum-item {
- border-top: 1px dotted #999
-}
-
-.cat-title, .sub-sections {
- font-size: 0.75em;
- /* 16x0.75 =12 */
-}
-
-.latest, .post-count {
- font-size: 0.75em;
- /* 16x0.75 =12 */ line-height: 1.2em;
-}
-
-.cat-title, .post-count, .latest {
- padding: 10px;
- vertical-align: middle;
-}
-
-.forum-title-link:hover, .forum-title-link:active, .forum-title-link:focus {
- color: #DD4814;
- text-shadow: 1px 1px 2px #999;
-}
-
-.forum-title-link, .forum-title-link:visited {
- color: #333
-}
-
-.status {
- background-color: #efefef;
- padding: 10px 5px;
- vertical-align: middle;
- width: 30px;
-}
-
-.latest {
- width: 180px
-}
-
-.post-count {
- width: 120px
-}
-
-.sub-sections {
- background-color: #efefef;
- padding: 5px 10px 10px;
-}
-
-.post-count {
- background-color: #efefef
-}
-
-.count {
- display: block;
- font-style: italic;
-}
-
-/* KuZeKo web@xxxxxxxxxx
--------------------------------------------------------------------------------------------------------- */
=== removed file 'themes/ubuntu/static/newstyle.css'
--- themes/ubuntu/static/newstyle.css 2011-07-07 15:11:11 +0000
+++ themes/ubuntu/static/newstyle.css 1970-01-01 00:00:00 +0000
@@ -1,592 +0,0 @@
-/*
- * newstyle.css
- *
- * Base style for the LoCo Directory. This is an implementation
- * of the ( at the time of this writing ) new Ubuntu branding.
- *
- * Author: Michael Hall ( mhall119 )
- * Author: Paul Tagliamonte ( paultag )
- */
-
-h1.centered {
- text-align: center;
-}
-
-a {
- color: #DD4814;
-}
-
-a:visited {
- color: #b12a10;
-}
-
-th.form-item-label {
- vertical-align: top;
-}
-
-td.no-wrap {
- white-space: nowrap;
-}
-
-/*
-label {
- font-weight: bold;
- white-space: nowrap;
-}
-*/
-
-.minor-content.venue-map {
- min-height: 350px;
- margin-top: 60px;
-}
-
-#main-content {
- margin-right: 20px;
-}
-
-li.col_left {
- float: left;
- width: 45%;
- clear: left;
-}
-
-li.col_right {
- float: right;
- width: 45%;
- clear: right;
-}
-
-li.approved {
- list-style-image: url(../img/approved.png); /* Colorful Ubuntu Logo */
-}
-
-li.unapproved {
- list-style-image: url(../img/unapproved.png); /* Grey Ubuntu Logo */
-}
-
-ol.agenda-list, .agenda-list ol, .agenda-list li {
- padding: 2px 10px !important;
-}
-
-.relative {
- position: relative;
-}
-
-br.clear {
- clear: left;
-}
-
-#main-content .object-detail {
- -moz-border-radius: 15px;
- -webkit-border-radius: 15px;
-
- border: 2px solid #ccc;
- border-bottom: 4px solid #bbb;
- border-right: 4px solid #bbb;
- border-top: 2px solid #ddd;
- min-height: 500px;
- text-align: left;
-}
-
-#main-content .object-detail #options-left ul {
- position: relative;
- left: -60px;
-}
-
-#main-content .object-detail #options-right ul {
- position: relative;
-}
-
-#main-content .object-detail #options-left li {
- float: left;
- margin-left: 5px;
- display: inline;
-}
-
-#main-content .object-detail #options-right li {
- float: right;
- margin-right: 5px;
- text-align: right;
- display: inline;
-}
-
-#main-content .object-detail .option {
- width: 32px;
- height: 32px;
- display: block;
- text-decoration: none;
-}
-
-#main-content .object-detail a.goback {
- background: transparent url('../img/goback.png') no-repeat scroll top right;
-}
-
-#main-content .object-detail a.edit {
- background: transparent url('../img/edit.png') no-repeat scroll top right;
-}
-
-#main-content .object-detail a.delete {
- background: transparent url('../img/delete.png') no-repeat scroll top right;
-}
-
-#main-content .object-detail a.add-team-event {
- background: transparent url('../img/new_event.png') no-repeat scroll top right;
-}
-
-#main-content .object-detail a.add-comment {
- background: transparent url('../img/comment.png') no-repeat scroll top right;
-}
-
-.resource {
- width: 32px;
- height: 32px;
- padding: 2px;
- margin-top: 4px;
- margin-bottom: 3px;
- float: left;
- border: 1px white solid;
-}
-
-#main-content .resource:hover {
- border: 1px #eee solid;
-}
-
-#page-footer .container div.copyright {
- font-size: 0.75em;
- line-height: 1.5em;
-}
-
-#page-footer .container div.loggedin {
- font-size: 0.75em;
- line-height: 1.5em;
- float: left;
- width: 400px;
- margin-bottom: 10px;
- margin-top: 5px;
-}
-
-#page-footer .container div.lang_switcher {
- font-size: 0.75em;
- line-height: 1.5em;
- float: right;
- margin-bottom: 10px;
- margin-top: 5px;
- margin-right: 14px;
-}
-
-.team-event-nav {
- border-bottom: 1px gray solid;
- list-style: none;
- padding: 1px 0px 1px 5px;
- margin: 5px 0px 5px 0px;
-}
-
-.team-event-nav li {
- list-style: none;
- margin: -1px 2px 0px 3px;
- padding: 0px;
- display: inline;
-}
-
-.message .content-shim {
- margin: 0px; /* buffer the bulb in */
- padding: 5px; /* un-suck the text */
- background-repeat: no-repeat;
- background-image: url(../img/infobox-icon.png);
- padding-left: 30px; /* infobox icon is 22x22 */
-}
-
-.message {
- width: 70%;
- margin-left: auto;
- margin-right: auto;
- background-color: #FFFFB6;
- border-radius: 0px;
- box-shadow: 0px 1px 1px #FFE4B6;
-}
-
-.message { /* noncss 3. XXX: remove me in 20 years. */
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- -moz-box-shadow: 0px 0px 1px #FFE4B6;
- -webkit-box-shadow: 0px 0px 1px #FFE4B6;
-}
-
-/* UI Errors ( To yell at the user when they don't fill out a form ) */
-
-/*
-ul.errorlist {
- margin: 0px;
- padding: 0px;
-}
-
-.errorlist li {
- color: red;
- font-weight: bold;
- display: block;
- font-size: 1.1em;
- margin: 0px 0px 3px;
- padding: 4px 5px;
-}
-*/
-
-
-/* Flickr Feed for Global Event */
-
-.thumbs {
- margin: 0px;
- padding: 0px;
- overflow: hidden;
-}
-
-.thumbs li {
- list-style: none;
- float: left;
- margin: 5px;
- padding: 3px;
- background: #eee;
- -moz-box-shadow: 0px 0px 4px #444;
- -webkit-box-shadow: 0px 0px 2px #000;
-}
-
-.thumbs li a { }
-.thumbs li img { display: block; }
-.thumbs li a img { border: none;}
-
-aside#top-nav {
- width: 980px;
-}
-
-header#page-header {
- width: 960px;
- margin: 0px auto;
- padding: 0px 10px;
- position: relative;
-}
-
-footer#page-footer {
- width: 960px;
- margin: 0px auto;
- padding: 0px 10px;
- position: relative;
-}
-
-#page-footer div.container { width: 940px; }
-
-
-
-/*#venue-list ul,*/
-.venue-list{
- overflow:auto;
-}
-
-
-.venue-list h3 {
- color: #333;
- padding: 10px 0px 10px 10px;
- background: white url(/ubuntu-website/media/images/dotted.png) repeat scroll 0px 0px;
- margin-bottom: 0;
-}
-
-.venue-list ul {
- display: block;
- float: left;
- list-style-image: none;
- list-style-type: none;
- padding: 4px 0px 5px 5px;
- text-indent: 0px;
- width: 915px;
- background-color:#F7F7F7;
-}
-
-.venue-list ul li {
- list-style-image: none;
- list-style-type: none;
- text-indent: 0px;
- width: 200px;
- margin-right: 22px;
- margin-bottom: 5px;
- padding-left: 5px;
- float: left;
- font-size:12px;
-}
-
-.venue-list ul li h3{
- padding: 0px;
- background:#f7f6f5;
- margin: 0px;
- color: #333;
- padding: 4px 0px;
-}
-
-
-.venue-list ul li p{
- font-size: 12px;
- line-height: 16px;
- margin: 0px;
- padding: 0px;
-}
-
-.venue-list ul li p a{
- border-bottom: 1px dotted #333;
- clear: both;
- display: block;
- float: none;
- padding: 5px 0px 3px;
-}
-
-#site_search_form {
- width: auto;
-}
-#site_search_form input#id_q {
- background-color: #F0F0F0;
- border: 1px solid #CCCCCC;
- height: 16px;
- margin: 7px 0 7px 9px;
- padding: 3px;
- width: 180px;
-}
-
-form[name="lang-switcher"] {
- width: auto;
-}
-
-select[name="lang"] {
- background: auto;
- border: auto;
- width: auto;
- height: auto;
- font-size: 1em;
- margin: 0;
-}
-
-/* TODO: date_begin and date_end should have class .small */
-#id_date_begin_0, #id_date_begin_1, #id_date_end_0, #id_date_end_1 {
- width: 134px;
-}
-#id_date_begin_0:focus, #id_date_begin_1:focus, #id_date_end_0:focus, #id_date_end_1:focus {
- width: 132px;
-}
-/*
-.form {
- width: 500px;
- float:left;
-}
-
-.form div{
- padding-top:2px;
- padding-bottom:2px;
-}
-
-.form div span.help{
- font-size:20px;
- color: #DD4814;
- cursor:pointer;
- vertical-align: top;
- display:inline;
-
-}
-
-.form input[type="text"], .form textarea, .form select {
- padding: 5px;
- width: 200px;
- margin: 0px 0px 5px 0px;
- border: 1px solid #ccc;
-}
-
-.form input[type="text"] {
- margin-right: 10px;
-}
-
-.form input[type="checkbox"] {
- width: 200px;
- height:35px;
- margin: 0px 0px 5px 0px;
-}
-
-.form div div.field {
- float: left;
- padding-top: 5px;
-}
-
-.form div.approved, .form div.approved_date, .form div.expires_date {
- height:30px;
-}
-
-.form span.extra {
- float: left;
- padding-top: 5px;
- font-size:0.8em;
-}
-
-.form div div.field label{
- float: left;
- padding-right: 10px;
- width: 170px;
- font-size: 0.8em;
- text-align: right;
- font-weight:normal;
-}
-
-.form div span.required {
- font-size:20px;
- color: red;
- margin-left:5px;
- vertical-align: top;
- display:inline;
-}
-
-.form textarea {
- height: 90px;
- width: 270px;
-}
-
-
-.form select:focus, .form textarea:focus, .form input:focus {
- border: 1px solid #900;
-}
-
-.form input.submit-button {
- padding-left: 20px;
- padding-right: 20px;
- float: right;
- margin-right: 50px;
-}
-
-.form ul.errorlist {
- margin: 0px;
- padding: 0px;
-}
-
-.form .errorlist li {
- color: red;
- font-weight: bold;
- display: block;
- font-size: 0.8em;
- margin: 0px 130px 3px;
- padding: 4px 5px;
-}
-*/
-
-.attendee-cell {
- padding-top:10px;
-}
-
-.attendee-mugshot {
- vertical-align: middle;
-}
-
-.agenda-list {
- list-style-type: decimal;
-}
-
-.agenda-list .agenda-list {
- margin-left: 20px;
- list-style-type: lower-alpha;
-}
-
-.agenda-list .agenda-list .agenda-list {
- list-style-type: lower-roman;
-}
-
-.agenda-list .agenda-list .agenda-list .agenda-list {
- list-style-type: circle;
-}
-
-.agenda-title {
- font-weight: bold;
-}
-
-.agenda-description {
- margin-left: 30px;
- font-size: 0.9em;
-}
-
-#webchat {
- display: none;
- width: 900px;
- margin: 0 auto;
-}
-
-#ircchat {
- display: block;
- width: 900px;
- margin: 0 auto;
-}
-
-#locobranding {
- width: 96px;
- height: 96px;
- position: absolute;
- right: 10px;
-}
-
-/* My Teams style */
-h2.dynamic-width {
- display: inline-block;
- margin-bottom: 0;
-}
-
-.resources {
- font-size: 0.75em;
- float: right;
- margin-top: 21px;
-}
-
-.resources a {
- margin-left: 8px;
-}
-
-.photo a {
- display: inline-block;
- padding: 7px;
-}
-
-.photo img {
- width: 75px;
-}
-
-.main-content-split {
- width:450px;
- margin-top: 15px;
-}
-
-.main-content-split.left {
- float: left;
-}
-
-.main-content-split.right {
- float: right;
-}
-
-.main-content-split.left .title {
- font-size: 0.875em;
-}
-
-.main-content-split.left .new {
- float: right;
- font-size: 0.75em;
-}
-
-.event-summary {
- margin-top:15px;
-}
-
-hr.no-top {
- margin: 0 0;
-}
-
-img.bottom {
- vertical-align: bottom;
-}
-
-ul.indent {
- list-style: none;
- background-color: #F7F7F7;
- padding: 2px 2px 2px 15px;
-}
-
-ul.indent li {
- line-height:1.2em;
- margin: 0.5em 0;
-}
=== modified file 'themes/ubuntu/theme.conf'
--- themes/ubuntu/theme.conf 2011-07-22 12:52:43 +0000
+++ themes/ubuntu/theme.conf 2012-05-10 19:16:22 +0000
@@ -1,6 +1,5 @@
[theme]
inherit = basic
-stylesheet = default.css
pygments_style = none
[options]
Follow ups
