Skip to content

Commit

Permalink
Item12192: background need to be removed in jqButton reset; tab conte…
Browse files Browse the repository at this point in the history 
…nt padding

git-svn-id: http://svn.foswiki.org/trunk@15788 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Oct 30, 2012
1 parent aee8f84 commit b4cf889
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 44 deletions.
2 changes: 1 addition & 1 deletion PatternSkin/data/System/PatternSkinElements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ Regular text lorem ipsum dolor sit amet, <a href='#' title='test link'>test link
<div class='foswikiFormStep'>
---++ What to expect
<p>Some explanation</p>
<input type='text' value='Some entry' />
<input type='text' class='foswikiInputField' value='Some entry' />
<hr />
<input type='submit' class='foswikiSubmit' value='Send it' />
</div>
Expand Down
81 changes: 41 additions & 40 deletions PatternSkin/pub/System/PatternSkinTheme/jquery-ui.uncompressed.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1845,6 +1845,7 @@ label.ui-button.ui-state-active,
height: auto;
float: none;
margin: 0 6px 0 0;
background-image: none;
}
.jqButton span {
background: none;
Expand Down Expand Up @@ -1907,21 +1908,21 @@ a.jqButton:link,
a.jqButton:visited {
color: #555555;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #fbfbfb, #ebebeb);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbfbfb), to(#ebebeb));
background-image: -webkit-linear-gradient(top, #fbfbfb, #ebebeb);
background-image: -o-linear-gradient(top, #fbfbfb, #ebebeb);
background-image: linear-gradient(to bottom, #fbfbfb, #ebebeb);
background-color: #f1f1f1;
background-image: -moz-linear-gradient(top, #f6f6f6, #e9e9e9);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f6f6f6), to(#e9e9e9));
background-image: -webkit-linear-gradient(top, #f6f6f6, #e9e9e9);
background-image: -o-linear-gradient(top, #f6f6f6, #e9e9e9);
background-image: linear-gradient(to bottom, #f6f6f6, #e9e9e9);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbfbfb', endColorstr='#ffebebeb', GradientType=0);
border-color: #ebebeb #ebebeb #c5c5c5;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff6f6f6', endColorstr='#ffe9e9e9', GradientType=0);
border-color: #e9e9e9 #e9e9e9 #c3c3c3;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #ebebeb;
*background-color: #e9e9e9;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #dcdcdc;
border: 1px solid #dadada;
}
.jqButton .foswikiIcon,
a.jqButton .foswikiIcon,
Expand All @@ -1947,21 +1948,21 @@ a.jqButton.foswikiActive,
a.jqButton > .foswikiRequiresChangePermission a:hover {
color: #4b4b4b;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #eaeaea;
background-image: -moz-linear-gradient(top, #f1f1f1, #e1e1e1);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f1f1), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #f1f1f1, #e1e1e1);
background-image: -o-linear-gradient(top, #f1f1f1, #e1e1e1);
background-image: linear-gradient(to bottom, #f1f1f1, #e1e1e1);
background-color: #e6e6e6;
background-image: -moz-linear-gradient(top, #ebebeb, #dfdfdf);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ebebeb), to(#dfdfdf));
background-image: -webkit-linear-gradient(top, #ebebeb, #dfdfdf);
background-image: -o-linear-gradient(top, #ebebeb, #dfdfdf);
background-image: linear-gradient(to bottom, #ebebeb, #dfdfdf);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff1f1f1', endColorstr='#ffe1e1e1', GradientType=0);
border-color: #e1e1e1 #e1e1e1 #bbbbbb;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#ffdfdfdf', GradientType=0);
border-color: #dfdfdf #dfdfdf #b8b8b8;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #e1e1e1;
*background-color: #dfdfdf;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #d2d2d2;
border: 1px solid #cfcfcf;
text-decoration: none;
}
.jqButton:hover .foswikiIcon,
Expand Down Expand Up @@ -2037,14 +2038,14 @@ a.jqButton.foswikiButtonCancel:visited,
.jqButton.foswikiButtonCancel:visited {
color: #ffffff;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
background-color: #e24e4e;
background-image: -moz-linear-gradient(top, #e35858, #df3e3e);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e35858), to(#df3e3e));
background-image: -webkit-linear-gradient(top, #e35858, #df3e3e);
background-image: -o-linear-gradient(top, #e35858, #df3e3e);
background-image: linear-gradient(to bottom, #e35858, #df3e3e);
background-color: #e14b4b;
background-image: -moz-linear-gradient(top, #e35454, #df3e3e);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e35454), to(#df3e3e));
background-image: -webkit-linear-gradient(top, #e35454, #df3e3e);
background-image: -o-linear-gradient(top, #e35454, #df3e3e);
background-image: linear-gradient(to bottom, #e35454, #df3e3e);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe35858', endColorstr='#ffdf3e3e', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe35454', endColorstr='#ffdf3e3e', GradientType=0);
border-color: #df3e3e #df3e3e #b31e1e;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #df3e3e;
Expand Down Expand Up @@ -2075,14 +2076,14 @@ a.jqButton.foswikiButtonCancel:active,
.jqButton.foswikiButtonCancel:active {
color: #ffffff;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
background-color: #df3c3c;
background-image: -moz-linear-gradient(top, #e04747, #dc2d2d);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e04747), to(#dc2d2d));
background-image: -webkit-linear-gradient(top, #e04747, #dc2d2d);
background-image: -o-linear-gradient(top, #e04747, #dc2d2d);
background-image: linear-gradient(to bottom, #e04747, #dc2d2d);
background-color: #de3a3a;
background-image: -moz-linear-gradient(top, #e04242, #dc2d2d);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e04242), to(#dc2d2d));
background-image: -webkit-linear-gradient(top, #e04242, #dc2d2d);
background-image: -o-linear-gradient(top, #e04242, #dc2d2d);
background-image: linear-gradient(to bottom, #e04242, #dc2d2d);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe04747', endColorstr='#ffdc2d2d', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe04242', endColorstr='#ffdc2d2d', GradientType=0);
border-color: #dc2d2d #dc2d2d #a11b1b;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #dc2d2d;
Expand Down Expand Up @@ -2146,7 +2147,7 @@ a.jqButton.jqButtonRed:visited {
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #ebcccc;
border: 1px solid #e9caca;
}
a.jqButton.jqButtonRed .foswikiIcon,
a.jqButton.jqButtonRed:link .foswikiIcon,
Expand Down Expand Up @@ -2176,7 +2177,7 @@ a.jqButton.jqButtonRed:active {
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #e5bdbd;
border: 1px solid #e3bcbc;
text-decoration: none;
}
a.jqButton.jqButtonRed:hover .foswikiIcon,
Expand Down Expand Up @@ -2206,7 +2207,7 @@ a.jqButton.jqButtonCyan:visited {
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #b1e4e3;
border: 1px solid #b0e2e2;
}
a.jqButton.jqButtonCyan .foswikiIcon,
a.jqButton.jqButtonCyan:link .foswikiIcon,
Expand Down Expand Up @@ -2236,7 +2237,7 @@ a.jqButton.jqButtonCyan:active {
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #a2dede;
border: 1px solid #a1dddc;
text-decoration: none;
}
a.jqButton.jqButtonCyan:hover .foswikiIcon,
Expand Down Expand Up @@ -2266,7 +2267,7 @@ a.jqButton.jqButtonGreen:visited {
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #c7e4b1;
border: 1px solid #c5e2b0;
}
a.jqButton.jqButtonGreen .foswikiIcon,
a.jqButton.jqButtonGreen:link .foswikiIcon,
Expand Down Expand Up @@ -2296,7 +2297,7 @@ a.jqButton.jqButtonGreen:active {
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #bcdea2;
border: 1px solid #badda1;
text-decoration: none;
}
a.jqButton.jqButtonGreen:hover .foswikiIcon,
Expand Down
10 changes: 7 additions & 3 deletions PatternSkin/pub/System/PatternSkinTheme/style_src.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ label input {
vertical-align:text-bottom;
}
.foswikiTextarea {
padding: 0;
width: 100%;
}
.foswikiCheckbox {
Expand Down Expand Up @@ -431,6 +432,10 @@ h3 .foswikiSmall {
margin:1em 0;
border-style:none;
}
.foswikiTabContent {
padding:1em 10px;
margin:0 0 1em 0;
}
.patternTop .foswikiHelp {
margin:0 0 1em 0;
}
Expand Down Expand Up @@ -572,9 +577,6 @@ a:hover .foswikiAccessKey {
border:none;
background-color:transparent;
}
#patternSideBarContents a:hover {
text-decoration:none;
}
#patternSideBarContents .patternLeftBarPersonal {
padding:0 1em .75em 1em;
margin:0 -1em .75em -1em; /*S6*/
Expand Down Expand Up @@ -1665,3 +1667,5 @@ td h6:first-child {
.patternToolBar > .foswikiRequiresChangePermission > a:visited .foswikiAccessKey {
border: none;
}


0 comments on commit b4cf889

Please sign in to comment.