[Tikiwiki-cvs] tiki/styles codex.css,1.46,1.47 mose.css,1.66,1.67 olive-blue.css,1.14,1.15 olive-red.css,1.14,1.15 olive.css,1.55,1.56 tikineat.css,1.11,1.12 trollparty.css,1.42,1.43

[<mo...@us...>]

Update of /cvsroot/tikiwiki/tiki/styles
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24100/styles

Modified Files:
	codex.css mose.css olive-blue.css olive-red.css olive.css 
	tikineat.css trollparty.css 
Log Message:
Instant-Auto-Merge from BRANCH-1-9 to HEAD

Index: codex.css
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/styles/codex.css,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- codex.css	1 Feb 2006 21:20:23 -0000	1.46
+++ codex.css	22 May 2006 17:09:13 -0000	1.47
@@ -1312,6 +1312,11 @@
 	display: inline;
 }
 
+/* The image topic */
+.articleimage {
+	margin-right : 10px;
+}
+
 /* The body */
 div.articlebody {
 	background:    white;

Index: mose.css
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/styles/mose.css,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- mose.css	1 Feb 2006 21:20:23 -0000	1.66
+++ mose.css	22 May 2006 17:09:13 -0000	1.67
@@ -59,13 +59,14 @@
 General form elements 
 */
 input, select {
+	font-family : monospace;
 	color:    #000000;
-	font:   normal 11px Verdana, Arial, Helvetica, sans-serif;
 }
 
 textarea {
 	color:    #000000;
-	font:   normal 12px fixed, courier, monospace;
+	font-family : monospace;
+	font-size : 90%;
 }
 
 input {
@@ -74,9 +75,8 @@
 
 
 a {
-color: #000000;
+color: #430;
 text-decoration: none;
-border-bottom: 1px dashed #6A5A49;
 }
 a:hover {
 color: #772200;
@@ -100,14 +100,13 @@
 	padding:   0;
 }
 #tiki-top {
-	font-size: 90%;
+	font-size: 80%;
 	color:   #7a6a59;
 	background-color:    #DED6C6;
-	width: 100%;
 }
 
-#tiki-top table {
-	width: 100%;
+#tiki-top table#topbar {
+	width:100%;
 }
 
 #tiki-top a.linkh {
@@ -171,7 +170,7 @@
 */
 DIV#tiki-bot {
 	padding-top:    5px;
-	margin-top:   0px;
+	margin-top:   20px;
 	background:   #DED6C6;
 	padding-bottom:   0px;
 }
@@ -269,7 +268,6 @@
 }
 
 div.box-title table {
-    width: 100%;
 }
 
 /* 
@@ -483,7 +481,7 @@
 	margin: 5px 1px 5px 1px;
 	padding:   2px;
 	color:   black;
-	border:   1px solid black;
+	border:   1px solid #dca;
 	background:   #EFEFE7;
 	font-size:   11px;
 }
@@ -507,12 +505,10 @@
 table.listgallery, table.creategalform, TABLE.normal, table.gallerylisting, table.bloglist, table.editblogform, table.editfgalform,
 	table.listfgal, table.listfiles, table.listarticles, table.forumstable, table.forumformtable, table.viewthread, table.jukeboxlist {
 	border: 1px solid #5A4A39;
-	width: 100%;
 	border-spacing: 2px;
 }
 
 TABLE.normalnoborder {
-	width: 100%;
 }
 
 /* 
@@ -830,11 +826,11 @@
 Text in wiki pages is displayed using the following style 
 */
 div.wikitext {
-	background:    #f6f4f3;
+	line-height : 1.4em;
+	background:    #fff;
 	font-size:   12px;
-	border:   1px solid #B5A58C;
+	border:   1px dashed #dca;
 	padding:  3px 10px 3px 10px;
-	margin: 1px 0 1px 0;
 	clear:   both;
 }
 div.wikitext pre {
@@ -1003,7 +999,6 @@
 */
 div.browseimage {
 	background:    #EFEFE7;
-	width:   100%;
 }
 
 div.imagetitle {
@@ -1219,7 +1214,6 @@
  MSIE inheritence pb + box model bug
 */
 div.articletrailer {
-	width: 100%;
 }
 .articletrailer{
 	font-size: 9px;
@@ -1391,7 +1385,6 @@
 	padding-top:   0px;
 	padding-bottom:   0px;
 	margin-bottom:   10px;
-	width:   99%;
 }
 
 /* Help box*/
@@ -1399,7 +1392,6 @@
 	background:    white;
 	border:   1px solid black;
 	font-size:   smaller;
-	width:   99%;
 }
 
 /* The toolbar where the ordering number of comments and find box are found */
@@ -1917,7 +1909,6 @@
 	padding-bottom:   10px;
 	border:   0.5px solid black;
 	margin-top:   10px;
-	width:   100%;
 }
 
 /* each site in the list of sites */
@@ -2646,7 +2637,9 @@
 	font-weight:bold;
 }
 
-TABLE.admin { width: 100%; }
+TABLE.admin { 
+width: 100%; 
+}
 table.commentinfo { width: 100%; background-color: #FFF7E6; }
 div#loadstats {
 	background-color: #dedede;
@@ -2656,8 +2649,11 @@
 }
 
 /* phplayers style */
+#plm_menu {
+	border-top : 1px solid #666;
+	background-color : #fff !important;
+}
 .box-data table {
-	width: 100%;
 }
 
 .mdkhorbar      {

Index: olive-blue.css
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/styles/olive-blue.css,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- olive-blue.css	1 Feb 2006 21:20:23 -0000	1.14
+++ olive-blue.css	22 May 2006 17:09:13 -0000	1.15
@@ -2806,4 +2806,16 @@
 background-color: #edeeef;
 }
 
+/*** style for 'advanced feature' divs ***/
+.advanced {
+  margin: 20px;
+  padding: 5px;
+  border-color: black;
+  border-width: 1px;
+  border-style: solid;
+  background-color: #e5f2f6;
+}
+
+.advanced:before { content:url(../img/icons/mini_blue_diamond.gif)" "; }
+
 /* end of css file */

Index: olive-red.css
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/styles/olive-red.css,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- olive-red.css	1 Feb 2006 21:20:23 -0000	1.14
+++ olive-red.css	22 May 2006 17:09:13 -0000	1.15
@@ -2806,4 +2806,16 @@
 background-color: #edeeef;
 }
 
+/*** style for 'advanced feature' divs ***/
+.advanced {
+  margin: 20px;
+  padding: 5px;
+  border-color: black;
+  border-width: 1px;
+  border-style: solid;
+  background-color: #ffc0c0;
+}
+
+.advanced:before { content:url(../img/icons/mini_blue_diamond.gif)" "; }
+
 /* end of css file */

Index: olive.css
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/styles/olive.css,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- olive.css	1 Feb 2006 21:20:23 -0000	1.55
+++ olive.css	22 May 2006 17:09:13 -0000	1.56
@@ -2804,4 +2804,16 @@
 background-color: #edeeef;
 }
 
+/*** style for 'advanced feature' divs ***/
+.advanced {
+  margin: 20px;
+  padding: 5px;
+  border-color: black;
+  border-width: 1px;
+  border-style: solid;
+  background-color: #f2f6e5;
+}
+
+.advanced:before { content:url(../img/icons/mini_blue_diamond.gif)" "; }
+
 /* end of css file */

Index: tikineat.css
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/styles/tikineat.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tikineat.css	6 Mar 2006 20:34:31 -0000	1.11
+++ tikineat.css	22 May 2006 17:09:13 -0000	1.12
@@ -1991,5 +1991,17 @@
 }
 
 
+/*** style for 'advanced feature' divs ***/
+.advanced {
+  margin: 20px;
+  padding: 5px;
+  border-color: #A9B8C2;
+  border-width: 1px;
+  border-style: solid;
+  background-color: #dee7ec;
+}
+
+.advanced:before { content:url(../img/icons/mini_blue_diamond.gif)" "; }
+
 /* end of css file */
 

Index: trollparty.css
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/styles/trollparty.css,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- trollparty.css	1 Feb 2006 21:20:24 -0000	1.42
+++ trollparty.css	22 May 2006 17:09:13 -0000	1.43
@@ -2,7 +2,7 @@
 $Id$
 made by mo...@tr...
 
-background: #000000;
+background-color: #000000;
 foreground: #aeaeae;
 
 link:normal #dede98;
@@ -31,11 +31,11 @@
 }
 a:hover {
 color: #ffffff;
-background: #131333;
+background-color: #131333;
 }
 a:active {
 color: #336699;
-background: #000000;
+background-color: #000000;
 }
 a:visited {
 color: #aea067;
@@ -74,21 +74,18 @@
 vertical-align: top;
 width: 180px;
 border-right: 1px solid #003388;
-padding-right : 1px;
 }
 
 TD#rightcolumn {
 vertical-align: top;
 width: 180px;
 border-left: 1px solid #003388;
-padding-left : 1px;
 }
 
 TD#centercolumn {
 vertical-align: top;
 border-left: 1px solid #003388;
 border-right: 1px solid #003388;
-padding : 0 1px;
 }
 
 DIV#tiki-center {
@@ -128,7 +125,7 @@
 */
 div.box 
 {
-/*background: #e1e2b9; */
+/*background-color: #e1e2b9; */
 padding-top: 3px;
 overflow: hidden;
 margin-top: 13px;
@@ -207,7 +204,7 @@
 */
 div.cbox
 {
-background: #333333;
+background-color : #333333;
 margin-top: 4px;
 margin-bottom: 0px;
 padding-bottom: 10px;
@@ -370,7 +367,7 @@
 padding-right: 2px;
 color: #aeaeae;
 border: 1px solid #777750;
-background: #424242;
+background-color: #424242;
 }
 
 /* 
@@ -434,7 +431,7 @@
 .comform td,
 .forumform td
 {
-background: #232323;
+background-color: #232323;
 vertical-align: top;
 text-align: left;
 }
@@ -944,7 +941,7 @@
 
 div.titlebar
 {
-background: #222222;
+background-color: #222222;
 color: #aaaaaa;
 border-bottom: 1px solid #666666;
 padding: 0px 6px;
@@ -1099,7 +1096,7 @@
 margin-top: 20px;
 padding: 0 10px;
 color: #999999;
-background: #121212;
+background-color: #121212;
 }
 #description {
   font-size : 10px !important;
@@ -1118,7 +1115,7 @@
 syntax when editing a page 
 */
 div.wiki-edithelp {
-background: #121212;
+background-color: #121212;
 border: 1px solid #999999;
 font-size: smaller;
 padding: 10px;
@@ -1252,7 +1249,7 @@
 */
 div.browseimage
 {
-background: #EFEFE7;
+background-color: #EFEFE7;
 }
 
 div.imagetitle
@@ -1494,7 +1491,7 @@
 .day:hover
 {
 color : black;
-background:#CCCCCC;
+background-color:#CCCCCC;
 text-decoration: none;
 }
 
@@ -1533,7 +1530,7 @@
 color : black;
 text-decoration: none;
 font-weight : bold;
-background: #CCCCCC;
+background-color: #CCCCCC;
 }
 
 /* Links to change month, year or go to today */
@@ -1560,13 +1557,13 @@
 color : black;
 text-decoration: none;
 font-weight : bold;
-background: #CCCCCC;
+background-color: #CCCCCC;
 }
 
 .changedate
 {
 font-size: 90%;
-background: white;
+background-color: white;
 color : black;
 font-weight : bold;
 }
@@ -1574,7 +1571,7 @@
 .date
 {
 font-size: 90%;
-background: white;
+background-color: white;
 color : Black;
 font-weight : bold;
 }
@@ -1620,7 +1617,7 @@
 /* Help box*/
 div.commentsedithelp
 {
-background: white;
+background-color: white;
 border: 1px solid black;
 font-size: smaller;
 }
@@ -2300,7 +2297,7 @@
 .calprio2 { color: #ffffff; background-color: #21262a; }
 .calprio3 { color: #ffffff; background-color: #212a31; }
 .calprio4 { color: #ffffff; background-color: #213136; }
-.calprio5 { color: #ffffff; background-color: #21364a; }
+.calprio5 { color: #ffffff; background-color: white; width:100%}
 .calprio6 { color: #ffffff; background-color: #213a51; font-weight: bold; }
 .calprio7 { color: #ffffff; background-color: #21415a; font-weight: bold; }
 .calprio8 { color: #ffffff; background-color: #214a61; font-weight: bold; }