From: Carsten K. <car...@us...> - 2002-02-11 02:30:14
|
Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian In directory usw-pr-cvs1:/tmp/cvs-serv9517 Modified Files: Hawaiian-heavy.css Hawaiian.css Log Message: Completely rebuilt stylesheet from ground up. Check out the new calendar (requires good css support). Index: Hawaiian-heavy.css =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/Hawaiian-heavy.css,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -I^#: -d -r1.8 -r1.9 --- Hawaiian-heavy.css 8 Feb 2002 16:19:03 -0000 1.8 +++ Hawaiian-heavy.css 11 Feb 2002 02:30:10 -0000 1.9 @@ -9,21 +9,42 @@ /* This makes spacings in NS4 too big. */ .toolbar, div.toolbar { margin: 0.5ex 0ex; } +/* Link icons */ +img.linkicon { vertical-align: middle; } + + /* This break NS4 (display does not go full width), but is necessary for IE4. */ div.wikitext { width: auto; /* NS4 doesn't know about png with transparency so it renders the whole image solid black */ - background: url("images/tchecker-white.png"); + background: url("images/tchecker-white.png") repeat; +} +.wiki-edithelp { + /* NS4 doesn't know about png with transparency so it renders the whole image solid black */ + background: url("images/tchecker-sand.png") repeat; +} +.wiki-edithelp p { + /* NS4 doesn't know about png with transparency so it renders the whole image solid black */ + background: url("images/tchecker-white.png") repeat; } -/* Link icons */ -img.linkicon { vertical-align: middle; } -/**************************************************************** - ** - ** Diff Output - ** - *****************************************************************/ +/** + * Diff Output + */ .diff .block div { position: relative; padding-left: 1.5em; } .diff .prefix { position: absolute; left: 0.5em; top: 0; } + + +/** + * Other + */ +div.errors { + /* NS4 doesn't know about png with transparency so it renders the whole image solid black */ + background: url("images/tchecker-sand.png") repeat; +} +.debug { + /* NS4 doesn't know about png with transparency so it renders the whole image solid black */ + background: url("images/tchecker-sand.png") repeat; +} Index: Hawaiian.css =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/Hawaiian.css,v retrieving revision 1.20 retrieving revision 1.21 diff -u -b -I^#: -d -r1.20 -r1.21 --- Hawaiian.css 10 Feb 2002 22:24:10 -0000 1.20 +++ Hawaiian.css 11 Feb 2002 02:30:10 -0000 1.21 @@ -1,267 +1,393 @@ -/* - $Id$ - - Classes: - - div.wikitext - the transformed wiki page text. - - a.wiki - link to page in wiki. - a.named-wiki - a named link to page in wiki (from e.g. [name|WikiPage]). - a.interwiki - link to page in another wiki - SPAN.wikipage - page name within interwiki link. - a.named-interwiki - link to page in another wiki - a.url - link to external URL from wiki page. - a.named-url - link to external URL from wiki page. - - .wikiunknown a, .wikiunknown u - .named-wikiunknown a, .named-wikiunknown u - - a.wikiaction - a.wikiadmin - .wikiunsafe - - a.backlinks - -TODO: Get rid of tables in wikiaction forms. -*/ +/** + * $Id$ + * + * This incarnation of this stylesheet is a complete rewrite from the + * ground up. It has not yet been tested against NS4. + * + * Mozilla's "DOM Inspector" Sidebar was an invaluable troubleshooting + * tool for mapping the more complex CSS node selectors, such as those + * used to reference the various CalendarPlugin elements. + */ -/* NS4 doesn't grok @import. This allows us to put things which +/** + * NS4 doesn't grok @import. This allows us to put things which * break NS4 in another file. As of OmniWeb 4.1, OW now @imports :-( */ @import url(Hawaiian-heavy.css); -body { -/* the background image url is relative to this file's directory */ - color : #000; - background-color : #fff; - background-image : url("images/uhhbackground.jpg"); - background-repeat : repeat; -} -body { font-family: arial, helvetica, sans-serif; } - -/* - * NS4, defaults from BODY don't always propagate correctly. - * So we need this: +/** + * General */ -.wikitext, .toolbar, p, td { font-family: arial, helvetica, sans-serif; } - -input.button { font-family: arial, helvetica, sans-serif; } - -input.numeric { - text-align: right; +img { + border: 0; + vertical-align: baseline; } -.wikitext PRE { font-family: monospace; } - -div.wikitext { - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0px; - padding-bottom: 0px; - margin: 0.5ex 0px; - clear: both; +form { margin: 0; } +input { margin: 0.1em; } +input.numeric { text-align: right; } +table { + border-spacing: 1px; + /* For Mozilla */ + empty-cells: show; +} +caption { + caption-side: top; + text-align: left; + margin-bottom: .5ex; + /* Allow the caption to extend to the full page width + Mac ie5.1 ignores this*/ + width: 100%; } -p.editdate { margin-bottom: 0ex; } - -input.wikitext { margin:0px; } - -div.toolbar { margin: 1ex 0ex; } -/* - * This is a kluge for NS4 which doesn't honor the clear: settings on - * .tool-left and .tool-right. - * - * Putting in explicit <br clear="all"> messes up the formatting in - * other browsers. Instead we'll put in a: - * - * <div class="br"><br class="ignore" clear="all"></div> - * - * The clear:both on DIV.br seems to work. And we'll disable the <br> altogether (in - * CSS aware browsers) by setting display:none. - * - * Actually, I haven't yet found a browser which doesn't put a line break - * between successive <div>'s. This makes the <br class="ignore"> completely - * unnecessary. +/** + * Wiki */ -div.br { clear:both; line-height: 0px; } -.ignore { display: none; } -div.errors { - background: #d6c8a8; - border: thin; - border-color: #a6977a; - border-style: solid; +/* Main wiki text box */ +body { + color: black; + background: white url("images/uhhbackground.jpg") repeat; + font-family: Arial, Helvetica, sans-serif; + margin: 1ex 0.5em; +} +body p { + margin-left: 1em; +} + +#logo img { + border: 1px outset gray; + margin-left: 1em; + margin-bottom: 1ex; +} +img#signature { + background: white; + border: 1px outset gray; + padding-left: 8px; + padding-right: 8px; + padding-top: 8px; + padding-bottom: 14px; +} +div.wikitext { + margin-top: 1ex; + margin-bottom: 0.5ex; padding-left: 0.8em; padding-right: 0.8em; - padding-top: 0px; - padding-bottom: 0px; - margin: 1em; - /* This breaks Netscape 4: (display does not go full width). - width: auto; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + /*This breaks Netscape 4: (display does not go full width). + * width: auto; */ clear: both; + /* user's browser settings * + font-family: none; */ } +div.wikitext hr { height: 1px; } -.errors h4 { - color: white; - text-decoration: underline; - margin:0px; -} +div.wikitext pre { font-family: monospace; } -p.error { - font-size: smaller; - font-family: monospace; - margin:0px; -} -.error ul -{ - font-size: smaller; - font-family: monospace; + +/** + * Link styles + */ +.wiki { + text-decoration: none; + font-weight: bold; + color: #87785c; } -/* - * Style for <hr>s in wiki markup. +/** + * wikiaction, wikiadmin, wikiunsafe: */ -.wikitext hr {} +.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks { text-decoration: none; } +.wikiaction, .wikiadmin { font-weight: bold; } +.wikiaction, .wikiaction table, span.wikiaction { color: #4d5a6b; } +.wikiadmin, .wikiadmin table { color :#ff7e00; } +.wikiunsafe { } -/* - * Link styles - */ -/* Wiki Links */ -a.wiki { text-decoration: none; color: #36c;} -/*a.wiki { text-decoration: none; color: #506cd0;}*/ -.wiki { font-weight: bold; } +.backlinks { color: #1d4fc0; } +h1 .backlinks { text-decoration: underline; } -/* Unknown links */ -.wikiunknown a, .named-wikiunknown a, .wikiunknown u -{ text-decoration: none; } -.wikiunknown, .named-wikiunknown -{color: #a6977a; } +/* Unknown links */ +.wikiunknown a, .named-wikiunknown a, .wikiunknown u { color: #a6977a; } /* Interwiki links */ -a.interwiki { text-decoration: none; } .wikipage { font-weight: bold; } +.interwiki { text-decoration: none; } +.interwiki, i.interwiki .wikipage, em .interwiki .wikipage { + font-style: oblique; +} +.interwiki .wikipage, i .interwiki, em .interwiki { + font-style: normal; +} -.interwiki, -i .interwiki .wikipage, em .interwiki .wikipage -{ font-style: oblique; } - -.interwiki .wikipage, -i .interwiki, em .interwiki -{ font-style: normal; } -/* - * wikiaction, wikiadmin, wikiunsafe: +/** + * headings */ -a.wikiaction, a.wikiadmin { text-decoration: none; } -a.wikiaction, .wikiaction table, span.wikiaction { font-weight: normal; color: #1d2a3b ; } -a.wikiadmin, .wikiadmin table { color: #ff7e00; } -.wikiunsafe { color: #ccc; } +h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; } -/* - * No border on external link icons. +h1 { margin: 0; } + +/** + * tables */ -img.linkicon, img.rssicon { border: 0px; } -img.rssicon { vertical-align: top; } +caption { font-family: Arial, Helvetica, sans-serif; } +.pagelist { +} +.pagelist thead, .pagelist thead u { +} +.pagelist tr.evenrow { background: #eee; } +.pagelist tr.oddrow { background: white; } -/* - * Put a border around wikiaction forms: - * This doesn't work for NS4. + +/** + * Toolbar */ -.wikiaction table, .wikiadmin table -{ - border-style: ridge; - border-width: medium; +.toolbar, input.button { font-family: Arial, Helvetica, sans-serif; } + +.toolbar { + padding: 0; + margin: 0; } -.wikiaction table { border-color: #9cf; } -.wikiadmin table { border-color: #f99; } +/* Prevent buttons from overlapping when wrapped */ +#navbar, #actionbar { line-height: 140%; } -/* Backlinks */ -a.backlinks { color: #81748e;} +.editdate { + font-family: Arial, Helvetica, sans-serif; + margin: 0; + padding: 0; + padding-top: 0.25ex; +} -/* Make the textarea on the edit page full width */ -textarea.wikiedit { width: 100%; margin-top: 1ex; } +/** + * Edit Page & View Source + */ -/* Calendar plugin */ -a.cal-hide, a.cal-arrow { text-decoration: none; } -.cal-arrow { font-weight: bold; } -table.cal-header { font-size: larger; } -.cal-dayname { font-size: smaller; text-decoration: underline; } -table.cal { border: thin solid black; } +/* Make the textarea the full page width */ +.wikiedit { + width: 100%; + margin-bottom: 0.5ex; + margin-top: 0.5ex; + padding: 2px; +} +input.button { font-family: Arial, Helvetica, sans-serif; } +#editarea-size { + margin-top: 1ex; + text-align: right; + font-size: smaller; +} /* IncludePage plugin */ .transclusion-title { + text-align: right; font-style: oblique; - font-size: smaller; /* 0.75em; */ + font-size: smaller; text-decoration: underline; - text-align: right; + margin-bottom: 0.25ex; + margin-right: 0.25em; } - -div.transclusion { - background: #cfc; - border: thin; - border-style: solid; +.transclusion, .wiki-edithelp { + font-size: smaller; +} +.transclusion { + background: inherit; + border: 1px dotted #a6977a; padding-left: 0.8em; padding-right: 0.8em; padding-top: 0px; padding-bottom: 0px; - margin: 0.5ex 0px; + margin-left: 0.25em; + margin-right: 0.25em; + margin-bottom: 0.1ex; } - -/* The transclusion of the TextEditingRules Synopsis on templates/editpage.html */ -div.wiki-edithelp .transclusion { - font-size: smaller; - background: inherit; - padding: 0.5ex 0.5em; - margin: 0.2ex 5%; +.wiki-edithelp { + border: medium solid #d8caae; + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.75ex; + padding-bottom: 0.75ex; + margin-left: 0; + margin-right: 0; + margin-top: 1ex; + margin-bottom: 1ex; } -div.wiki-edithelp .transclusion p { +.wiki-edithelp .wiki { + color: #87785c; +} +.wiki-edithelp p { + font-family: Arial, Helvetica, sans-serif; + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.5ex; + padding-bottom: 0.5ex; margin: 0; } -div.wiki-edithelp { - background: url("images/tchecker-sand.png"); + + +/** + * Calendar plugin + */ +table.cal { + border: thin outset gray; + margin: 0.5ex 0.5em; + padding: 1px; + /* For Mozilla */ + empty-cells: hide; +} +/* Month-name & arrows area */ +table.cal thead { +} +table.cal table.cal-header td { + padding-top: 110px; +} +table.cal table.cal-header tr:first-child { + background: url("images/pictures/SteamVolcanoDusk.jpg") no-repeat; + background-position: center; + font-size: larger; +} + /* Month-name & arrows cells */ +table.cal table.cal-header td { + text-align: center; + color: white; + background: transparent; + border: 0; +} + /* arrow text */ +.cal-arrow { + text-decoration: none; + color: white; + font-weight: bold; +} + +/* Day-names header */ +table.cal tr .cal-dayname { + background: inherit; +} +.cal-dayname td { + text-align: center; font-size: smaller; - padding: 0.05ex 1%; + text-decoration: none; + color: black; + padding-bottom: 0.5ex; } -.printer { display: none; } -/**************************************************************** - ** - ** Diff Output - ** - *****************************************************************/ -.diff .block { padding: 0.5ex 0.5em; margin: 0.5ex 0; } -.diff .block tt { font-weight: bold; } -.diff del, -.diff ins { font-weight: bold; text-decoration: none; } -/* These screw up NS4 --- moved to phpwiki-heavy.css -.diff .block div { position: relative; padding-left: 1.5em; } -.diff .prefix { position: absolute; left: 0.5em; top: 0; } -*/ +/* Individual days */ + /* cells */ +table.cal tbody td { + border: 0.5pt solid #ddd; + background: white; + text-align: right; +} + /* text */ +a.cal-hide { + text-decoration: none; + color: black; + font-weight: normal; +} + /* Today */ + /* cell */ +table.cal td.cal-today { + margin: 1px; + background: white; + border: 0.5pt solid black; +} + /* text */ +table.cal td.cal-today a { + color: blue; +} + /* Day with a data page */ + /* cell */ +table.cal td.cal-day { + margin: 1px; + background: white; + border: 0.5pt solid black; +} + /* text */ +table.cal td.cal-day a { + color: red; + text-decoration: none; +} + + +/** + * Diff Output + */ + +/* main box */ +.diff .block { + background: #ccc; + /*border: 1px solid black;*/ + padding: 0.5ex 0.5em; + margin: 0.5ex 0; +} + +/* individual lines */ +.diff .context { background: white; } + +/* + - line prefix */ +.diff .block tt{ + font-weight: bold; + font-family: monospace; + margin-left: -.6em; + color: black; +} + +.diff del, .diff ins { + font-weight: bold; + text-decoration: none; +} +.diff .original, .diff .deleted { background: #fcc; } +.diff .final, .diff .added { background: #cfc; } -.diff .block { background: #ccc; } -.diff .context { background: #fff; } -.diff .original, -.diff .deleted { background: #fcc; } -.diff .final, -.diff .added { background: #cfc; } -/* -.diff .original { background: #feb; } -.diff .final { background: #efb; } -*/ /* These don't work in NS4 -- it completely ignores <del> and <ins>. */ .diff del { background: #f99; } .diff ins { background: #9f9; } -/* PageList output */ -.pagelist tr.evenrow { background: #eeeeee; } -.pagelist tr.oddrow { background: white; } + +/** + * Other + */ +.printer { display: none; } + +/* PHP Warnings */ +div.errors { + color: black; + border: medium solid #d8caae; + margin-top: 1em; + margin-bottom: 1em; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0.8ex; + padding-bottom: 0; + font-size: smaller; + clear: both; +} +.errors h4 { + color: #87785c; + margin: 0; + padding: 0; + text-decoration: none; + font-weight: bold; +} +.error { font-family: monospace; } +.error ul { font-family: monospace; } + +/* Debug */ +.debug { + color: black; + font-family: monospace; + margin: 1ex 0; + padding: 0.5ex 0.5em; + border: medium solid #d8caae; +} + /* For emacs users * |