Changeset 7077

Timestamp:

04/04/10 23:11:55 (2 years ago)

Author:

ArthurClemens

Message:

Item8840: visual refresh

Location:

trunk/PatternSkin

Files:

• data/System/PatternSkin.txt (modified) (1 diff)
• data/System/PatternSkinColorSettings.txt (modified) (1 diff)
• lib/Foswiki/Contrib/PatternSkin.pm (modified) (1 diff)
• pub/System/PatternSkinTheme/colors.css (modified) (34 diffs)
• pub/System/PatternSkinTheme/style.css (modified) (36 diffs)
• templates/viewsidebar.pattern.tmpl (modified) (1 diff)

trunk/PatternSkin/data/System/PatternSkin.txt

@@ -151 +151 @@
 |  Release: | %$RELEASE% |
 |  History: | <!-- specify latest version first -->&nbsp; |
+|  05 Apr 2010: | v.5.2 - Visual update. |
+|  04 Apr 2010: | v.5.1 - Added Foswiki site skin as theme, including horizontal navigation topic; see PatternSkinHorizontalNavigationExample. |
 |  04 Apr 2010: | v.5.0 - Changed themes from single css file to file collections to preserve older appearance and to provide bigger restyling within a theme. |
 |  12 Mar 2010: | v.4.0.9 - Fixes printing in Firefox 3.6. |

trunk/PatternSkin/data/System/PatternSkinColorSettings.txt

@@ +1 @@
+%META:TOPICINFO{author="ProjectContributor" date="1228050988" format="1.1" reprev="1.1" version="$Rev$"}%
+%META:TOPICPARENT{name="PatternSkin"}%
+---+!! Color scheme settings for %SYSTEMWEB%.PatternSkin
+Use this topic to change the color settings of %SYSTEMWEB%.PatternSkin. When this topic is saved, the attachment =my_colors.css= will be updated with new color values. This method relies on Foswiki:Extensions.AttachContentPlugin to work.
+
+<nop>AttachContentPlugin is %IF{"context AttachContentPluginEnabled" then="" else="*not* "}%installed.
+
+---++!! Usage
+
+<div class="foswikiFormSteps">
+<div class="foswikiFormStep">
+---+++!! Step 1
+Let %SYSTEMWEB%.PatternSkin point to the custom-made colors style sheet. In [[%USERSWEB%.SitePreferences]] copy this line: <verbatim>
+   * Set USERCOLORSURL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/my_colors.css
+</verbatim>
+</div>
+<div class="foswikiFormStep">
+---+++!! Step 2
+Edit this topic, and change the color as you like.
+</div>
+<div class="foswikiFormStep">
+---+++!! Step 3
+%IF{"context AttachContentPluginEnabled" then='<form action="%SCRIPTURL{save}%/%WEB%/%TOPIC%" method="post"><input type="hidden" name="action" value="action_save=1" /><input type="submit" class="foswikiButton" value="Save the topic" /></form> This will generate an [[%PUBURLPATH%/%SYSTEMWEB%/PatternSkin/my_colors.css][attachment]] to topic [[PatternSkin]].' else='Install !AttachContentPlugin to be able to save this topic. On saving, an attachment will be created to topic PatternSkin.'}% 
+</div>
+</div>
+
+%ICON{"info"}% For more help on customizing styles, see [[PatternSkinCustomization]].
+
+---++!! Color preference settings
+%TOC%
+
+---++ Logical groupings
+---+++ Text
+---++++ MAIN_TEXT Main text color
+   * Local MAIN_TEXT = #000
+---++++ MAIN_TEXT_BACKGROUND Main background color
+   * Local MAIN_TEXT_BACKGROUND = #fff
+---++++ LIGHT_ON_DARK_TEXT Light on dark text color
+   * Local LIGHT_ON_DARK_TEXT = #fff
+---++++ GRAYED_TEXT
+   * Local GRAYED_TEXT = #777
+---++++ GENERAL_TEXT General text (black)
+   * Local GENERAL_TEXT = #000
+---++++ H1_HEADER_TEXT Header text
+   * Local H1_HEADER_TEXT = #222
+---++++ HEADER_TEXT Header text
+   * Local HEADER_TEXT = #390
+---++++ CODE_TEXT Code text, left bar text and links
+   * Local CODE_TEXT = #333
+---++++ MUTED_TEXT Muted text (dark gray)
+   * Local MUTED_TEXT = %GRAYED_TEXT%
+---++++ GRAYED_OUT_TEXT Grayed out text
+   * Local GRAYED_OUT_TEXT = %GRAYED_TEXT%
+---++++ GRAYED_OUT_TEXT_ON_DARK Grayed out text on dark background
+   * Local GRAYED_OUT_TEXT_ON_DARK = #bbb
+   
+---+++ Links
+---++++ LINK_TEXT_NORMAL Link normal text
+   * Local LINK_TEXT_NORMAL = #4571d0
+---++++ LINK_BACKGROUND_NORMAL Link normal background
+   * Local LINK_BACKGROUND_NORMAL = transparent
+---++++ LINK_TEXT_NORMAL_VISITED Link normal text visited
+   * Local LINK_TEXT_NORMAL_VISITED = #666
+---++++ LINK_TEXT_ACTION_BUTTON Link text red (same as LINK_BACKGROUND_HOVER)
+   * Local LINK_TEXT_ACTION_BUTTON = #0055b5
+---++++ LINK_TEXT_HOVER Link hover text
+   * Local LINK_TEXT_HOVER = %LINK_TEXT_NORMAL%
+---++++ LINK_BACKGROUND_HOVER Link background hover
+   * Local LINK_BACKGROUND_HOVER = transparent
+---++++ SIDE_BAR_LINK_TEXT Side bar link text
+   * Local SIDE_BAR_LINK_TEXT = %LINK_TEXT_NORMAL%
+---++++ BUTTON_TEXT_NORMAL Button text
+   * Local BUTTON_TEXT_NORMAL = #333
+   
+---+++ Disabled
+---++++ DISABLED_BORDER Disabled border
+   * Local DISABLED_BORDER = #e0e0e0
+---++++ DISABLED_TEXT Disabled text
+   * Local DISABLED_TEXT = #aaa
+---++++ DISABLED_BACKGROUND Disabled background
+   * Local DISABLED_BACKGROUND = #fafaf8
+---++++ BUTTON_BORDERS_DISABLED Disabled button borders
+   * Local BUTTON_BORDERS_DISABLED = #fff #ccc #ccc #fff
+
+---+++ 'New'
+---++++ NEW_TEXT New text (green)
+   * Local NEW_TEXT = #049804
+---++++ NEW_BACKGROUND New background (light green)
+   * Local NEW_BACKGROUND = #ECFADC
+
+---+++ Alert
+---++++ ALERT_TEXT Alert text (red)
+   * Local ALERT_TEXT = #f00
+---++++ ALERT_TEXT_MUTED Muted alert text (dark red)
+   * Local ALERT_TEXT_MUTED = #900
+---++++ ALERT_BORDER Alert border
+   * Local ALERT_BORDER = #f00
+
+---+++ Buttons
+---++++ BUTTON_TEXT Button text color (dark gray)
+   * Local BUTTON_TEXT = #000
+---++++ BUTTON_BORDERS Button borders
+   * Local BUTTON_BORDERS = #fff #888 #888 #fff
+---++++ BUTTON_BACKGROUND Button background
+   * Local BUTTON_BACKGROUND = #e2e3e3
+---++++ BUTTON_CANCEL_BACKGROUND Cancel button background
+   * Local BUTTON_CANCEL_BACKGROUND = #f2d5d0
+---++++ SUBMIT_BUTTON_BACKGROUND Submit button background
+   * Local SUBMIT_BUTTON_BACKGROUND = #06c
+---++++ SUBMIT_BUTTON_BORDER_TEXT Submit button text color
+   * Local SUBMIT_BUTTON_BORDER_TEXT = #fff
+---++++ SELECT_BORDER Select border
+   * Local SELECT_BORDER = #888
+
+---+++ Background colors
+---++++ PAGE_BACKGROUND General background color
+   * Local PAGE_BACKGROUND = #e2e2e2
+---++++ NEUTRAL_BACKGROUND
+   * Local NEUTRAL_BACKGROUND = #f5f5f5
+---++++ SIDE_BAR_BACKGROUND Side bar background
+   * Local SIDE_BAR_BACKGROUND = #fff
+---++++ TOP_BAR_BACKGROUND Top bar background
+   * Local TOP_BAR_BACKGROUND = #e8f3f7
+---++++ ATTACHMENT_AND_FORM_BACKGROUND Attachment, form
+   * Local ATTACHMENT_AND_FORM_BACKGROUND = #eef7fa
+---++++ TOPIC_ACTION_BACKGROUND Topic action row
+   * Local TOPIC_ACTION_BACKGROUND = #3ba1cb
+---++++ DIFF_HEADER_BACKGROUND Diff header (dark gray)
+   * Local DIFF_HEADER_BACKGROUND = #ccc
+---++++ NOTIFICATION_BACKGROUND Info, broadcast message and notifications
+   * Local NOTIFICATION_BACKGROUND = #ffe67b
+---++++ INFO_BACKGROUND
+   * Local INFO_BACKGROUND = #edf5fa
+
+---+++ Border colors
+---++++ NEUTRAL_BORDER Info (light gray)
+   * Local NEUTRAL_BORDER = #ddd
+---++++ SEPARATOR_BORDER
+   * Local SEPARATOR_BORDER = #e2e2e2
+---++++ STRONG_BORDER
+   * Local STRONG_BORDER = #ccc
+---++++ MINOR_SEPARATOR_BORDER Header H3..H6 bottom
+   * Local MINOR_SEPARATOR_BORDER = %SEPARATOR_BORDER%
+---++++ ATTACHMENT_AND_FORM_BORDER Attachment, form
+   * Local ATTACHMENT_AND_FORM_BORDER = #fff
+---++++ LAYOUT_ELEMENT_BORDER Main layout elements (neutral tone)
+   * Local LAYOUT_ELEMENT_BORDER = #dadada
+---++++ IMAGE_BORDER Image border
+   * Local IMAGE_BORDER = #eee
+---++++ FORM_STEP_BORDER Form step border
+   * Local FORM_STEP_BORDER = %SEPARATOR_BORDER%
+---++++ NOTIFICATION_BORDER Notification messages
+   * Local NOTIFICATION_BORDER = #ffdf4c
+
+---++++ Table colors
+---+++++ TABLE_DATA_BACKGROUND Table data background
+   * Local TABLE_DATA_BACKGROUND = #f0f6f9
+---+++++ TABLE_HEADER_BACKGROUND Table header background
+   * Local TABLE_HEADER_BACKGROUND = #6b7f93
+---+++++ TABLE_SELECTED_COLUMN_HEADER_BACKGROUND Sorted table column accent background
+   * Local TABLE_SELECTED_COLUMN_HEADER_BACKGROUND = #345
+---+++++ TABLE_DATA_ODD_BACKGROUND Table data background (odd row)
+   * Local TABLE_DATA_ODD_BACKGROUND = #f0f6fb
+---+++++ TABLE_DATA_EVEN_BACKGROUND Table data background (even row)
+   * Local TABLE_DATA_EVEN_BACKGROUND = #ffffff
+---+++++ TABLE_DATA_ODD_SELECTED_BACKGROUND Table data background (odd row, selected column)
+   * Local TABLE_DATA_ODD_SELECTED_BACKGROUND = #dce7ee
+---+++++ TABLE_DATA_EVEN_SELECTED_BACKGROUND Table data background (even row, selected column)
+   * Local TABLE_DATA_EVEN_SELECTED_BACKGROUND = #f5f5f5
+---+++++ TABLE_DATA_MIX_BACKGROUND Table data background (mix between even and odd)
+   * Local TABLE_DATA_MIX_BACKGROUND = #f7fafc
+---++++ TABLE_BORDER Table border, sup (light neutral tone)
+   * Local TABLE_BORDER = #e2e2e2
+---++++ LINK_TEXT_NORMAL_TABLE_HEADER Table header link text
+   * Local LINK_TEXT_NORMAL_TABLE_HEADER = #fff
+---++++ LINK_TEXT_NORMAL_BORDER_TABLE_HEADER Table header link border
+   * Local LINK_TEXT_NORMAL_BORDER_TABLE_HEADER = #bbb
+---++++ LINK_TEXT_SORTED_TABLE_HEADER Sorted table header link text
+   * Local LINK_TEXT_SORTED_TABLE_HEADER = #fff
+---++++ LINK_TEXT_HOVER_TABLE_HEADER Table header link hover text
+   * Local LINK_TEXT_HOVER_TABLE_HEADER = #fff
+---++++ LINK_BORDER_TABLE_SELECTED_COLUMN_HEADER Link border in selected column header
+   * Local LINK_BORDER_TABLE_SELECTED_COLUMN_HEADER = #999
+
+---+++ Forms
+---++++ INPUT_FIELD_BORDERS Input field borders
+   * Local INPUT_FIELD_BORDERS = #bbb #f2f2f2 #f2f2f2 #bbb
+---++++ FORM_INPUT_BORDER Textarea, input and select (darker gray)
+   * Local FORM_INPUT_BORDER = #aaa
+---++++ FORM_BORDER Form (same as foswikiTable border)
+   * Local FORM_BORDER = #cfcfcf
+---++++ ACTIVE_FORM_BACKGROUND Edit form, form steps
+   * Local ACTIVE_FORM_BACKGROUND = #eef7fa
+---++++ FORMFIELD_ACTIVE Active form field
+   * Local FORMFIELD_ACTIVE = #ffffe0
+---++++ FORM_HEADER_TEXT Header text on form background
+   * Local FORM_HEADER_TEXT = %HEADER_TEXT%
+
+<!-- END OF COLOR PREFERENCES -->
+
+Do not change the text below this line unless you know what you are doing!
+---
+<verbatim>
+%STARTATTACH{"my_colors.css" web="%SYSTEMWEB%" topic="PatternSkin"}%
+/* PatternSkin colors */
+/* Generated by AttachContentPlugin from %WEB%.%TOPIC% */
+
+/* LAYOUT ELEMENTS */
+
+#patternScreen {
+    background:%PAGE_BACKGROUND%;
+}
+#patternPage {
+    border-color:%STRONG_BORDER%;
+}
+#patternTopBar {
+   border-color:%SEPARATOR_BORDER%;
+    /* color is defined as WEBHEADERBGCOLOR in System/DefaultPreferences */
+}
+#patternMain { /* don't set a background here; use patternOuter */ }
+#patternOuter {
+   background:none;
+   border-color:%LAYOUT_ELEMENT_BORDER%;
+}
+#patternSideBar,
+#patternWrapper {
+   background:%SIDE_BAR_BACKGROUND%;
+}
+#patternBottomBar {
+   border-color:%STRONG_BORDER%;
+   background-color:%NEUTRAL_BACKGROUND%;
+}
+#patternBottomBarContents,
+#patternBottomBarContents a:link,
+#patternBottomBarContents a:visited {
+   color:%GRAYED_OUT_TEXT%;
+}
+#patternBottomBarContents a:hover {
+   color:%LINK_TEXT_HOVER%;
+}
+
+/* GENERAL HTML ELEMENTS */
+
+html body {
+   background-color:%NEUTRAL_BACKGROUND%;
+   color:%MAIN_TEXT%;
+}
+html body.patternEditPage,
+.mceContentBody {
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+
+/* be kind to netscape 4 that doesn't understand inheritance */
+body, p, li, ul, ol, dl, dt, dd, acronym, h1, h2, h3, h4, h5, h6 {
+   background-color:transparent;
+}
+hr {
+   color:%SEPARATOR_BORDER%;
+   background-color:%SEPARATOR_BORDER%;
+}
+pre, code, tt {
+   color:%CODE_TEXT%;
+}
+pre {
+   background:%NEUTRAL_BACKGROUND%;
+   border-color:%NEUTRAL_BORDER%;
+}
+blockquote {
+   background-color:%NEUTRAL_BACKGROUND%;
+   border-color:%NEUTRAL_BORDER%;
+}
+blockquote h2 {
+   background:none;
+}
+h1 {
+   color:%H1_HEADER_TEXT%;
+}
+h2, h3, h4, h5, h6 {
+   color:%HEADER_TEXT%;
+}
+
+/* to override old Render.pm coded font color style */
+.foswikiNewLink font {
+   color:inherit;
+}
+.foswikiNewLink a:link sup,
+.foswikiNewLink a:visited sup {
+   color:%MUTED_TEXT%;
+   border-color:%NEUTRAL_BORDER%;
+}
+.foswikiNewLink a:hover sup {
+   background-color:%LINK_BACKGROUND_HOVER%;
+   color:%LINK_TEXT_HOVER%;
+   border-color:%LINK_BACKGROUND_HOVER%;
+}
+.foswikiNewLink {
+   border-color:%NEUTRAL_BORDER%;
+}
+:link:focus,
+:visited:focus,
+:link,
+:visited,
+:link:active,
+:visited:active {
+   color:%LINK_TEXT_NORMAL%;
+   background-color:transparent;
+}
+:link:hover,
+:visited:hover {
+   color:%LINK_TEXT_HOVER%;
+   background-color:%LINK_BACKGROUND_HOVER%;
+   background-image:none;
+}
+:link:hover img,
+:visited:hover img {
+   background-color:transparent;
+}
+.foswikiTopic a:visited {
+   color:%LINK_TEXT_NORMAL_VISITED%;
+}
+.foswikiTopic a:hover {
+   color:%LINK_TEXT_HOVER%;
+}
+.foswikiTopic .foswikiUnvisited a:visited {
+   color:%LINK_TEXT_NORMAL%;
+}
+.foswikiTopic .foswikiUnvisited a:hover {
+   color:%LINK_TEXT_HOVER%;
+}
+
+/* Form elements */
+
+textarea,
+input,
+select {
+   border-color:%FORM_INPUT_BORDER%;
+   color:%MAIN_TEXT%;
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+.foswikiSubmit,
+.foswikiButton {
+   border-color:%BUTTON_BORDERS%;
+}
+.foswikiSubmit {
+   color:%SUBMIT_BUTTON_BORDER_TEXT%;
+   background-color:%SUBMIT_BUTTON_BACKGROUND%;
+}
+.foswikiButton {
+   color:%BUTTON_TEXT%;
+   background-color:%BUTTON_BACKGROUND%;
+}
+.foswikiButtonCancel {
+   color:%BUTTON_TEXT%;
+   background-color:%BUTTON_CANCEL_BACKGROUND%;
+}
+.foswikiSubmitDisabled,
+.foswikiSubmitDisabled:active {
+   border-color:%BUTTON_BORDERS_DISABLED%;
+   color:%DISABLED_TEXT%;
+   background-color:%ACTIVE_FORM_BACKGROUND%;
+}
+.foswikiTextarea,
+.foswikiInputField,
+.foswikiInputFieldDisabled,
+.foswikiInputFieldReadOnly,
+.foswikiSelect {
+   border-color:%INPUT_FIELD_BORDERS%;
+}
+.foswikiTextarea,
+.foswikiInputField,
+.foswikiSelect {
+   color:%MAIN_TEXT%;
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+.foswikiInputField:active,
+.foswikiInputField:focus,
+.foswikiInputFieldFocus {
+   background-color:%FORMFIELD_ACTIVE%;
+}
+
+.foswikiTextareaRawView {
+   color:%GENERAL_TEXT%;
+}
+.foswikiInputFieldDisabled {
+   color:%DISABLED_TEXT%;
+   background-color:%DISABLED_BACKGROUND%;
+}
+.foswikiInputFieldReadOnly {
+   color:%GRAYED_TEXT%;
+}
+.foswikiSelect {
+   border-color:%INPUT_FIELD_BORDERS%;
+   color:%MAIN_TEXT%;
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+.foswikiInputFieldDisabled,
+.foswikiSelectDisabled {
+   color:%DISABLED_TEXT%;
+   border-color:%INPUT_FIELD_BORDERS%;
+   background-color:%DISABLED_BACKGROUND%;
+}
+.foswikiInputFieldBeforeFocus {
+   color:%MUTED_TEXT%;
+}
+
+/*   -----------------------------------------------------------
+   Plugin elements
+   -----------------------------------------------------------   */
+
+/* TablePlugin */
+.foswikiTable,
+.foswikiTable td,
+.foswikiTable th {
+   border-color:%TABLE_BORDER%;
+}
+.foswikiTable th,
+.foswikiTable th a:link,
+.foswikiTable th a:visited {
+   color:%LINK_TEXT_NORMAL_TABLE_HEADER%;
+}
+
+/* TwistyContrib */
+.twistyPlaceholder {
+   color:%GRAYED_OUT_TEXT%;
+}
+a:hover.twistyTrigger {
+   color:%LINK_TEXT_HOVER%;
+}
+
+/* TipsContrib */
+.tipsOfTheDay {
+}
+
+/* RevCommentPlugin */
+.revComment .patternTopicAction {
+   background-color:%ATTACHMENT_AND_FORM_BACKGROUND%;
+}
+
+/*   -----------------------------------------------------------
+   Foswiki styles
+   -----------------------------------------------------------   */
+
+.foswikiGrayText {
+   color:%GRAYED_OUT_TEXT%;
+}
+.foswikiGrayText a:link,
+.foswikiGrayText a:visited {
+   color:%GRAYED_OUT_TEXT%;
+}
+.foswikiGrayText a:hover {
+   color:%LINK_TEXT_HOVER%;
+}
+
+table.foswikiFormTable th.foswikiFormTableHRow,
+table.foswikiFormTable td.foswikiFormTableRow {
+   color:%MUTED_TEXT%;
+}
+.foswikiEditForm {
+   color:%MAIN_TEXT%;
+}
+.foswikiEditForm .foswikiFormTable,
+.foswikiEditForm .foswikiFormTable th,
+.foswikiEditForm .foswikiFormTable td {
+   border-color:%TABLE_BORDER%;
+}
+/* use a different table background color mix: no odd/even rows, no white background */
+.foswikiEditForm .foswikiFormTable td  {
+   background-color:%TABLE_DATA_MIX_BACKGROUND%;
+}
+.foswikiEditForm .foswikiFormTable th {
+   background-color:%TABLE_DATA_ODD_BACKGROUND%;
+}
+.patternContent .foswikiAttachments,
+.patternContent .foswikiForm {
+   background-color:%ATTACHMENT_AND_FORM_BACKGROUND%;
+   border-color:%MAIN_TEXT_BACKGROUND%;
+}
+.foswikiAttachments .foswikiButton h3,
+.foswikiForm .foswikiButton h3 {
+    color:%HEADER_TEXT%;
+}
+.foswikiAttachments table,
+table.foswikiFormTable {
+   border-color:%TABLE_BORDER%;
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+.foswikiAttachments table {
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+.foswikiForm td,
+.foswikiForm th,
+.foswikiAttachments td, 
+.foswikiAttachments th {
+   border-color:%TABLE_BORDER%;
+}
+.foswikiFormSteps {
+   background-color:%ACTIVE_FORM_BACKGROUND%;
+   border-color:%FORM_STEP_BORDER%;
+}
+.foswikiFormStep {
+   border-color:%FORM_STEP_BORDER%;
+}
+.foswikiFormStep h2 {
+   color:%H1_HEADER_TEXT%;
+}
+.foswikiFormStep h3,
+.foswikiFormStep h4 {
+   color:%FORM_HEADER_TEXT%;
+}
+.foswikiFormStep h3,
+.foswikiFormStep h4 {
+   background-color:transparent;
+}
+.foswikiActionFormStepSign {
+   color:%FORM_HEADER_TEXT%;
+}
+.foswikiFormStep .foswikiHelp {
+        background:%MAIN_TEXT_BACKGROUND%;
+}
+.foswikiToc .foswikiTocTitle {
+   color:%MUTED_TEXT%;
+}
+.foswikiBroadcastMessage,
+.foswikiNotification {
+   background-color:%NOTIFICATION_BACKGROUND%;
+}
+.foswikiNotification {
+   border-color:%NOTIFICATION_BORDER%;
+}
+#foswikiLogin .patternLoginNotification {
+   background-color:%MAIN_TEXT_BACKGROUND%;
+   border-color:%ALERT_BORDER%;
+}
+.foswikiHelp {
+   background-color:%INFO_BACKGROUND%;
+   border-color:%SEPARATOR_BORDER%;
+}
+.foswikiBroadcastMessage b,
+.foswikiBroadcastMessage strong {
+   color:%ALERT_TEXT%;
+}
+.foswikiAlert,
+.foswikiAlert code {
+   color:%ALERT_TEXT%;
+}
+.foswikiEmulatedLink {
+   color:%LINK_TEXT_NORMAL%;
+}
+.foswikiPageForm table {
+   border-color:%TABLE_BORDER%;
+   background:%MAIN_TEXT_BACKGROUND%;
+}
+.foswikiPageForm hr {
+   border-color:%FORM_BORDER%;
+   background-color:%FORM_BORDER%;
+   color:%FORM_BORDER%;
+}
+.foswikiAccessKey {
+   color:inherit;
+   border-color:%GRAYED_OUT_TEXT%;
+}
+a:link .foswikiAccessKey,
+a:visited .foswikiAccessKey {
+   color:inherit;
+}
+a:hover .foswikiAccessKey {
+   color:inherit;
+}
+.foswikiImage img {
+   border-color:%IMAGE_BORDER%;
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+#patternTopBar .foswikiImage img {
+   background-color:transparent;
+}
+.foswikiImage a:hover img {
+   border-color:%LINK_BACKGROUND_HOVER%;
+}
+
+/*   -----------------------------------------------------------
+   Pattern skin specific elements
+   -----------------------------------------------------------   */
+#patternPage {
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+.patternHomePath a:link,
+.patternHomePath a:visited {
+   border-color:%NEUTRAL_BORDER%;
+   color:%LINK_TEXT_NORMAL_VISITED%;
+}
+.patternTop a:hover {
+   border:none;
+   color:%LINK_TEXT_HOVER%;
+}
+.patternHomePath .patternRevInfo,
+.patternHomePath .patternRevInfo a:link,
+.patternHomePath .patternRevInfo a:visited {
+   color:%GRAYED_OUT_TEXT%;
+}
+.patternHomePath .patternRevInfo a:hover {
+   color:%LINK_TEXT_HOVER%;
+}
+
+/* Left bar */
+#patternSideBarContents {
+   color:%GENERAL_TEXT%;
+}
+#patternSideBarContents hr {
+   color:%FORM_STEP_BORDER%;
+   background-color:%FORM_STEP_BORDER%;
+}
+#patternSideBarContents a:link,
+#patternSideBarContents a:visited {
+   color:%SIDE_BAR_LINK_TEXT%;
+}
+#patternSideBarContents a:hover {
+   color:%LINK_TEXT_HOVER%;
+}
+#patternSideBarContents .patternLeftBarPersonal,
+#patternSideBarContents .patternWebIndicator {
+    border-color:#dadada;
+}
+#patternSideBarContents b,
+#patternSideBarContents strong {
+    color:%HEADER_TEXT%;
+}
+
+.patternTopicActions {
+   background-color:%TOPIC_ACTION_BACKGROUND%;
+   color:%GRAYED_OUT_TEXT_ON_DARK%;
+}
+.patternTopicAction {
+   border-color:%ATTACHMENT_AND_FORM_BORDER%;
+}
+.patternTopicAction s,
+.patternTopicAction strike {
+   color:%DISABLED_TEXT%;
+}
+.patternTopicAction .foswikiSeparator {
+   color:%SEPARATOR_BORDER%;
+}
+.patternActionButtons a:link,
+.patternActionButtons a:visited {
+   color:%LIGHT_ON_DARK_TEXT%;
+}
+.patternActionButtons a:hover {
+   color:%LINK_TEXT_HOVER%;
+}
+.patternTopicAction .foswikiAccessKey {
+   color:%LIGHT_ON_DARK_TEXT%;
+   border-color:%LIGHT_ON_DARK_TEXT%;
+}
+.patternTopicAction a:hover .foswikiAccessKey {
+   color:%LINK_TEXT_HOVER%;
+}
+.patternTopicAction label {
+   color:%GENERAL_TEXT%;
+}
+.patternHelpCol {
+   color:%GRAYED_OUT_TEXT%;
+}
+.patternSigLine {
+   color:%MUTED_TEXT%;
+}
+.patternEditTopic {
+    background:%ATTACHMENT_AND_FORM_BACKGROUND%;
+}
+.patternToolBar a:link .foswikiAccessKey,
+.patternToolBar a:visited .foswikiAccessKey {
+   color:inherit;
+   border-color:%LINK_TEXT_NORMAL_VISITED%;
+}
+.patternToolBar a:hover .foswikiAccessKey {
+   background-color:transparent;
+   color:inherit;
+   border-color:%LINK_TEXT_NORMAL_VISITED%;
+}
+
+/* WebSearch, WebSearchAdvanced */
+
+.foswikiSearchHeader {
+}
+/*
+table#foswikiSearchTable {
+   border-color:%FORM_STEP_BORDER%;
+}
+table#foswikiSearchTable th,
+table#foswikiSearchTable td {
+   background-color:%MAIN_TEXT_BACKGROUND%;
+   border-color:%FORM_STEP_BORDER%;
+}
+table#foswikiSearchTable hr {
+   border-color:%FORM_STEP_BORDER%;
+   background-color:%FORM_STEP_BORDER%;
+}
+table#foswikiSearchTable th {
+   color:%MAIN_TEXT%;
+}
+*/
+
+/*   -----------------------------------------------------------
+   Search results
+   styles and overridden styles used in search.pattern.tmpl
+   -----------------------------------------------------------   */
+
+h3.patternSearchResultsHeader,
+h4.patternSearchResultsHeader {
+   background-color:%ATTACHMENT_AND_FORM_BACKGROUND%;
+   border-color:%SEPARATOR_BORDER%;
+}
+h4.patternSearchResultsHeader {
+   color:%MAIN_TEXT%;
+}
+.patternNoViewPage h4.patternSearchResultsHeader {
+   color:%HEADER_TEXT%;
+}
+.foswikiSearchResult .foswikiBottomRow {
+   border-color:%MINOR_SEPARATOR_BORDER%;
+}
+.foswikiSearchResult .foswikiAlert {
+   color:%ALERT_TEXT%;
+}
+.foswikiSearchResult .foswikiSummary .foswikiAlert {
+   color:%ALERT_TEXT_MUTED%;
+}
+.foswikiSearchResult .foswikiNew {
+   background-color:%NEW_BACKGROUND%;
+   border-color:%NEW_TEXT%;
+   color:%NEW_TEXT%;
+}
+.patternViewPage .patternSearchResultsBegin {
+   border-color:%TABLE_BORDER%;
+}
+
+/* Search results in book view format */
+
+.patternBookView .foswikiTopRow {
+   background-color:transparent; /* set to WEBBGCOLOR in css.pattern.tmpl */
+   color:%MUTED_TEXT%;
+}
+.patternBookView .foswikiBottomRow {
+   border-color:%TABLE_BORDER%;
+}
+.patternBookView .patternSearchResultCount {
+   color:%GRAYED_OUT_TEXT%;
+}
+
+/* edit.pattern.tmpl */
+
+/* preview.pattern.tmpl */
+
+.foswikiPreviewArea,
+.patternPreviewPage .foswikiForm {
+   border-color:%ALERT_BORDER%;
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+.patternPreviewPage .foswikiForm {
+   border-color:%STRONG_BORDER%;
+   background-color:%MAIN_TEXT_BACKGROUND%;
+}
+
+/* rdiff.pattern.tmpl */
+
+.patternDiff {
+   border-color:%TABLE_HEADER_BACKGROUND%;
+}
+#patternMainContents .patternDiff h4.patternSearchResultsHeader {
+   background-color:%TABLE_HEADER_BACKGROUND%;
+   color:%LIGHT_ON_DARK_TEXT%;
+}
+#patternMainContents .patternDiff h4.patternSearchResultsHeader a:link,
+#patternMainContents .patternDiff h4.patternSearchResultsHeader a:visited {
+   color:%LIGHT_ON_DARK_TEXT%;
+}
+tr.foswikiDiffDebug td {
+   border-color:%TABLE_BORDER%;
+}
+.patternDiffPage .foswikiDiffTable th {
+   background-color:%DIFF_HEADER_BACKGROUND%;
+}
+/* Changed */
+.foswikiDiffChangedHeader,
+tr.foswikiDiffDebug .foswikiDiffChangedText,
+tr.foswikiDiffDebug .foswikiDiffChangedText {
+   background:#9f9; /* green - do not change */
+}
+/* Deleted */
+tr.foswikiDiffDebug .foswikiDiffDeletedMarker,
+tr.foswikiDiffDebug .foswikiDiffDeletedText {
+   background-color:#f99; /* red - do not change */
+}
+/* Added */
+.foswikiDiffAddedHeader,
+tr.foswikiDiffDebug .foswikiDiffAddedMarker,
+tr.foswikiDiffDebug .foswikiDiffAddedText {
+   background-color:#ccf; /* violet - do not change */
+}
+/* Unchanged */
+tr.foswikiDiffDebug .foswikiDiffUnchangedText {
+   color:%GRAYED_OUT_TEXT%;
+}
+.foswikiDiffUnchangedTextContents { }
+.foswikiDiffLineNumberHeader {
+   background-color:%DIFF_HEADER_BACKGROUND%;
+}
+
+
+/* IMAGES */
+/* image positions are set here as well as these are dependent on the image */
+
+#patternTopBar {
+    /* image is defined as WEBHEADERART in System/DefaultPreferences */
+}
+.foswikiToc li {
+   background-image:url(bullet-toc.gif);
+   background-repeat:no-repeat;
+   background-position:0 .4em;
+}
+.patternPrintPage #patternOuter {
+   background:#fff; /* white - do not change */
+}
+.foswikiSubmit,
+.foswikiSubmitDisabled {
+   background-image:url(bg_submit_gradient.gif);
+   background-repeat:repeat-x;
+}
+.foswikiSubmit,
+a.foswikiSubmit:link,
+a.foswikiSubmit:visited {
+   background-position:0px 0px;
+   background-color:#06c;
+   border-color:#94cce2 #0e66a2 #0e66a2 #94cce2;
+   color:#fff;
+}
+.foswikiSubmit:hover,
+a.foswikiSubmit:hover {
+   background-position:0px -80px;
+   background-color:#0047b7;
+   border-color:#0e66a2 #94cce2 #94cce2 #0e66a2;
+   color:#fff;
+}
+.foswikiSubmit:active,
+a.foswikiSubmit:active {
+   background-position:0px -160px;
+   background-color:#73ace6;
+   border-color:#0e66a2 #94cce2 #94cce2 #0e66a2;
+   color:#fff;
+}
+.foswikiSubmitDisabled,
+.foswikiSubmitDisabled:hover,
+.foswikiSubmitDisabled:active {
+   background-position:0px -240px;
+   background-color:#d9e8f7;
+   border-color:#ccc #ccc #ccc #ccc;
+   color:#ccc;
+}
+.foswikiButton,
+a.foswikiButton:link,
+a.foswikiButton:visited {
+   background-image:url(bg_button_gradient.gif);
+   background-repeat:repeat-x;
+   background-position:0px 0px;
+   border-color:#fff #94cce2 #94cce2 #fff;
+   background-color:#cce7f1;
+   color:%BUTTON_TEXT_NORMAL%;
+}
+.foswikiButton:hover,
+.foswikiButton:active,
+a.foswikiButton:hover,
+a.foswikiButton:active {
+   background-position:0px -160px;
+   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
+   background-color:#cce7f1;
+   color:%BUTTON_TEXT_NORMAL%;
+}
+.foswikiButtonDisabled,
+.foswikiButtonDisabled:hover,
+.foswikiButtonDisabled:active {
+   background-image:url(bg_button_gradient.gif);
+   background-repeat:repeat-x;
+   background-position:0px -240px;
+   border-color:#ccc #ccc #ccc #ccc;
+   background-color:#edece6;
+   color:#bbb;
+}
+.foswikiButtonCancel {
+   background-image:url(bg_buttoncancel_gradient.gif);
+   background-repeat:repeat-x;
+   background-position:0px 0px;
+   border-color:#f3ddd7 #ce5232 #ce5232 #f3ddd7;
+   background-color:#dd724d;
+   color:#fff;
+}
+.foswikiButtonCancel:hover {
+   background-position:0px -80px;
+   border-color:#ce5232 #f3ddd7 #f3ddd7 #ce5232;
+   background-color:#dd724d;
+   color:#fff;
+}
+.foswikiButtonCancel:active {
+   background-position:0px -160px;
+   border-color:#ce5232 #f3ddd7 #f3ddd7 #ce5232;
+   background-color:#dd724d;
+   color:#fff;
+}
+.patternToolBar span a:link,
+.patternToolBar span a:visited,
+.patternToolBar span s,
+.patternToolBar span strike {
+   background-image:url(bg_button_gradient.gif);
+   background-repeat:repeat-x;
+}
+.patternToolBar span a:link,
+.patternToolBar span a:visited {
+   background-position:0px 0px;
+   border-color:#fff #94cce2 #94cce2 #fff;
+   background-color:#cce7f1;
+   color:%BUTTON_TEXT_NORMAL%;
+}
+.patternToolBar span a:hover {
+   background-position:0px -80px;
+   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
+   background-color:#cce7f1;
+   color:#222;
+}
+.patternToolBar span a:active {
+   background-position:0px -160px;
+   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
+   background-color:#e8e5d7;
+   color:#222;
+}
+.patternToolBar span s,
+.patternToolBar span strike {
+   background-position:0px -240px;
+   border-color:#eae9e7 #eae9e7 #eae9e7 #eae9e7;
+   background-color:#edece6;
+   color:#bbb;
+}
+.patternTextareaButton {
+   border-color:#fffefd #b8b6ad #b8b6ad #fffefd;
+   overflow:hidden;
+}
+.patternButtonFontSelector {
+   background-image:url(button_font_selector.gif);
+   width:33px;
+   height:16px;
+}
+.patternButtonFontSelectorProportional {
+   background-position:0 0;
+}
+.patternButtonFontSelectorMonospace {
+   background-position:0 -16px;
+}
+.patternButtonEnlarge,
+.patternButtonShrink {
+   background-image:url(button_arrow.gif);
+   width:16px;
+   height:16px;
+}
+.patternButtonEnlarge {
+   background-position:0 0;
+}
+.patternButtonEnlarge:hover {
+   background-position:0 -42px;
+}
+.patternButtonEnlarge:active {
+   background-position:0 -84px;
+}
+.patternButtonShrink {
+   background-position:16px 0;
+}
+.patternButtonShrink:hover {
+   background-position:16px -42px;
+}
+.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>

trunk/PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm

@@ -3 +3 @@
 
 our $VERSION = '$Rev$';
-our $RELEASE = '5.1';
+our $RELEASE = '5.2';
 our $SHORTDESCRIPTION = 'Pattern skin provides a CSS based default look and feel - flexible and [[http://www.w3.org/][W3C]] compliant. Its layout and color scheme are designed to provide a nice, clean and productive editing environment';
 

trunk/PatternSkin/pub/System/PatternSkinTheme/colors.css

@@ -1 @@
-
 /* PatternSkin colors */
-/* Generated by AttachContentPlugin from System.PatternSkin */
+/* Generated by AttachContentPlugin from System.PatternSkinColorSettings */
 
 /* LAYOUT ELEMENTS */
 
 #patternScreen {
-        background:#e2e2e2;
+    background:#fafafa;
 }
 #patternPage {
-        border-color:#ccc;
+    border-color:#ccc;
 }
 #patternTopBar {
-   border-color:#e2e2e2;
-        /* color is defined as WEBHEADERBGCOLOR in System/DefaultPreferences */
+   border-color:#dfdfdf;
+   background:#fafafa;
+   /* color can be overridden with WEBHEADERBGCOLOR in System/DefaultPreferences */
 }
 #patternMain { /* don't set a background here; use patternOuter */ }
@@ -26 +26 @@
 #patternBottomBar {
    border-color:#ccc;
-   background-color:#f5f5f5;
+   background-color:#fafafa;
 }
 #patternBottomBarContents,
@@ -34 +34 @@
 }
 #patternBottomBarContents a:hover {
-   color:#fff;
+   color:#06c;
 }
 
@@ -40 +40 @@
 
 html body {
-   background-color:#f5f5f5;
+   background-color:#fafafa;
    color:#000;
 }
@@ -47 +47 @@
    background-color:#fff;
 }
+
 /* be kind to netscape 4 that doesn't understand inheritance */
 body, p, li, ul, ol, dl, dt, dd, acronym, h1, h2, h3, h4, h5, h6 {
@@ -52 +53 @@
 }
 hr {
-   color:#e2e2e2;
-   background-color:#e2e2e2;
+   color:#dfdfdf;
+   background-color:#dfdfdf;
 }
 pre, code, tt {
@@ -59 +60 @@
 }
 pre {
-   background:#f5f5f5;
+   background:#fafafa;
    border-color:#ddd;
 }
 blockquote {
-   background-color:#f5f5f5;
-   border-color:#ddd;
+   background-color:#f0f0ee;
+   border-color:#dfdfdf;
 }
 blockquote h2 {
@@ -70 +71 @@
 }
 h1 {
-   color:#2989bb;
+   color:#333;
 }
 h2, h3, h4, h5, h6 {
-   color:#d1400e;
-}
-h2 {
-   border-color:#e2e2e2;
-}
-h3, h4, h5, h6 {
-   border-color:#e2e2e2;
-}
+   color:#390;
+}
+
 /* to override old Render.pm coded font color style */
 .foswikiNewLink font {
@@ -91 +87 @@
 }
 .foswikiNewLink a:hover sup {
-   background-color:#0055b5;
-   color:#fff;
-   border-color:#0055b5;
+   background-color:transparent;
+   color:#06c;
+   border-color:transparent;
 }
 .foswikiNewLink {
@@ -104 +100 @@
 :link:active,
 :visited:active {
-   color:#4571d0;
+   color:#06c;
    background-color:transparent;
 }
 :link:hover,
 :visited:hover {
-   color:#fff;
-   background-color:#0055b5;
+   color:#06c;
+   background-color:transparent;
    background-image:none;
 }
@@ -118 +114 @@
 }
 .foswikiTopic a:visited {
-   color:#666;
+   color:#4c94db;
 }
 .foswikiTopic a:hover {
-   color:#fff;
+   color:#06c;
 }
 .foswikiTopic .foswikiUnvisited a:visited {
-   color:#4571d0;
+   color:#06c;
 }
 .foswikiTopic .foswikiUnvisited a:hover {
-   color:#fff;
+   color:#06c;
 }
 
@@ -159 +155 @@
    border-color:#fff #ccc #ccc #fff;
    color:#aaa;
-   background-color:#eef7fa;
+   background-color:#f0f0ee;
 }
 .foswikiTextarea,
@@ -177 +173 @@
 .foswikiInputField:focus,
 .foswikiInputFieldFocus {
-   background-color:#ffffe0;
+   background-color:#ebf5fa;
 }
 
@@ -213 +209 @@
 .foswikiTable td,
 .foswikiTable th {
-   border-color:#e2e2e2;
-}
+   border-color:#dfdfdf;
+}
+.foswikiTable th,
 .foswikiTable th a:link,
-.foswikiTable th a:visited,
-.foswikiTable th a font {
+.foswikiTable th a:visited {
    color:#fff;
 }
@@ -226 +222 @@
 }
 a:hover.twistyTrigger {
-   color:#fff;
+   color:#06c;
 }
 
@@ -235 +231 @@
 /* RevCommentPlugin */
 .revComment .patternTopicAction {
-   background-color:#eef7fa;
+   background-color:#f0f0ee;
 }
 
@@ -250 +246 @@
 }
 .foswikiGrayText a:hover {
-   color:#fff;
+   color:#06c;
 }
 
@@ -263 +259 @@
 .foswikiEditForm .foswikiFormTable th,
 .foswikiEditForm .foswikiFormTable td {
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
 }
 /* use a different table background color mix: no odd/even rows, no white background */
@@ -274 +270 @@
 .patternContent .foswikiAttachments,
 .patternContent .foswikiForm {
-   background-color:#eef7fa;
+   background-color:#f0f0ee;
    border-color:#fff;
-}
-.patternTwistyButton h3 {
-        color:#d1400e;
 }
 .foswikiAttachments table,
 table.foswikiFormTable {
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
    background-color:#fff;
 }
@@ -292 +285 @@
 .foswikiAttachments td, 
 .foswikiAttachments th {
-   border-color:#e2e2e2;
-}
-.foswikiAttachments .foswikiTable th font,
-table.foswikiFormTable th.foswikiFormTableHRow font {
-   color:#4571d0;
-}
-
+   border-color:#dfdfdf;
+}
 .foswikiFormSteps {
-   background-color:#eef7fa;
-   border-color:#e2e2e2;
+   background-color:#f0f0ee;
+   border-color:#dfdfdf;
 }
 .foswikiFormStep {
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
 }
 .foswikiFormStep h2 {
-   color:#2989bb;
+   color:#333;
 }
 .foswikiFormStep h3,
 .foswikiFormStep h4 {
-   color:#d1400e;
+   color:#333;
 }
 .foswikiFormStep h3,
@@ -318 +306 @@
 }
 .foswikiActionFormStepSign {
-   color:#d1400e;
+   color:#aaa;
 }
 .foswikiFormStep .foswikiHelp {
@@ -328 +316 @@
 .foswikiBroadcastMessage,
 .foswikiNotification {
-   background-color:#ffe67b;
-}
-.foswikiNotification {
-   border:2px solid #ffdf4c;
+   background-color:#fff7e7;
+   border-color:#fbad17;
 }
 #foswikiLogin .patternLoginNotification {
@@ -338 +324 @@
 }
 .foswikiHelp {
-   background-color:#edf5fa;
-   border-color:#e2e2e2;
+   background-color:#f1f8ed;
 }
 .foswikiBroadcastMessage b,
@@ -350 +335 @@
 }
 .foswikiEmulatedLink {
-   color:#4571d0;
+   color:#06c;
 }
 .foswikiPageForm table {
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
    background:#fff;
 }
@@ -380 +365 @@
 }
 .foswikiImage a:hover img {
-   border-color:#0055b5;
+   border-color:transparent;
+}
+.foswikiSeparator {
+   color:#aaa;
+}
+.foswikiHorizontalList ul li {
+        border-color:#aaa;
 }
 
@@ -389 +380 @@
    background-color:#fff;
 }
+.patternTop a:hover {
+   border:none;
+   color:#06c;
+}
 .patternHomePath a:link,
 .patternHomePath a:visited {
-   border-color:#ddd;
-   color:#666;
-}
-.patternTop a:hover {
-   border:none;
-   color:#fff;
-}
-.patternHomePath .patternRevInfo,
-.patternHomePath .patternRevInfo a:link,
-.patternHomePath .patternRevInfo a:visited {
-   color:#777;
-}
-.patternHomePath .patternRevInfo a:hover {
-   color:#fff;
+   color:#777;
+}
+.patternHomePath:hover a:link,
+.patternHomePath:hover a:visited {
+   color:#06c;
 }
 
@@ -412 +398 @@
 }
 #patternSideBarContents hr {
-   color:#e2e2e2;
-   background-color:#e2e2e2;
+   color:#dfdfdf;
+   background-color:#dfdfdf;
 }
 #patternSideBarContents a:link,
 #patternSideBarContents a:visited {
-   color:#444;
+   color:#333;
 }
 #patternSideBarContents a:hover {
-   color:#fff;
+   color:#06c;
 }
 #patternSideBarContents .patternLeftBarPersonal,
 #patternSideBarContents .patternWebIndicator {
-        border-color:#dadada;
+    border-color:#dadada;
 }
 #patternSideBarContents b,
 #patternSideBarContents strong {
-        color:#d1400e;
+    color:#333;
 }
 
 .patternTopicActions {
-   background-color:#2989bb;
-   color:#bbb;
+   background-color:#eaf5fb;
+   color:#000;
+   border-color:#6aadd0;
 }
 .patternTopicAction {
    border-color:#fff;
+}
+.patternActionButtons a:link,
+.patternActionButtons a:visited,
+.patternActionButtons a:hover {
+   color:#06c;
 }
 .patternTopicAction s,
@@ -442 +434 @@
    color:#aaa;
 }
-.patternTopicAction .foswikiSeparator {
-   color:#e2e2e2;
-}
-.patternActionButtons a:link,
-.patternActionButtons a:visited {
-   color:#fff;
-}
-.patternActionButtons a:hover {
-   color:#fff;
-}
-.patternTopicAction a:link .foswikiAccessKey,
-.patternTopicAction a:visited .foswikiAccessKey {
+.patternTopicAction .foswikiAccessKey {
    color:#fff;
    border-color:#fff;
 }
 .patternTopicAction a:hover .foswikiAccessKey {
-   color:#fff;
+   color:#06c;
 }
 .patternTopicAction label {
@@ -467 +448 @@
 }
 .patternSigLine {
-   color:#777;  
+   color:#777;
 }
 .patternEditTopic {
-        background:#eef7fa;
+    background:#fafafa;
 }
 .patternToolBar a:link .foswikiAccessKey,
 .patternToolBar a:visited .foswikiAccessKey {
    color:inherit;
-   border-color:#666;
+   border-color:#4c94db;
 }
 .patternToolBar a:hover .foswikiAccessKey {
    background-color:transparent;
    color:inherit;
-   border-color:#666;
+   border-color:#4c94db;
+}
+.patternInfo,
+.patternInfo a:link,
+.patternInfo a:visited {
+        color:#777;
+}
+.patternInfo:hover a:link,
+.patternInfo:hover a:visited,
+.patternInfo a:hover {
+        color:#06c;
+}
+
+.patternTwistyButton h3 {
+        color:#06c;
 }
 
 /* WebSearch, WebSearchAdvanced */
+
 table#foswikiSearchTable {
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
+   background-color:#fafafa;
 }
 table#foswikiSearchTable th,
 table#foswikiSearchTable td {
    background-color:#fff;
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
 }
 table#foswikiSearchTable hr {
-   border-color:#e2e2e2;
-   background-color:#e2e2e2;
+   border-color:#dfdfdf;
+   background-color:#dfdfdf;
 }
 table#foswikiSearchTable th {
@@ -505 +502 @@
    -----------------------------------------------------------   */
 
-h3.patternSearchResultsHeader,
-h4.patternSearchResultsHeader {
-   background-color:#eef7fa;
-   border-color:#e2e2e2;
-}
-h4.patternSearchResultsHeader {
-   color:#000;
-}
-.patternNoViewPage h4.patternSearchResultsHeader {
-   color:#d1400e;
-}
-.patternSearchResult .foswikiBottomRow {
-   border-color:#e2e2e2;
-}
-.patternSearchResult .foswikiAlert {
+h3.foswikiSearchResultsHeader,
+h4.foswikiSearchResultsHeader {
+   border-color:#dfdfdf;
+}
+h4.foswikiSearchResultsHeader {
+   color:#777;
+}
+h4.foswikiSearchResultsHeader b,
+h4.foswikiSearchResultsHeader strong {
+        color:#000;
+}
+.patternNoViewPage h4.foswikiSearchResultsHeader {
+   color:#390;
+}
+.foswikiSearchResult .foswikiAlert {
    color:#f00;
 }
-.patternSearchResult .foswikiSummary .foswikiAlert {
+.foswikiSearchResult .foswikiSummary .foswikiAlert {
    color:#900;
 }
-.patternSearchResult .foswikiNew {
-   background-color:#ECFADC;
-   border-color:#049804;
+.foswikiSearchResult .foswikiBottomRow,
+.foswikiSearchResult .foswikiBottomRow a:link,
+.foswikiSearchResult .foswikiBottomRow a:visited {
    color:#049804;
 }
+.foswikiSearchResult .foswikiBottomRow:hover a:link,
+.foswikiSearchResult .foswikiBottomRow:hover a:visited {
+   color:#06c;
+}
 .patternViewPage .patternSearchResultsBegin {
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
 }
 
@@ -541 +542 @@
 }
 .patternBookView .foswikiBottomRow {
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
 }
 .patternBookView .patternSearchResultCount {
@@ -566 +567 @@
    border-color:#6b7f93;
 }
-#patternMainContents .patternDiff h4.patternSearchResultsHeader {
+#patternMainContents .patternDiff h4.foswikiSearchResultsHeader {
    background-color:#6b7f93;
    color:#fff;
 }
-#patternMainContents .patternDiff h4.patternSearchResultsHeader a:link,
-#patternMainContents .patternDiff h4.patternSearchResultsHeader a:visited {
+#patternMainContents .patternDiff h4.foswikiSearchResultsHeader a:link,
+#patternMainContents .patternDiff h4.foswikiSearchResultsHeader a:visited {
    color:#fff;
 }
 tr.foswikiDiffDebug td {
-   border-color:#e2e2e2;
+   border-color:#dfdfdf;
 }
 .patternDiffPage .foswikiDiffTable th {
@@ -611 +612 @@
 
 #patternTopBar {
-        /* image is defined as WEBHEADERART in System/DefaultPreferences */
+    /* image is defined as WEBHEADERART in System/DefaultPreferences */
 }
 .foswikiToc li {
@@ -777 +778 @@
    background-position:16px -84px;
 }
-.foswikiBroadcastMessage {
-   background-image:url(background_alert.gif);
-   background-repeat:repeat-x;
-}
 
 /* common settings */

trunk/PatternSkin/pub/System/PatternSkinTheme/style.css

@@ -14 +14 @@
         S3 small font size, foswikiSmall                                                        font-size:86%; line-height:110%;
         S4 horizontal bar padding (h2, patternTop)                              5px
-        S5 form and attachment padding                                                  20px
+        S5 form and attachment padding                                                  10px
         S6 left margin left bar                                                                 1em
 
@@ -64 +64 @@
 }
 blockquote {
+        margin:0;
+        font-size:94%;
         padding:.5em 1.25em;
-        border-style:solid;
-        border-width:1px 1px 1px 5px;
+        border-style:solid none;
+        border-width:1px;
 }
 
 /* Text */
 h1 {
-        margin:0 0 .5em 0;
 }
 h1, h2, h3, h4, h5, h6 {
@@ -84 +85 @@
 h6 { font-size:95%; font-weight:bold; }
 h2, h3, h4, h5, h6 {
-        display:block;
-        /* give header a background color for easy scanning:*/
-        padding:.25em 10px;
-        margin:1em -10px .35em -10px;
-        height:auto;    
+        margin:1em 0 1em 0;
 }
 h1.patternTemplateTitle {
         font-size:170%;
-        text-align:center;
 }
 h2.patternTemplateTitle {
-        text-align:center;
         margin-top:.5em;
         background:none;
@@ -133 +128 @@
 :link:active,
 :visited:active {
-        text-decoration:underline;
+        text-decoration:none;
 }
 :link:hover,
 :visited:hover {
-        text-decoration:none;
+        text-decoration:underline;
 }
 img {
@@ -149 +144 @@
         margin:0;
         padding:0;
+}
+fieldset {
+        margin:0;
+        padding:0;
+        border:none;
 }
 textarea,
@@ -261 +261 @@
 .foswikiTable th {
         border-width:1px;
+        border-style:solid;
 }
 .foswikiTable {
-        border-style:solid;
         margin:2px 0;
         border-collapse:collapse;
 }
 .foswikiTable td {
-        padding:3px 6px;
-        border-top-style:solid;
-        border-bottom-style:solid;      
+        padding:.2em .5em;
 }
 .foswikiTable th {
-        border-left-style:solid;
-        border-right-style:solid;
-        padding:4px 6px;
+        padding:.4em .5em;
 }
 .foswikiTable .tableSortIcon {
-        margin:0 0 0 5px;
-}
-
-/*
-.foswikiTable th.foswikiFirstCol {
-        border-left-style:none;
-}
-*/
-.foswikiTable a:link,
-.foswikiTable a:visited {
-        text-decoration:underline;
-}
-.foswikiTable a:hover {
-        text-decoration:underline;
+        margin:0 0 0 .25em;
 }
 
@@ -310 +293 @@
 
 /*      -----------------------------------------------------------
-        TWiki styles
+        Foswiki styles
         -----------------------------------------------------------     */
+
+.foswikiPage {
+        font-family:arial, verdana, sans-serif;
+        line-height:1.5em; /*S1*/
+        /* change font size here */
+        font-size:105%;
+}
+.foswikiPage font {
+        line-height:135%;
+}
 
 #foswikiLogin {
@@ -319 +312 @@
 }
 #foswikiLogin .foswikiFormSteps {
-        border-width:5px;
+        border:none;
 }
 #foswikiLogin .patternLoginNotification {
@@ -329 +322 @@
 .foswikiAttachments,
 .foswikiForm {
-        margin:1em 0;
-        padding:1px; /* fixes disappearing borders because of overflow:auto; in foswikiForm */
         height:1%; /* for IE */
 }
@@ -360 +351 @@
         /* form or attachment table inside topic area */
         font-size:94%; /*S2*/
-        padding:1em 20px; /*S5*/ /* top:use less padding for the toggle link; bottom:use less space in case the table is folded in  */
+        padding:1em 10px; /*S5*/ /* top:use less padding for the toggle link; bottom:use less space in case the table is folded in  */
         margin:0;
         border-width:2px 0 0 0;
@@ -367 +358 @@
 .foswikiAttachments .foswikiTable,
 table.foswikiFormTable {
-        margin:10px 0 5px 0;
+        margin:0 0 5px 0;
         border-collapse:collapse;
         padding:0px;
@@ -447 +438 @@
         height:100%; /* for IE */
         line-height:140%;
-        padding:1em 40px;
+        padding:.75em 20px;
         border-width:0 0 1px 0;
         border-style:solid;
@@ -455 +446 @@
 .foswikiFormStep h4 {
         border:none;
-        margin:0 0 .1em 0;
+        margin:5px 0 .5em 0;
         padding:0;
         background:none;
@@ -480 +471 @@
 }
 .foswikiActionFormStepSign {
-        float:left;
-        font-size:100%;
-        margin-left:-20px; /* half of S5 */
-        vertical-align:text-top;
-        line-height:1em;
+        display:none;
 }
 .foswikiToc {
@@ -514 +501 @@
         line-height:1.5em; /*S1*/
 }
-.foswikiNew {}
-.foswikiSummary {
-        font-size:86%; /*S3*/
-}
 .foswikiEmulatedLink {
         text-decoration:underline;
@@ -539 +522 @@
 .foswikiBroadcastMessage,
 .foswikiNotification {
-        padding:1em 20px; /*S5*/
-}
-.foswikiNotification {
-        margin:1em 0;
-        border-style:solid;
-        border-width:2px;
+        padding:1em 10px; /*S5*/
+        margin:.5em 0;
+        border-style:solid;
+        border-width:1px;
 }
 .foswikiBroadcastMessage {
@@ -553 +534 @@
         padding:1em;
         margin:.25em 0 0 0;
-        border-style:solid;
-        border-width:2px;
 }
 .foswikiHelp ul {
-        margin:0;
+        margin-top:0;
+        margin-bottom:0;
+        margin-left:0;
         padding-left:20px;
 }
@@ -589 +570 @@
         white-space:nowrap;
 }
-.foswikiSearchResultCount {
-        font-weight:bold;
+.foswikiIcon img {
+        vertical-align:text-bottom;
+        border:0;
 }
 
@@ -600 +582 @@
 /* for specific layout sub-elements see further down */
 
-.foswikiPage {
-        font-family:arial, verdana, sans-serif;
-        line-height:1.5em; /*S1*/
-        /* change font size here */
-        font-size:105%;
-}
-.foswikiPage font {
-        line-height:135%;
-}
 .patternNoViewPage #patternOuter {
         margin-left:0;
@@ -640 +613 @@
 #patternSideBarContents,
 #patternMainContents {
-        padding-top:2em;
+        padding-top:1em;
 }
 #patternSideBarContents {
@@ -657 +630 @@
 /* bottom paddings */
 #patternMainContents {
-        padding-bottom:4em;
+        padding-bottom:1em;
 }
 #patternBottomBarContents {
@@ -663 +636 @@
 }
 .foswikiTopic {
-        margin:0 0 2em 0;
+        margin:0 0 3em 0;
 }
 .patternNoViewPage #patternMainContents,
@@ -686 +659 @@
         vertical-align:text-bottom;
 }
-#patternSideBarContents a:link,
-#patternSideBarContents a:visited {
-        text-decoration:none;
-}
-/*
-#patternSideBarContents .patternLeftBarPersonal a:link,
-#patternSideBarContents .patternLeftBarPersonal a:visited {
-        text-decoration:underline;
-}
-#patternSideBarContents .patternLeftBarPersonal ul a:link,
-#patternSideBarContents .patternLeftBarPersonal ul a:visited {
-        text-decoration:none;
-}
-#patternSideBarContents .patternLeftBarPersonal ul a:hover {
-        text-decoration:underline;
-}
-*/
 #patternSideBarContents ul {
         padding:0;
@@ -717 +673 @@
         background-color:transparent;
 }
-#patternSideBarContents .patternLeftBarPersonal,
-#patternSideBarContents .patternWebIndicator {
+#patternSideBarContents a:hover {
+   text-decoration:none;
+}
+#patternSideBarContents .patternLeftBarPersonal {
         height:1%; /* for IE */
         width:100%; /* for IE */
@@ -726 +684 @@
         border-width:1px;
 }
-/*
-#patternSideBarContents ul li a:link,
-#patternSideBarContents ul li a:visited {
-        display:block;
-        margin:0 -1em 0 -1em;
-        padding:.2em 1em;
-}
-*/
+.patternWebIndicator {
+        border-style:none none solid none;
+        border-width:3px;
+        padding:0 1em .5em 1em;
+        margin:0 -1em 1em -1em;
+}
 .patternWebIndicator a {
         font-size:1.1em;
@@ -772 +728 @@
 }
 .patternHomePath .foswikiSeparator {
-        padding:0 .5em;
-}
-.patternHomePath a:link,
-.patternHomePath a:visited {
-        text-decoration:none;
-        border-style:none none solid none;
-        border-width:1px;
-}
-
-.patternToolBar {
+        padding:0 .35em;
 }
 .patternToolBar span {
@@ -797 +744 @@
         font-weight:bold;
 }
-.patternToolBar span a:link,
-.patternToolBar span a:visited {
-        text-decoration:none;
-        outline:none;
-}
 .patternToolBar span a:hover,
 .patternToolBar span a:hover {
+        text-decoration:none;
         border-width:1px;
         border-style:solid;
@@ -819 +762 @@
 
 .patternTopicActions {
-        border:none;
+        border-style:solid;
+        border-width:1px;
+        margin-top:-1px;
 }
 .patternTopicAction {
         line-height:1.5em;
-        padding:.4em 20px; /*S5*/
+        padding:.4em 10px; /*S5*/
         border-width:1px 0 0 0;
         border-style:solid;
@@ -834 +779 @@
 .patternAttachPage .patternTopicAction,
 .patternRenamePage .patternTopicAction {
-        padding-left:40px;
+        padding-left:20px;
 }
 .patternActionButtons a:link,
@@ -853 +798 @@
         padding:.1em .2em;
 }
-.patternNoViewPage .patternTopicAction {
-        margin-top:-1px;
-}
 .patternInfo {
-        margin:1.5em 0 0 0;
+        margin:1em 0 0 0;
+}
+.patternHomePath {
+        font-size:94%;
 }
 .patternHomePath .patternRevInfo {
-        font-size:94%;
         white-space:nowrap;
 }
@@ -878 +822 @@
 
 /* WebSearch, WebSearchAdvanced */
+.foswikiWebSearchForm form {
+        width:100%;
+}
+.foswikiWebSearchForm ul {
+        list-style:none;
+        margin-top:0;
+}
+
 #foswikiSearchTable {
+        width:100%;
+        margin:.5em 0;
         background:none;
-        border-bottom:0;
+        border-width:1px;
+        border-style:solid none none none;
 } 
 #foswikiSearchTable th,
 #foswikiSearchTable td {
         padding:1em;
-        border-width:0 0 1px 0;
-        border-style:solid;
+        border-width:1px;
+        border-style:none none solid none;
 } 
 #foswikiSearchTable th {
@@ -896 +851 @@
 }
 
+/*
+.foswikiWebSearchForm form {
+        width:100%;
+}
+.foswikiWebSearchForm div,
+.foswikiWebSearchForm fieldset {
+        padding:1em;
+}
+.foswikiWebSearchForm fieldset {
+        border-width:2px 0 0 0;
+        border-style:solid;
+}
+.foswikiWebSearchForm fieldset label {
+        font-weight:bold;
+        font-size:100%;
+        margin:0;
+        padding:0;
+}
+
+.foswikiWebSearchForm fieldset p {
+        margin:0 0 0 3em;
+        padding:.25em 0;
+}
+.foswikiWebSearchForm fieldset hr {
+        margin:0 3em;
+}
+.foswikiWebSearchForm fieldset p label {
+        font-weight:normal;
+}
+*/
+
 /*      -----------------------------------------------------------
         Search results
@@ -908 +894 @@
         margin:1em 0 1em 5em;
 }
-h3.patternSearchResultsHeader,
-h4.patternSearchResultsHeader {
-        display:block;
-        border-width:0 0 1px 0;
-        border-style:solid;
+h3.foswikiSearchResultsHeader,
+h4.foswikiSearchResultsHeader {
+        border-width:3px;
+        border-style:none none solid none;
         height:1%; /* for IE */
         font-weight:bold;
@@ -919 +904 @@
         font-size:115%; /* same as foswikiFormStep */
         margin:0;
-        padding:.5em 40px; /*S5*/
-        font-weight:bold;
-}
-h4.patternSearchResultsHeader {
+        padding:.5em 20px; /*S5*/
+        font-weight:bold;
+}
+h4.foswikiSearchResultsHeader {
         font-size:100%;
-        padding-top:.3em;
-        padding-bottom:.3em;
+        padding-top:.5em;
+        padding-bottom:.5em;
         font-weight:normal;
 }
-.patternSearchResult .foswikiTopRow {
-        padding-top:.2em;
-        margin-top:.1em;
-}
-.patternSearchResult .foswikiBottomRow {
-        margin-bottom:.1em;
-        padding-bottom:.25em;
-        border-width:0 0 1px 0;
-        border-style:solid;
-}
-.patternSearchResult .foswikiAlert {
-        font-weight:bold;
-}
-.patternSearchResult .foswikiSummary .foswikiAlert {
+.foswikiSearchResultsHeader span {
+        padding:0 .5em 0 0;
+}
+
+.foswikiSearchResultCount {
+        font-weight:bold;
+}
+.foswikiSearchResult {
+        margin:0 0 1em 0;
+}
+.foswikiSearchResult .foswikiTopRow {}
+.foswikiSearchResult .foswikiBottomRow {}
+.foswikiSearchResult .foswikiAlert {
+        font-weight:bold;
+}
+.foswikiSummary,
+.foswikiSearchResult .foswikiBottomRow {
+        font-size:86%; /*S3*/
+}
+.foswikiSearchResult .foswikiSummary .foswikiAlert {
         font-weight:normal;
-}
-.patternSearchResult .foswikiNew {
-        border-width:1px;
-        border-style:solid;
-        font-size:86%; /*S3*/
-        padding:0 1px;
-        font-weight:bold;
 }
 .patternSearchResults .foswikiHelp {
@@ -957 +941 @@
         margin:1em -5px .35em -5px;
 }
-.patternSearchResult .foswikiSRAuthor {
-        width:15%;
-        text-align:left;
-}
-.patternSearchResult .foswikiSRRev {
-        width:30%;
-        text-align:left;
-}
 .patternSearchResultCount {
         margin:1em 0 3em 0;
 }
-.patternSearched {
-        display:block;
-}
+.patternSearched {}
 
 
@@ -1105 +1079 @@
         padding:0 0 0 10px;
 }
-.patternDiff h4.patternSearchResultsHeader {
+.patternDiff h4.foswikiSearchResultsHeader {
         padding:.5em 10px;
 }

trunk/PatternSkin/templates/viewsidebar.pattern.tmpl

@@ -5 +5 @@
 
 
-%TMPL:DEF{"sidebar:webindicator"}%<div class="patternWebIndicator">
-   * <a href='%SCRIPTURL{"view"}%/%BASEWEB%/%HOMETOPIC%'><img src='%ICONURL{"web-bg"}%' style='background-color:%WEBBGCOLOR%' alt='%WEB%'/> <nop>%BASEWEB%</a>
-</div><!--/patternWebIndicator-->%TMPL:END%
+%TMPL:DEF{"sidebar:webindicator"}%<div class="patternWebIndicator" style="border-color:%WEBBGCOLOR%">
+<a href='%SCRIPTURL{"view"}%/%BASEWEB%/%HOMETOPIC%'><nop>%BASEWEB%</a>
+</div>%TMPL:END%
 
 
 %TMPL:DEF{"sidebar:weblink"}%<div class="patternWebIndicator">
-   * [[%BASEWEB%/%HOMETOPIC%][%BASEWEB%]]
-</div><!--/patternWebIndicator-->%TMPL:END%
+[[%BASEWEB%/%HOMETOPIC%][%BASEWEB%]]
+</div>%TMPL:END%
 
 %{ Please note that there must be a new line before the include of the WebLeftBar. Other wise the first bullet will not be displayed as a bullet. See Foswiki task Item410 }%