wiki branch merged into trunk

git-svn-id: http://redmine.rubyforge.org/svn/trunk@323 e93f8b46-1217-0410-a6f0-8f06a7374b81

6 files changed, 25 insertions, 2 deletions

diff --git a/public/images/draft.png b/public/images/draft.png
new file mode 100644
index 000000000..9eda38b54
--- /dev/null
+++ b/public/images/draft.png
diff --git a/public/images/history.png b/public/images/history.png
new file mode 100644
index 000000000..5446977ce
--- /dev/null
+++ b/public/images/history.png
diff --git a/public/images/html.png b/public/images/html.png
new file mode 100644
index 000000000..efb32e7c5
--- /dev/null
+++ b/public/images/html.png
diff --git a/public/images/index.png b/public/images/index.png
new file mode 100644
index 000000000..1ada3b2dc
--- /dev/null
+++ b/public/images/index.png
diff --git a/public/images/txt.png b/public/images/txt.png
new file mode 100644
index 000000000..2978385e7
--- /dev/null
+++ b/public/images/txt.png
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 40997af97..138cf97db 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -139,6 +139,8 @@ vertical-align: middle;
 .icon-cancel { background-image: url(../images/cancel.png); }

 .icon-pdf { background-image: url(../images/pdf.png); }

 .icon-csv { background-image: url(../images/csv.png); }

+.icon-html { background-image: url(../images/html.png); }

+.icon-txt { background-image: url(../images/txt.png); }

 .icon-file { background-image: url(../images/file.png); }

 .icon-folder { background-image: url(../images/folder.png); }

 .icon-package { background-image: url(../images/package.png); }

@@ -150,6 +152,8 @@ vertical-align: middle;
 .icon-logout { background-image: url(../images/logout.png); }

 .icon-help { background-image: url(../images/help.png); }

 .icon-attachment  { background-image: url(../images/attachment.png); }

+.icon-index  { background-image: url(../images/index.png); }

+.icon-history  { background-image: url(../images/history.png); }

 

 .icon22-projects { background-image: url(../images/22x22/projects.png); }

 .icon22-users { background-image: url(../images/22x22/users.png); }

@@ -181,7 +185,7 @@ border-left: 1px dashed #c0c0c0;
 

 }

 

-#content h2{

+#content h2, #content div.wiki h1 {

 display:block;

 margin:0 0 16px 0;

 font-size:1.7em;

@@ -576,4 +580,23 @@ to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepx
 

 * html .threepxfix{

 margin-left: 3px;

-}
\ No newline at end of file
+}

+

+/***** Wiki sections ****/

+#content div.wiki { font-size: 110%}

+

+#content div.wiki h2, div.wiki h3 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; color:#606060; }

+#content div.wiki h2 { font-size: 1.4em;}

+#content div.wiki h3 { font-size: 1.2em;}

+

+div.wiki table {

+    border: 1px solid #505050;

+    border-collapse: collapse;

+}

+

+div.wiki table, div.wiki td {

+    border: 1px solid #bbb;

+    padding: 4px;

+}

+

+#preview .preview { background: #fafbfc url(../images/draft.png); }