Item863: less borders; use foswiki.org side menu style

git-svn-id: http://svn.foswiki.org/trunk@2162 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jan 25, 2009 · dc67800 · dc67800
1 parent d0916a4
commit dc67800
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 129 deletions.
diff --git a/PatternSkin/data/System/PatternSkinColorSettings.txt b/PatternSkin/data/System/PatternSkinColorSettings.txt
@@ -243,7 +243,7 @@ Do not change the text below this line unless you know what you are doing!
 /* GENERAL HTML ELEMENTS */
 
 html body {
-   background-color:%NEUTRAL_BACKGROUND%;
+   background-color:%PAGE_BACKGROUND%;
    color:%MAIN_TEXT%;
 }
 html body.patternEditPage,
@@ -280,11 +280,9 @@ h2, h3, h4, h5, h6 {
    color:%HEADER_TEXT%;
 }
 h2 {
-   border-color:%MINOR_SEPARATOR_BORDER%;
-}
-h3, h4, h5, h6 {
-   border-color:%MINOR_SEPARATOR_BORDER%;
+   border-color:%HEADER_TEXT%;
 }
+
 /* to override old Render.pm coded font color style */
 .foswikiNewLink font {
    color:inherit;
@@ -550,9 +548,6 @@ table.foswikiFormTable th.foswikiFormTableHRow font {
 .foswikiNotification {
    background-color:%NOTIFICATION_BACKGROUND%;
 }
-.foswikiNotification {
-   border-color:%NOTIFICATION_BORDER%;
-}
 #foswikiLogin .patternLoginNotification {
    background-color:%MAIN_TEXT_BACKGROUND%;
    border-color:%ALERT_BORDER%;
@@ -642,10 +637,6 @@ a:hover .foswikiAccessKey {
 #patternSideBarContents a:hover {
    color:%LINK_TEXT_HOVER%;
 }
-#patternSideBarContents .patternLeftBarPersonal,
-#patternSideBarContents .patternWebIndicator {
-	border-color:#dadada;
-}
 #patternSideBarContents b,
 #patternSideBarContents strong {
 	color:%HEADER_TEXT%;
@@ -991,28 +982,5 @@ a.foswikiButton:active {
 .patternButtonShrink:active {
    background-position:16px -84px;
 }
-
-.foswikiBroadcastMessage {
-   background-image:url(background_alert.gif);
-   background-repeat:repeat-x;
-}
-
-/* common settings */
-.patternLeftBarPersonal li,
-li.patternLogOut,
-li.patternLogIn {
-   padding-left:13px;
-   background-position:0 .4em;
-   background-repeat:no-repeat;
-}
-.patternLeftBarPersonal li {
-   background-image:url(bullet-personal_sidebar.gif);
-}
-.patternLeftBarPersonal li.patternLogOut {
-   background-image:url(bullet-lock.gif);
-}
-.patternLeftBarPersonal li.patternLogIn {
-   background-image:url(bullet-lock.gif);
-}
 %ENDATTACH%
 </verbatim>
diff --git a/PatternSkin/data/System/PatternSkinElements.txt b/PatternSkin/data/System/PatternSkinElements.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1165884692" format="1.1" reprev="1.1" version="1.1"}%
+%META:TOPICINFO{author="BaseUserMapping_333" date="1232834051" format="1.1" version="1.2"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 <div class="foswikiBroadcastMessage"> <strong>NOTE:</strong> Edit and Attach will be disabled today between 05:00 PM and 06:00 PM PDT (00:00 to 01:00 GMT) for a scheduled Foswiki maintenance.</div>
 
@@ -42,6 +42,37 @@ Normal text.
 
 *Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
+<div class="foswikiNotification">
+---+ h1 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+
+<div class="foswikiNotification">
+---++ h2 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+
+<div class="foswikiNotification">
+---+++ h3 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+
+<div class="foswikiNotification">
+---++++ h4 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+
+<div class="foswikiNotification">
+---+++++ h5 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+
+<div class="foswikiNotification">
+---++++++ h6 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+
+
 ---++ Text sizes
 
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal 
@@ -242,4 +273,4 @@ Describe the file so other people know what it is.
 <li> <strong>Help:</strong> Please see <a class="foswikiPopUp" target='FileAttachment' href="%SCRIPTURL{view}%/%SYSTEMWEB%/FileAttachment" rel='nofollow'>FileAttachment</a> for more information about attaching files.
 </li> <li> <strong>Bug:</strong> Internet Explorer 4.0 or earlier: If you get an "Internal Server Error" message when you upload a file, you need to try again. It should work the second time.
 </li></ul> 
-</div>
+</div>
diff --git a/PatternSkin/pub/System/PatternSkin/colors.css b/PatternSkin/pub/System/PatternSkin/colors.css
@@ -39,7 +39,7 @@
 /* GENERAL HTML ELEMENTS */
 
 html body {
-   background-color:#f5f5f5;
+   background-color:#e2e2e2;
    color:#000;
 }
 html body.patternEditPage,
@@ -75,11 +75,9 @@ h2, h3, h4, h5, h6 {
    color:#d1400e;
 }
 h2 {
-   border-color:#e2e2e2;
-}
-h3, h4, h5, h6 {
-   border-color:#e2e2e2;
+   border-color:#d1400e;
 }
+
 /* to override old Render.pm coded font color style */
 .foswikiNewLink font {
    color:inherit;
@@ -344,9 +342,6 @@ table.foswikiFormTable th.foswikiFormTableHRow font {
 .foswikiNotification {
    background-color:#fff0c4;
 }
-.foswikiNotification {
-   border:2px solid #ffdf4c;
-}
 #foswikiLogin .patternLoginNotification {
    background-color:#fff;
    border-color:#f00;
@@ -436,10 +431,6 @@ a:hover .foswikiAccessKey {
 #patternSideBarContents a:hover {
    color:#fff;
 }
-#patternSideBarContents .patternLeftBarPersonal,
-#patternSideBarContents .patternWebIndicator {
-	border-color:#dadada;
-}
 #patternSideBarContents b,
 #patternSideBarContents strong {
 	color:#d1400e;
@@ -785,26 +776,4 @@ a.foswikiButton:active {
 }
 .patternButtonShrink:active {
    background-position:16px -84px;
-}
-.foswikiBroadcastMessage {
-   background-image:url(background_alert.gif);
-   background-repeat:repeat-x;
-}
-
-/* common settings */
-.patternLeftBarPersonal li,
-li.patternLogOut,
-li.patternLogIn {
-   padding-left:13px;
-   background-position:0 .4em;
-   background-repeat:no-repeat;
-}
-.patternLeftBarPersonal li {
-   background-image:url(bullet-personal_sidebar.gif);
-}
-.patternLeftBarPersonal li.patternLogOut {
-   background-image:url(bullet-lock.gif);
-}
-.patternLeftBarPersonal li.patternLogIn {
-   background-image:url(bullet-lock.gif);
-}
+}
diff --git a/PatternSkin/pub/System/PatternSkin/print.css b/PatternSkin/pub/System/PatternSkin/print.css
@@ -61,6 +61,7 @@ body.patternPrintPage,
 }
 .patternPrintPage #patternBottomBar {
 	border:none;
+	padding:1em 0;
 }
 .patternPrintPage .patternTopicFooter {
 	margin:1em 0 0 0;