From 261f73f13a095f4b744b826b107bdb51fc23c96c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kalle=20S=C3=B6derman?= Date: Sat, 29 Jan 2011 11:44:53 +0000 Subject: [PATCH] edit bar and other changes + latest debian.css --- debwiki/css/common.css | 2 +- debwiki/css/debian.css | 125 ++++++++++++++++++++++++++++++++-------- debwiki/css/debwiki.css | 41 ++++--------- theme/debwiki.py | 75 +++++++----------------- 4 files changed, 134 insertions(+), 109 deletions(-) diff --git a/debwiki/css/common.css b/debwiki/css/common.css index 9e9ec0b..a0ef104 100644 --- a/debwiki/css/common.css +++ b/debwiki/css/common.css @@ -1,2 +1,2 @@ @import url("modernized-common.css"); -@import url("debwiki.css"); +@import url("debwiki2.css"); diff --git a/debwiki/css/debian.css b/debwiki/css/debian.css index 29d44a3..e24172d 100644 --- a/debwiki/css/debian.css +++ b/debwiki/css/debian.css @@ -1,12 +1,25 @@ /* - www.debian.org stylesheet proposal - - Kalle Soderman, 2008 debian.css - - Copyleft : This work is free, you can copy, spread, and modify it under - the terms of the Free Art License http://artlibre.org/licence/lal/en/ - + http://www.debian.org Stylesheet + + Copyright 2011 Kalle Söderman + + This stylesheet is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as published by + the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + Street, Fifth Floor, Boston, MA 02110-1301 USA. + + The license text can also be found at http://www.gnu.org/copyleft/gpl.html and + /usr/share/common-licenses/GPL-2 on Debian GNU/Linux. +*/ +/* Font size table (Browser default 16px) pixels relative @@ -23,7 +36,7 @@ 10px 0.625em 9px 0.5625em -------------------- - */ +*/ /* Reset */ @@ -68,8 +81,8 @@ body { background-position: 30px 9px; */ } -#outer { - margin: 0 10px 0 62px; +#content { + margin: 0 10px 0 52px; } #inner { position: relative; @@ -82,7 +95,7 @@ body { #header { margin:0; - padding:0 10px 0 62px; + padding:0 10px 0 52px; } #header a:link , #header a:visited @@ -119,9 +132,17 @@ p.section { letter-spacing: 0.08em; position:absolute; top: 0px; - left:62px; + left:52px; background-color: #c70036; } +p.section a { + color: white; + text-decoration: none; +} +p.section a:hover { + color:white; + text-decoration: underline; +} #navbar { background-color: transparent; list-style:none; @@ -147,7 +168,7 @@ p.section { } #navbar a:link , #navbar a:visited { - padding: 1.75em 1em 0.25em 1em; + padding: 1.75em 0.5em 0.25em 0.5em; border-left: 1px solid transparent; border-right: 1px solid transparent; display: block; @@ -158,11 +179,21 @@ p.section { } #navbar a:hover , #navbar a:visited:hover { - background-color: #efefef; + background-color: #f5f6f7; border-left: 1px solid #d2d3d7; border-right: 1px solid #d2d3d7; text-decoration: underline; } +ul.subnav { + list-style: none; + margin-left: 0; + padding-left: 0; + margin-top: 0; +} +ul.subnav li { + display: inline; + margin-right: 1em; +} #searchbox { text-align:left; line-height: 1; @@ -189,14 +220,14 @@ p.section { background-color: transparent; border: 1px solid transparent; border-top: 0; - width: 61px; + width: 50px; height: 5.07em; min-height: 65px; } #logo a { display: block; position: relative; - padding: 0 5px 0 5px; + padding: 0; height: 100%; min-height: 65px; } @@ -209,7 +240,7 @@ p.section { #logo:hover { border: 1px solid #d2d3d7 ; border-top: 0; - background-color: #eee; + background-color: #f5f6f7; } /* Links */ @@ -234,6 +265,36 @@ a:active { a img { border:0; } +a.rss_logo { + font-size: 0.75em; + float: right; + width: 35px; + line-height: 10px; + color: #ffffff; + background-color: #ff6600; + font-weight: bold; + font-family: sans-serif; + text-align: center; + text-decoration: none; + padding: 0.25em; + margin-left: 0.25em; + border: 1px solid #ff6600; +} + +a.rss_logo:hover { + background-color: white; + border: 1px solid #ff6600; + color: #ff6600; +} + +a.rss_logo.generic { + background-color: #ff8800; +} + +a.rss_logo.generic:hover { + background-color: #ee7700; +} + /* Secondnav */ @@ -241,7 +302,7 @@ a img { width: 16em; font-size: 0.75em; line-height: 1.5; - position: absolute; + float: right; top: 0; right: 0; margin: 3em 0 0 0; @@ -363,6 +424,10 @@ tt, code { white-space: pre; color: black; } +dt { + margin: 1.5em 0 0 0; + font-weight: bold; +} dd { margin: 0 0 0 1.5em; } @@ -405,6 +470,13 @@ acronym, abbr { background-color: #f0f0f4; text-decoration: underline; } +.toc dt { + margin: 0; + background-image: url('Pics/greydot.png'); + background-position: top left; + background-repeat: repeat-x; + padding: 0.0833em 0 0.0833em 0; +} /* Sitemap */ @@ -439,11 +511,14 @@ acronym, abbr { border: 1px solid #dfdfe0; padding:1em; background-color: #f5f6f7; - margin: 0 0 0 0; + margin: 0 10px 0 52px; line-height: 1.5em; border-left: 0; border-right: 0; } +#content #footer { + margin-left: 0; +} #footer p { margin: 1em 0 1em 0; } @@ -511,7 +586,7 @@ ul#footermap-cole { } #footermap li ul { margin: 0; - padding: 0: + padding: 0; } #footermap li li { margin:0; @@ -718,12 +793,11 @@ table.vote td, table.vote th { #maincol.with-toolbox { margin-right: 14em; } -table.vendors { +div.tabular table, table.tabular, table.vendors { /* border-bottom: 1px solid #a9abb3; border-top: 1px solid #a9abb3; */ border-bottom: 0.15em solid #666; border-top: 0.15em solid #666; - display: block; width: auto; font-size: 0.75em; line-height: 2em; @@ -733,17 +807,20 @@ table.vendors { table td { padding-right: 1.5em; } -table.vendors tr { +div.tabular table tr, table.tabular tr, table.vendors tr { width: 100%; } table th { padding-right: 1.5em; } -table.vendors td { +div.tabular table td, table.tabular td, table.vendors td { background-image: url(Pics/greydot.png); background-position: top left; background-repeat: repeat-x; } +div.tabular table > td:fist-child, table.tabular > td:fist-child, table.vendors > td:fist-child { + background-image: none; +} #pageLang p, #pageLang form { display: inline; } diff --git a/debwiki/css/debwiki.css b/debwiki/css/debwiki.css index f59c78e..ee694a0 100644 --- a/debwiki/css/debwiki.css +++ b/debwiki/css/debwiki.css @@ -146,11 +146,11 @@ form select { } .editbar { - background: url('Pics/reddot.png') bottom left repeat-x; - width: 100%; - padding: 0 0 0.5em 0; + padding: 0 0 0 0; font-size: 0.75em; line-height: 2; + position: absolute; + right: 10px; } #leftcol li { @@ -274,7 +274,6 @@ div.table-of-contents a { display: block; } h1#locationline { - margin-bottom: 0.5em; } h1#locationline a { color: black; @@ -317,13 +316,13 @@ a.codenumbers { p#pageinfo { color: gray; - font-size: 0.75em; - margin: 1em 0 0 62px; + font-size: 1em; + margin: 1em 0 0 0; } #footer { margin-top: 2em; - margin-left: 61px; + margin-left: 52px; margin-right: 10px; clear: both; } @@ -433,26 +432,20 @@ ul#navibar li.userlink { } #pagetrail { margin:0; - font-size: 0.75em; + display: inline; text-transform: lowercase; line-height: 2; background-color: transparent; background-color: #f5f6f7; - border-bottom: 1px solid #d2d3d7 ; min-height: 20px; } -#pagetrail:before { - content: "/"; - margin-left: 0.5em; - margin-right: 0.5em; -} #searchform { position: absolute; right: 10px; top: 0; } div#content { - margin: 0 10px 0 61px; + margin: 0 10px 0 52px; } div#header { margin:0; @@ -503,8 +496,8 @@ form.actionsmenu { vertical-align: text-top; } span.sep { - margin-right: 0.5em; - margin-left: 0.5em; + margin-right: 0.25em; + margin-left: 0.25em; } td.diff-added { color: #31a300; @@ -512,16 +505,6 @@ td.diff-added { td.diff-removed { color: #c70036; } -div#domaintools { - position: absolute; - top: 0; - left: 0; -} -div#domaintools p.section { - margin: 0; -} -div#domaintools div#username { - line-height: 1.5em; - margin-left: 10em; - top:0; +td.diff-info { + padding-left:0; } diff --git a/theme/debwiki.py b/theme/debwiki.py index 5529bb3..5ef31e9 100644 --- a/theme/debwiki.py +++ b/theme/debwiki.py @@ -1,10 +1,9 @@ # -*- coding: iso-8859-1 -*- """ - MoinMoin - Debian theme + MoinMoin - modern theme @copyright: 2003-2005 Nir Soffer, Thomas Waldmann @license: GNU GPL, see COPYING for details. - theme modified by Kalle Soderman """ from MoinMoin.theme import ThemeBase @@ -92,28 +91,27 @@ class Theme(ThemeBase): # Header u'', # Post header custom html (not recommended) @@ -138,7 +136,7 @@ class Theme(ThemeBase): # Header u'', @@ -162,7 +160,6 @@ class Theme(ThemeBase): page = d['page'] html = [ # End of page - self.pageinfo(page), self.endPage(), # Pre footer custom html (not recommended!) @@ -170,7 +167,8 @@ class Theme(ThemeBase): # Footer u'', @@ -180,39 +178,6 @@ class Theme(ThemeBase): ] return u'\n'.join(html) - def title(self, d): - """ Assemble the title (now using breadcrumbs) - - @param d: parameter dictionary - @rtype: string - @return: title html - """ - _ = self.request.getText - content = [] - if d['title_text'] == d['page'].split_title(): # just showing a page, no action - curpage = '' - segments = d['page_name'].split('/') # was: title_text - for s in segments[:-1]: - curpage += s - content.append(Page(self.request, curpage).link_to(self.request, s)) - curpage += '/' - link_text = segments[-1] - link_title = _('Click to do a full-text search for this title') - link_query = { - 'action': 'fullsearch', - 'value': 'linkto:"%s"' % d['page_name'], - 'context': '180', - } - # we dont use d['title_link'] any more, but make it ourselves: - link = d['page'].link_to(self.request, link_text, querystr=link_query, title=link_title, css_class='backlink', rel='nofollow') - content.append(link) - else: - content.append(wikiutil.escape(d['title_text'])) - - location_html = u'/'.join(content) - html = u'%s' % location_html - return html - def username(self, d): """ Assemble the username / userprefs link @@ -293,7 +258,7 @@ class Theme(ThemeBase): title = self.shortenPagename(title) link = page.link_to(request, title) items.append(link) - html = u'
%s
' % u'/'.join(items) + html = u'
%s
'% u'/'.join(items) return html def interwiki(self, d): -- 2.39.2