Skip to content

Commit

Permalink
[css][l]: Pulled in main CSS refactor.
Browse files Browse the repository at this point in the history
  • Loading branch information
teajaymars committed Oct 28, 2011
1 parent d6817ec commit 6faf3b9
Show file tree
Hide file tree
Showing 16 changed files with 641 additions and 802 deletions.
28 changes: 18 additions & 10 deletions ckan/public/css/blueprint/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,23 @@ input.title {font-size:1.5em;}
textarea {width:390px;height:250px;padding:5px;}
form.inline {line-height:3;}
form.inline p {margin-bottom:0;}
.error, .alert, .notice, .success, .info {padding:0.8em;margin-bottom:1em;border:2px solid #ddd;}
.error, .alert {background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4;}
.notice {background:#fff6bf;color:#514721;border-color:#ffd324;}
.success {background:#e6efc2;color:#264409;border-color:#c6d880;}
.info {background:#d5edf8;color:#205791;border-color:#92cae4;}
.error a, .alert a {color:#8a1f11;}
.notice a {color:#514721;}
.success a {color:#264409;}
.info a {color:#205791;}
.flash-messages .error,
.flash-messages .alert,
.flash-messages .notice,
.flash-messages .success,
.flash-messages .info {
padding:0.8em;margin-bottom:1em;border:2px solid #ddd;
}
.flash-messages .error,
.flash-messages .alert {background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4;}
.flash-messages .notice {background:#fff6bf;color:#514721;border-color:#ffd324;}
.flash-messages .success {background:#e6efc2;color:#264409;border-color:#c6d880;}
.flash-messages .info {background:#d5edf8;color:#205791;border-color:#92cae4;}
.flash-messages .error a,
.flash-messages .alert a {color:#8a1f11; text-decoration: underline;}
.flash-messages .notice a {color:#514721; text-decoration: underline;}
.flash-messages .success a {color:#264409; text-decoration: underline;}
.flash-messages .info a {color:#205791; text-decoration: underline;}

/* grid.css */
.container {width:950px;margin:0 auto;}
Expand Down Expand Up @@ -262,4 +270,4 @@ hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margi
hr.space {background:#fff;color:#fff;visibility:hidden;}
.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
.clearfix, .container {display:block;}
.clear {clear:both;}
.clear {clear:both;}
111 changes: 111 additions & 0 deletions ckan/public/css/pretty_buttons.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
/* ================================== */
/* = Twitter.Bootstrap Form Buttons = */
/* ================================== */
.pretty-button {
cursor: pointer;
display: inline-block;
background-color: #e6e6e6;
background-repeat: no-repeat;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));
background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
padding: 4px 14px;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
color: #333;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal;
font-size: 13px;
line-height: 18px;
border: 1px solid #ccc;
border-bottom-color: #bbb;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-webkit-transition: 0.1s linear all;
-moz-transition: 0.1s linear all;
transition: 0.1s linear all;
}
.pretty-button.depressed,
.pretty-button:hover {
background-position: 0 -15px;
color: #333;
text-decoration: none;
}
.pretty-button.primary, .pretty-button.danger {
color: #fff;
}
.pretty-button.primary:hover, .pretty-button.danger:hover {
color: #fff;
}
.pretty-button.primary {
background-color: #0064cd;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
background-image: -moz-linear-gradient(#049cdb, #0064cd);
background-image: -ms-linear-gradient(#049cdb, #0064cd);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
background-image: -webkit-linear-gradient(#049cdb, #0064cd);
background-image: -o-linear-gradient(#049cdb, #0064cd);
background-image: linear-gradient(#049cdb, #0064cd);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
border-color: #0064cd #0064cd #003f81;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.pretty-button.danger {
background-color: #9d261d;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d));
background-image: -moz-linear-gradient(#d83a2e, #9d261d);
background-image: -ms-linear-gradient(#d83a2e, #9d261d);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d));
background-image: -webkit-linear-gradient(#d83a2e, #9d261d);
background-image: -o-linear-gradient(#d83a2e, #9d261d);
background-image: linear-gradient(#d83a2e, #9d261d);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
border-color: #9d261d #9d261d #5c1611;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.pretty-button.large {
font-size: 16px;
line-height: 28px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
}
.pretty-button.small-button {
padding-right: 9px;
padding-left: 9px;
font-size: 11px;
}
.pretty-button.disabled {
background-image: none;
filter: alpha(opacity=65);
-khtml-opacity: 0.65;
-moz-opacity: 0.65;
opacity: 0.65;
cursor: default;
}
.pretty-button:disabled {
background-image: none;
filter: alpha(opacity=65);
-khtml-opacity: 0.65;
-moz-opacity: 0.65;
opacity: 0.65;
cursor: default;
}
.pretty-button.depressed,
.pretty-button:active {
-webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
}
button.pretty-button::-moz-focus-inner, input.pretty-button::-moz-focus-inner {
padding: 0;
border: 0;
}
Loading

0 comments on commit 6faf3b9

Please sign in to comment.