Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[11093] trunk
|
From: <car...@us...> - 2025-02-14 02:29:26
|
Revision: 11093
http://sourceforge.net/p/phpwiki/code/11093
Author: carstenklapp
Date: 2025-02-14 02:29:23 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Minor updates to Hawaiian theme appearance
Modified Paths:
--------------
trunk/pgsrc/ReleaseNotes
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/Hawaiian/themeinfo.php
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2025-02-14 01:00:17 UTC (rev 11092)
+++ trunk/pgsrc/ReleaseNotes 2025-02-14 02:29:23 UTC (rev 11093)
@@ -1,4 +1,4 @@
-Date: Fri, 14 Feb 2025 00:37:05 +0000
+Date: Fri, 14 Feb 2025 02:26:17 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -19,6 +19,7 @@
* Updated ##.htaccess## files to work with Apache 2.4. Will still work with
older versions but requires mod_version module which is available in
Apache 2.0.56 and later.
+* Minor updates to Hawaiian theme.
== 1.6.4 2024-03-13 Marc-Etienne Vargenau, Christof Meerwald ==
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css 2025-02-14 01:00:17 UTC (rev 11092)
+++ trunk/themes/Hawaiian/Hawaiian.css 2025-02-14 02:29:23 UTC (rev 11093)
@@ -19,6 +19,9 @@
form {
margin: 0;
+ /* border: 1px solid orange;*/
+ padding-left: 1ex;
+ padding-right: 1ex;
}
input {
@@ -29,6 +32,14 @@
text-align: right;
}
+fieldset {
+ display: inline;
+ border: 1px solid #7c7c7c;
+ padding: 1ex;
+ background-color: white;
+ margin-bottom: 1ex;
+}
+
table {
border-spacing: 1px;
/* For Mozilla */
@@ -52,7 +63,7 @@
color: black;
background-color: white;
background-image: url("images/uhhbackground.jpg");
- background-repeat: repeat;
+ background-repeat: repeat-y;
font-family: Arial, Helvetica, sans-serif;
margin: 1ex 0.5em;
}
@@ -61,9 +72,18 @@
margin-left: 1em;
}
+#logo {
+ display: flex;
+ align-items: center;
+ /* Aligns items vertically centered */
+}
+
#logo img {
+ margin-right: 1ex;
+ /* Adds space between the image and the heading */
+
border: 1px outset gray;
- margin-left: 1em;
+ margin-left: 0em;
margin-bottom: 1ex;
}
@@ -115,7 +135,8 @@
/**
* Link styles
*/
-.wiki, .named-wiki {
+.wiki,
+.named-wiki {
font-weight: bold;
color: #87785c;
}
@@ -131,24 +152,30 @@
/**
* wikiaction, wikiadmin, wikiunsafe:
*/
-.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks {
+.wikiaction,
+.wikiadmin,
+.wiki-rc-action,
+.backlinks {
text-decoration: none;
}
-.wikiaction, .wikiadmin {
+.wikiaction,
+.wikiadmin {
font-weight: bold;
}
-.wikiaction, .wikiaction table, span.wikiaction {
+.wikiaction,
+.wikiaction table,
+span.wikiaction {
color: #4d5a6b;
}
-.wikiadmin, .wikiadmin table {
+.wikiadmin,
+.wikiadmin table {
color: #ff7e00;
}
-.wikiunsafe {
-}
+.wikiunsafe {}
.backlinks {
color: #1d4fc0;
@@ -159,7 +186,9 @@
}
/* Unknown links */
-.wikiunknown a, .named-wikiunknown a, .wikiunknown u {
+.wikiunknown a,
+.named-wikiunknown a,
+.wikiunknown u {
color: #a6977a;
}
@@ -172,11 +201,15 @@
text-decoration: none;
}
-.interwiki, i.interwiki .wikipage, em .interwiki .wikipage {
+.interwiki,
+i.interwiki .wikipage,
+em .interwiki .wikipage {
font-style: oblique;
}
-.interwiki .wikipage, i .interwiki, em .interwiki {
+.interwiki .wikipage,
+i .interwiki,
+em .interwiki {
font-style: normal;
}
@@ -183,7 +216,12 @@
/**
* headings
*/
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
font-family: Arial, Helvetica, sans-serif;
}
@@ -221,7 +259,10 @@
border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;
}
-input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
+input.gridbutton,
+a.gridbutton,
+a:hover.gridbutton,
+a:visited.gridbutton {
text-decoration: none;
font-size: small;
font-weight: normal;
@@ -233,7 +274,8 @@
/**
* Toolbar
*/
-.toolbar, input.button {
+.toolbar,
+input.button {
font-family: Arial, Helvetica, sans-serif;
}
@@ -247,10 +289,24 @@
}
/* Prevent buttons from overlapping when wrapped */
-#navbar, #actionbar {
+#navbar,
+#actionbar {
line-height: 140%;
}
+div#navbuttons,
+div#signin,
+div#actionbuttons {
+ margin-bottom: 2ex;
+}
+
+/**
+ * Search
+ */
+#searchholder {
+ display: inline;
+}
+
.editdate {
font-family: Arial, Helvetica, sans-serif;
margin: 0;
@@ -285,7 +341,8 @@
margin-right: 0.25em;
}
-.transclusion, .wiki-edithelp {
+.transclusion,
+.wiki-edithelp {
font-size: smaller;
}
@@ -311,6 +368,7 @@
margin-right: 0;
margin-top: 1ex;
margin-bottom: 1ex;
+ border-radius: 0.6em;
}
.wiki-edithelp .wiki {
@@ -441,16 +499,19 @@
color: black;
}
-.diff del, .diff ins {
+.diff del,
+.diff ins {
font-weight: bold;
text-decoration: none;
}
-.diff .original, .diff .deleted {
+.diff .original,
+.diff .deleted {
background-color: #fcc;
}
-.diff .final, .diff .added {
+.diff .final,
+.diff .added {
background-color: #cfc;
}
@@ -491,7 +552,7 @@
border: medium solid #d8caae;
background-image: url("images/tchecker-sand.png");
background-repeat: repeat;
-}
+ }
/**
* Search Results
@@ -516,20 +577,32 @@
vertical-align: middle;
}
-div.wikitext {
- width: auto;
+div.wikitext,
+form {
+/*
background-image: url("images/tchecker-white.png");
background-repeat: repeat;
+ */
+ width: auto;
+ background-color: rgb(255 255 255 / 0.5); /* transparency */
}
.wiki-edithelp {
+/*
background-image: url("images/tchecker-sand.png");
background-repeat: repeat;
+ */
+ background-color: rgb(255 248 238 / 0.8);
}
.wiki-edithelp p {
+/*
background-image: url("images/tchecker-white.png");
background-repeat: repeat;
+ */
+ zbackground-color: rgb(255 255 255 / 0.5); /* transparency */
+ background-color: white;
+ opacity: 0.8;
}
/**
@@ -545,3 +618,47 @@
left: 0.5em;
top: 0;
}
+
+div.toc {
+ /*toc box*/
+ border: 1px solid orange;
+ background-color: white;
+ padding: 1ex;
+}
+
+div.toc p {
+ /*toc title*/
+ text-decoration: none;
+ padding-top: 0ex;
+ margin-left: 5px;
+}
+
+div.toclist p a {
+ /*toc items*/
+ text-decoration: none;
+ padding-top: 0ex;
+ margin-left: 5px;
+}
+
+
+/* Hints */
+.hint {
+ border: thin 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;
+/*
+ background-image: url("images/tchecker-sand.png");
+ background-repeat: repeat;
+ */
+ background-color: rgb(255 248 238 / 0.8);
+ }
+
+span.hint {
+ padding: 0;
+}
Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php 2025-02-14 01:00:17 UTC (rev 11092)
+++ trunk/themes/Hawaiian/themeinfo.php 2025-02-14 02:29:23 UTC (rev 11093)
@@ -38,7 +38,7 @@
class WikiTheme_Hawaiian extends WikiTheme
{
- public function getCSS()
+ public function DEBUGgetCSS()
{
// FIXME: this is a hack which will not be needed once
// we have dynamic CSS.
@@ -46,7 +46,7 @@
$css->pushContent(HTML::style(
array('type' => 'text/css'),
new RawXml(sprintf(
- "<!--\nbody {background-image: url(%s);}\n-->",
+ "<!--\nbody {\n background-image: url(%s);\n background-repeat: repeat-y\n}\n-->",
$this->getImageURL('uhhbackground.jpg')
))
));
@@ -59,11 +59,15 @@
// style. The companion '*-heavy.css' file isn't defined, it's just
// expected to be in the same directory that the base style is in.
- $this->setDefaultCSS('Hawaiian', 'Hawaiian.css');
+ // This should result in phpwiki-printer.css being used when
+ // printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
+ $this->setDefaultCSS('Hawaiian', array('' => 'Hawaiian.css', 'print' => 'phpwiki-printer.css'));
+
+ // This allows one to manually select "Printer" style (when browsing page)
+ // to see what the printer style looks like.
$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
- $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
- $this->addAlternateCSS('PhpWiki', 'phpwiki.css');
-
+ //$this->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css');
+
/**
* The logo image appears on every page and links to the HomePage.
*/
@@ -98,7 +102,7 @@
$this->setLinkIcon('interwiki');
$this->setLinkIcon('*', 'flower.png');
- $this->setButtonSeparator(' ');
+ $this->setButtonSeparator(' | ');
/**
* WikiWords can automatically be split by inserting spaces between
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
