mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-14 10:54:50 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
@@ -119,11 +119,11 @@ body {
|
||||
/* Headings */
|
||||
h1,h2,h3,h4,h5,h6 { font-weight: normal;}
|
||||
|
||||
h1 { font-size: 1.308em; }
|
||||
h2, h2 span { font-size: 1.154em; }
|
||||
h3 { font-size: 1.077em; }
|
||||
h4 { font-size: 1em; }
|
||||
h5 { font-size: 1em; }
|
||||
h1 { font-size: 1.692em }
|
||||
h2, h2 span { font-size: 1.538em; }
|
||||
h3 { font-size: 1.231em; }
|
||||
h4 { font-size: 1.154em; }
|
||||
h5 { font-size: 1.077em; }
|
||||
h6 { font-size: 1em; }
|
||||
|
||||
h1, h2, h3, h4, h5, legend {
|
||||
@@ -548,21 +548,6 @@ textarea {
|
||||
padding:4px;
|
||||
width:98.662%;
|
||||
}
|
||||
/*button, .button, .button:link, .button:visited {
|
||||
background:#F5F5F5;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb));
|
||||
background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb);
|
||||
border:1px solid #999999;
|
||||
color:#2D2F25;
|
||||
cursor:pointer;
|
||||
padding:0 0.8em 0.1em 0.8em;
|
||||
text-align:center;
|
||||
text-shadow: 0 1px 1px rgba(0,0,0,.2);
|
||||
box-shadow: 0 4px 4px rgba(231,231,231,.2) inset;
|
||||
-webkit-box-shadow: 0 4px 4px rgba(231,231,231,.2) inset;
|
||||
-moz-box-shadow: 0 4px 4px rgba(231,231,231,.2) inset;
|
||||
|
||||
}*/
|
||||
form.link button {
|
||||
background:inherit;
|
||||
border:0;
|
||||
@@ -571,12 +556,15 @@ form.link button {
|
||||
margin:-2px -3px 0;
|
||||
|
||||
}
|
||||
.primaryAction, .primaryAction:link, .primaryAction:visited {
|
||||
button.primaryAction, .button.primaryAction, .button.primaryAction:link, .button.primaryAction:visited {
|
||||
background:#4687ad;
|
||||
border:1px solid #405f71;
|
||||
color:#fff;
|
||||
|
||||
/*CSS3 properties*/
|
||||
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#4687AD', endColorstr='#366581');
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#4687AD), to(#366581));
|
||||
background:-moz-linear-gradient(top , #4687AD, #366581);
|
||||
border:1px solid #405f71;
|
||||
color:#fff;
|
||||
}
|
||||
button.remove, .remove.button, .remove.button:link, .remove.button:visited {
|
||||
background-color:#DECCCA;
|
||||
@@ -584,20 +572,6 @@ button.remove, .remove.button, .remove.button:link, .remove.button:visited {
|
||||
border-color:#d6c9c7;
|
||||
color:#5c3732;
|
||||
}
|
||||
/*button:hover, .button:hover,
|
||||
button:active, .button:active,
|
||||
button:focus, .button:focus {
|
||||
border-color:#bb8b2d;
|
||||
color:#fff;
|
||||
text-decoration:none;
|
||||
background: #ffac40;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#ffac40), to(#f06015));
|
||||
background: -moz-linear-gradient(top, #ffac40, #f9760d);
|
||||
|
||||
}*/
|
||||
button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
|
||||
border-color:#8a8f7a;
|
||||
}
|
||||
button.remove:hover, .remove.button:hover,
|
||||
button.remove:active, .remove.button:active,
|
||||
button.remove:focus, .remove.button:focus {
|
||||
@@ -610,9 +584,7 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
|
||||
}
|
||||
.delete.button {
|
||||
float:right;
|
||||
}s
|
||||
|
||||
|
||||
}
|
||||
input[type="submit"], input[type="reset"], input[type="button"], button, .button, .button:link, .button:visited
|
||||
{
|
||||
font-size: 107.7%; /*14px*/
|
||||
@@ -620,8 +592,8 @@ input[type="submit"], input[type="reset"], input[type="button"], button, .button
|
||||
background:#F5F5F5;
|
||||
border:1px solid #999;
|
||||
cursor:pointer;
|
||||
min-width:80px;
|
||||
padding: 1px;
|
||||
/*min-width:80px;*/
|
||||
padding: 0 12px 2px 12px;
|
||||
text-align:center;
|
||||
|
||||
/*CSS3 properties*/
|
||||
@@ -635,10 +607,7 @@ input[type="submit"], input[type="reset"], input[type="button"], button, .button
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
}
|
||||
|
||||
s
|
||||
input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hover, button:hover, .button:hover, input[type="submit"]:active, input[type="reset"]:active, input[type="button"]:active,
|
||||
button:active, .button:active {
|
||||
input[type="submit"]:hover,input[type="reset"]:hover, input[type="button"]:hover, button:hover, .button:hover, .button.primaryAction:hover {
|
||||
text-decoration:none;
|
||||
background: #ffac40;
|
||||
color:#fff;
|
||||
@@ -649,41 +618,24 @@ button:active, .button:active {
|
||||
background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffac40), to(#f9760d));
|
||||
background: -moz-linear-gradient(top, #ffac40, #f9760d);
|
||||
}
|
||||
|
||||
/*input[type="submit"]:active,
|
||||
input[type="reset"]:active,
|
||||
input[type="button"]:active,
|
||||
button:active {
|
||||
input[type="submit"]:active, input[type="reset"]:active, input[type="button"]:active, button:active {
|
||||
text-decoration:none;
|
||||
background: #62a9e2;
|
||||
color:#fff;
|
||||
border:1px solid #093253;
|
||||
border:1px solid #bb772d;
|
||||
|
||||
/*CSS3 properties
|
||||
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#72b8f2', endColorstr='#3078b3');
|
||||
background: -webkit-gradient(linear, 0 0, 0 100%, from(#72b8f2), to(#3078b3));
|
||||
background: -moz-linear-gradient(top, #72b8f2, #3078b3);
|
||||
box-shadow: inset 0px 0px 1px rgba(0, 0, 0, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
|
||||
-moz-box-shadow: inset 0px 0px 1px rgba(0, 0, 0, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
|
||||
-webkit-box-shadow: inset 0px 0px 1px rgba(0, 0, 0, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
|
||||
}*/
|
||||
|
||||
|
||||
input[type="submit"]:focus::-moz-focus-inner, button:focus::-moz-focus-inner {
|
||||
/*CSS3 properties*/
|
||||
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#fece3b', endColorstr='#fe6001');
|
||||
background: -webkit-gradient(linear, 0 0, 0 100%, from(#fece3b), to(#fe6001));
|
||||
background: -moz-linear-gradient(top, #fece3b, #fe6001);
|
||||
box-shadow: inset 0px 0px 1px rgba(254, 225, 109, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
|
||||
-moz-box-shadow: inset 0px 0px 1px rgba(254, 225, 109, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
|
||||
-webkit-box-shadow: inset 0px 0px 1px rgba(254, 225, 109, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
|
||||
}
|
||||
input[type="submit"]:focus::-moz-focus-inner, button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
|
||||
border: 1px dotted transparent;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.cancel {
|
||||
margin:0 0 0 .93em;
|
||||
}
|
||||
|
Reference in New Issue
Block a user