Skip to content

Commit

Permalink
Item13707: fixing non-default themes
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelDaum
MichaelDaum committed Sep 24, 2015
1 parent 3479a97 commit a2c2200
Show file tree
Hide file tree
Showing 13 changed files with 90 additions and 109 deletions.
15 changes: 15 additions & 0 deletions PatternSkin/.gitignore
View file
Expand Up @@ -46,3 +46,18 @@
/pub/System/PatternSkinThemeFatWilly/column_right.css
/pub/System/PatternSkinThemeFatWilly/layout.css
/pub/System/PatternSkinThemeFatWilly/style.css
/pub/System/JavascriptFiles/foswikiArray.js
/pub/System/JavascriptFiles/foswikiCSS.js
/pub/System/JavascriptFiles/foswikiDate.js
/pub/System/JavascriptFiles/foswikiEvent.js
/pub/System/JavascriptFiles/foswikiForm.js
/pub/System/JavascriptFiles/foswikiHTML.js
/pub/System/JavascriptFiles/foswikiPref.js
/pub/System/JavascriptFiles/foswikiString.js
/pub/System/JavascriptFiles/foswikiStringUnicodeChars.js
/pub/System/JavascriptFiles/foswikiStyles.js
/pub/System/JavascriptFiles/foswikiWebTopicCreator.js
/pub/System/JavascriptFiles/foswikiWindow.js
/pub/System/JavascriptFiles/foswiki_edit.js
/pub/System/JavascriptFiles/foswiki_renamebase.js
/pub/System/JavascriptFiles/foswikilib.js
70 changes: 35 additions & 35 deletions PatternSkin/data/System/PatternSkinThemeFatWilly.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1443080939" format="1.1" version="1"}%
%META:TOPICPARENT{name="PatternSkin"}%
---+!! <nop>PatternSkin theme: Foswiki "Fat Willy" Site Skin

Expand All @@ -10,7 +10,7 @@
* Local COLUMNS_RELATIVE = %URLPARAM{"column" default="%SYSTEMWEB%/PatternSkinTheme/column_left.css"}%
* Local PATTERNSKIN_COLUMNS = %PUBURLPATH%/%COLUMNS_RELATIVE%
* Local PATTERNSKIN_THEME_VARIANT_RELATIVE = %URLPARAM{"variant" default="%SYSTEMWEB%/PatternSkinTheme/variant_foswiki_noframe.css"}%
* Local PATTERNSKIN_THEME_VARIANT = %PUBURLPATH%/%PATTERNSKIN_THEME_VARIANT_RELATIVE%
* Local PATTERNSKIN_THEME_VARIANT = %IF{"$'PATTERNSKIN_THEME_VARIANT_RELATIVE'" then="'%PUBURLPATH%/%PATTERNSKIN_THEME_VARIANT_RELATIVE%"}%
* Local PATTERNSKIN_NAVIGATION_TOPIC = %URLPARAM{"navigation" default=""}%

* Local DISPLAY_FOSWIKI_LAYOUT_URL = %CALC{"$SUBSTITUTE(%FOSWIKI_LAYOUT_URL%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
Expand Down Expand Up @@ -76,36 +76,36 @@ Top bar:
%ENDSECTION{"storesettings"}%
</verbatim>

%META:FILEATTACHMENT{name="column_none.css.gz" attr="h" comment="" date="1437500521" size="83" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header.gif" attr="h" comment="" date="1437500521" size="2270" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none_src.css" attr="h" comment="" date="1437500521" size="118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors.css" attr="h" comment="" date="1437500521" size="14055" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bg_buttoncancel_gradient.gif" attr="h" comment="" date="1437500521" size="1106" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors.css.gz" attr="h" comment="" date="1437500521" size="2870" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sidebar_header_background.psd" attr="h" comment="" date="1437500521" size="33830" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menu_background.psd" attr="h" comment="" date="1437500521" size="35632" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bg_submit_gradient.gif" attr="h" comment="" date="1437500521" size="1533" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout_src.css" attr="h" comment="" date="1437500521" size="1416" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="button_arrow.gif" attr="h" comment="" date="1437500521" size="1297" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="GrayBlend.psd" attr="h" comment="" date="1437500521" size="70350" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bg_button_gradient.gif" attr="h" comment="" date="1437500521" size="1490" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right.css.gz" attr="h" comment="" date="1437500521" size="152" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="button_font_selector.gif" attr="h" comment="" date="1437500521" size="831" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bullet-toc.gif" attr="h" comment="" date="1437500521" size="54" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="GrayBlend.gif" attr="h" comment="" date="1437500521" size="1097" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sidebar_header_background.gif" attr="h" comment="" date="1437500521" size="352" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right.css" attr="h" comment="" date="1437500521" size="198" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="topicactions_background.gif" attr="h" comment="" date="1437500521" size="624" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki-logo-on-header.psd" attr="h" comment="" date="1437500521" size="97390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="popup.gif" attr="h" comment="" date="1437500521" size="63" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none.css" attr="h" comment="" date="1437500521" size="75" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout.css.gz" attr="h" comment="" date="1437500521" size="261" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout.css" attr="h" comment="" date="1437500521" size="517" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors_src.css" attr="h" comment="" date="1437500521" size="15770" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style.css.gz" attr="h" comment="" date="1437500521" size="3678" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="topicactions_background.psd" attr="h" comment="" date="1437500521" size="34832" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header-left.gif" attr="h" comment="" date="1437500521" size="11555" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menu_background.gif" attr="h" comment="" date="1437500521" size="408" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style_src.css" attr="h" comment="" date="1437500521" size="20725" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style.css" attr="h" comment="" date="1437500521" size="16989" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_src.css" attr="h" comment="" date="1437500521" size="278" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none.css.gz" attr="h" comment="" date="1443080939" size="83" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header.gif" attr="h" comment="" date="1443080939" size="2270" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none_src.css" attr="h" comment="" date="1443080939" size="118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors.css" attr="h" comment="" date="1443080939" size="14055" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bg_buttoncancel_gradient.gif" attr="h" comment="" date="1443080939" size="1106" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors.css.gz" attr="h" comment="" date="1443080939" size="2870" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sidebar_header_background.psd" attr="h" comment="" date="1443080939" size="33830" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menu_background.psd" attr="h" comment="" date="1443080939" size="35632" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bg_submit_gradient.gif" attr="h" comment="" date="1443080939" size="1533" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout_src.css" attr="h" comment="" date="1443080939" size="1416" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="button_arrow.gif" attr="h" comment="" date="1443080939" size="1297" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="GrayBlend.psd" attr="h" comment="" date="1443080939" size="70350" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bg_button_gradient.gif" attr="h" comment="" date="1443080939" size="1490" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right.css.gz" attr="h" comment="" date="1443080939" size="152" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="button_font_selector.gif" attr="h" comment="" date="1443080939" size="831" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bullet-toc.gif" attr="h" comment="" date="1443080939" size="54" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="GrayBlend.gif" attr="h" comment="" date="1443080939" size="1097" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sidebar_header_background.gif" attr="h" comment="" date="1443080939" size="352" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right.css" attr="h" comment="" date="1443080939" size="198" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="topicactions_background.gif" attr="h" comment="" date="1443080939" size="624" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki-logo-on-header.psd" attr="h" comment="" date="1443080939" size="97390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="popup.gif" attr="h" comment="" date="1443080939" size="63" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none.css" attr="h" comment="" date="1443080939" size="75" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout.css.gz" attr="h" comment="" date="1443080939" size="261" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout.css" attr="h" comment="" date="1443080939" size="517" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors_src.css" attr="h" comment="" date="1443080939" size="15770" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style.css.gz" attr="h" comment="" date="1443080939" size="3678" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="topicactions_background.psd" attr="h" comment="" date="1443080939" size="34832" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header-left.gif" attr="h" comment="" date="1443080939" size="11555" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menu_background.gif" attr="h" comment="" date="1443080939" size="408" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style_src.css" attr="h" comment="" date="1443080939" size="20725" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style.css" attr="h" comment="" date="1443080939" size="16989" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_src.css" attr="h" comment="" date="1443080939" size="278" user="ProjectContributor" version="1"}%
26 changes: 12 additions & 14 deletions PatternSkin/pub/System/PatternSkinTheme115/layout_src.css
View file
Expand Up @@ -20,14 +20,17 @@ as this will break the design ***/
body {

}
.clear {
clear:both;
/*** these next attributes are designed to keep the div
height to 0 pixels high, critical for Safari and Netscape 7 ***/
height:0px;
overflow:hidden;
line-height:1%;
font-size:0px;
/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
.clear:after,
.clearfix:after {
clear: both;
content: ' ';
display: block;
font-size: 0;
line-height: 0;
visibility: hidden;
width: 0;
height: 0;
}
#patternPage {
position:relative;
Expand All @@ -54,15 +57,10 @@ body {
float:right;
display:inline;
}
#patternTopBar {
position:absolute;
top:0px;
width:100%;
}
#patternBottomBar {
clear:both;
width:100%;
}
.foswikiContentFooter {
clear:both;
}
}
5 changes: 1 addition & 4 deletions PatternSkin/pub/System/PatternSkinTheme115/variant_foswiki_frame_src.css
View file
Expand Up @@ -15,13 +15,10 @@ Overrides global settings in layout.css, style.css and colors.css

/* top bar */
#patternTopBar,
#patternClearHeaderCenter,
#patternClearHeaderLeft,
#patternClearHeaderRight,
#patternTopBarContents {
height:75px; /* top bar height; make room for header columns */
overflow:hidden;
}
#patternTopBarContents {
padding-top:12px;
}
}
5 changes: 1 addition & 4 deletions PatternSkin/pub/System/PatternSkinTheme115/variant_foswiki_noframe_src.css
View file
Expand Up @@ -13,13 +13,10 @@ Overrides global settings in layout.css, style.css and colors.css

/* top bar */
#patternTopBar,
#patternClearHeaderCenter,
#patternClearHeaderLeft,
#patternClearHeaderRight,
#patternTopBarContents {
height:75px; /* top bar height; make room for header columns */
overflow:hidden;
}
#patternTopBarContents {
padding-top:12px;
}
}
26 changes: 12 additions & 14 deletions PatternSkin/pub/System/PatternSkinTheme2009/layout_src.css
View file
Expand Up @@ -20,14 +20,17 @@ as this will break the design ***/
body {

}
.clear {
clear:both;
/*** these next attributes are designed to keep the div
height to 0 pixels high, critical for Safari and Netscape 7 ***/
height:0px;
overflow:hidden;
line-height:1%;
font-size:0px;
/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
.clear:after,
.clearfix:after {
clear: both;
content: ' ';
display: block;
font-size: 0;
line-height: 0;
visibility: hidden;
width: 0;
height: 0;
}
#patternPage {
position:relative;
Expand All @@ -54,15 +57,10 @@ body {
float:right;
display:inline;
}
#patternTopBar {
position:absolute;
top:0px;
width:100%;
}
#patternBottomBar {
clear:both;
width:100%;
}
.foswikiContentFooter {
clear:both;
}
}
3 changes: 0 additions & 3 deletions PatternSkin/pub/System/PatternSkinTheme2009/variant_foswiki_noframe_src.css
View file
Expand Up @@ -18,9 +18,6 @@ Overrides global settings in layout.css, style.css and colors.css
background-color:#e8f3f7;
}
#patternTopBar,
#patternClearHeaderCenter,
#patternClearHeaderLeft,
#patternClearHeaderRight,
#patternTopBarContents {
height:90px; /* top bar height; make room for header columns */
overflow:hidden;
Expand Down
3 changes: 0 additions & 3 deletions PatternSkin/pub/System/PatternSkinTheme2009/variant_foswiki_src.css
View file
Expand Up @@ -20,9 +20,6 @@ Overrides global settings in layout.css, style.css and colors.css
background-color:#e8f3f7;
}
#patternTopBar,
#patternClearHeaderCenter,
#patternClearHeaderLeft,
#patternClearHeaderRight,
#patternTopBarContents {
height:90px; /* top bar height; make room for header columns */
overflow:hidden;
Expand Down
3 changes: 0 additions & 3 deletions PatternSkin/pub/System/PatternSkinTheme2009/variant_twiki_src.css
View file
Expand Up @@ -36,9 +36,6 @@ Overrides global settings in layout.css, style.css and colors.css
background-color:#fff;
}
#patternTopBar,
#patternClearHeaderCenter,
#patternClearHeaderLeft,
#patternClearHeaderRight,
#patternTopBarContents {
height:64px;
overflow:hidden;
Expand Down
9 changes: 1 addition & 8 deletions PatternSkin/pub/System/PatternSkinThemeFatWilly/colors_src.css
View file
Expand Up @@ -267,6 +267,7 @@ select {
border-color:#adcaed;
}

#patternSideBar,
#patternWrapper {
background:#fff;
}
Expand Down Expand Up @@ -832,9 +833,6 @@ tr.foswikiDiffDebug .foswikiDiffDeletedText {
#patternTopBarButtons {
background:#2a549d url(header-left.gif) no-repeat scroll 0 100%;
}
#patternClearHeaderLeft {
background-color:#2A549D;
}
#patternTopBarButtons li a {
background:#8bb6e5 url(menu_background.gif) repeat-x scroll 0 0;
color:#00346b;
Expand All @@ -847,11 +845,6 @@ tr.foswikiDiffDebug .foswikiDiffDeletedText {
}

/* sidebar */
#patternSideBar {
background-image:url(header.gif);
background-repeat:repeat-x;
background-position:0 0;
}
#patternSideBarContents .patternWebIndicator,
#patternSideBarContents h2,
#patternSideBarContents h2 a:link,
Expand Down
26 changes: 12 additions & 14 deletions PatternSkin/pub/System/PatternSkinThemeFatWilly/layout_src.css
View file
Expand Up @@ -20,14 +20,17 @@ as this will break the design ***/
body {

}
.clear {
clear:both;
/*** these next attributes are designed to keep the div
height to 0 pixels high, critical for Safari and Netscape 7 ***/
height:0px;
overflow:hidden;
line-height:1%;
font-size:0px;
/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
.clear:after,
.clearfix:after {
clear: both;
content: ' ';
display: block;
font-size: 0;
line-height: 0;
visibility: hidden;
width: 0;
height: 0;
}
#patternPage {
position:relative;
Expand All @@ -54,15 +57,10 @@ body {
float:right;
display:inline;
}
#patternTopBar {
position:absolute;
top:0px;
width:100%;
}
#patternBottomBar {
clear:both;
width:100%;
}
.foswikiContentFooter {
clear:both;
}
}
6 changes: 0 additions & 6 deletions PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css
View file
Expand Up @@ -482,18 +482,12 @@ th {


#patternTopBar,
#patternClearHeaderCenter,
#patternClearHeaderLeft,
#patternClearHeaderRight,
#patternTopBarContents,
#patternTopBarContentsWrapper {
height:96px; /* top bar height; make room for header columns */
overflow:hidden;
}

#patternClearHeaderLeft {
height:127px; /* 96 + 31 (height patternTopBarButtons) */
}
#patternMain {
float:left;
overflow:hidden;
Expand Down
2 changes: 1 addition & 1 deletion PatternSkin/templates/changeform.pattern.tmpl
View file
Expand Up @@ -14,4 +14,4 @@
%FORMLIST%
</div>
%TMPL:P{"topicactionbuttonsrow"}%
</div>%TEXT% %EDITACTION% %TMPL:P{"hiddenformfields"}%%TMPL:P{"formend"}%%TMPL:END%
</div>%TEXT% %EDITACTION% %TMPL:P{"hiddenformfields"}%%TMPL:P{"formend"}%%TMPL:END%

0 comments on commit a2c2200

Please sign in to comment.