framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adding in the latest changes from h5bp and blueprint css

Browse Source
This commit is contained in:
Ben Word
2011-04-28 21:26:58 -06:00
parent 7cc92802a7
commit 07dc7b7d81
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
css/blueprint/screen.css
View File

@@ -13,8 +13,8 @@
/* reset.css */ /* reset.css */
html {margin:0;padding:0;border:0;} html {margin:0;padding:0;border:0;}
body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;} body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;}
article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;} article, aside, details, figcaption, figure, dialog, footer, header, hgroup, menu, nav, section {display:block;}
body {line-height:1.5;background:white;} body {line-height:1.5;background:white;}
table {border-collapse:separate;border-spacing:0;} table {border-collapse:separate;border-spacing:0;}
caption, th, td {text-align:left;font-weight:normal;float:none !important;} caption, th, td {text-align:left;font-weight:normal;float:none !important;}
@@ -84,7 +84,7 @@ fieldset {padding:0 1.4em 1.4em 1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
legend {font-weight:bold;font-size:1.2em;margin-top:-0.2em;margin-bottom:1em;} legend {font-weight:bold;font-size:1.2em;margin-top:-0.2em;margin-bottom:1em;}
fieldset, #IE8#HACK {padding-top:1.4em;} fieldset, #IE8#HACK {padding-top:1.4em;}
legend, #IE8#HACK {margin-top:0;margin-bottom:0;} legend, #IE8#HACK {margin-top:0;margin-bottom:0;}
input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;} input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;color:#000;}
input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus {border-color:#666;} input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus {border-color:#666;}
select {background-color:#fff;border-width:1px;border-style:solid;} select {background-color:#fff;border-width:1px;border-style:solid;}
input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;} input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
@@ -257,7 +257,7 @@ input.span-24, textarea.span-24 {width:938px;}
div.prepend-top, .prepend-top {margin-top:1.5em;} div.prepend-top, .prepend-top {margin-top:1.5em;}
div.append-bottom, .append-bottom {margin-bottom:1.5em;} div.append-bottom, .append-bottom {margin-bottom:1.5em;}
.box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;} .box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;}
hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 1.45em;border:none;} hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 17px;border:none;}
hr.space {background:#fff;color:#fff;visibility:hidden;} 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:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
.clearfix, .container {display:block;} .clearfix, .container {display:block;}

4
css/style.css
View File

@@ -59,8 +59,9 @@ a:link { -webkit-tap-highlight-color: #3399FF; }
/* Forms */ /* Forms */
button, input, select, textarea { width: auto; overflow: visible; margin: 0; font-family: sans-serif; font-size: 1em; } button, input, select, textarea { width: auto; overflow: visible; margin: 0; font-family: sans-serif; font-size: 1em; }
label, input[type=button], input[type=submit], button { cursor: pointer; } label, input[type=button], input[type=submit], input[type=image], button { cursor: pointer; }
textarea { overflow: auto; } textarea { overflow: auto; }
input::-moz-focus-inner, button::-moz-focus-inner { border: 0; padding: 0; }
/* Grid */ /* Grid */
#wrap { } #wrap { }
@@ -432,6 +433,7 @@ img.ui-datepicker-trigger { vertical-align: middle; }
pre, blockquote { border: 1px solid #999; page-break-inside: avoid; } pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
thead { display: table-header-group; } thead { display: table-header-group; }
tr, img { page-break-inside: avoid; } tr, img { page-break-inside: avoid; }
img { max-width: 100% !important; }
@page { margin: 0.5cm; } @page { margin: 0.5cm; }
p, h2, h3 { orphans: 3; widows: 3; } p, h2, h3 { orphans: 3; widows: 3; }
h2, h3 { page-break-after: avoid; } h2, h3 { page-break-after: avoid; }

1
includes/roots-htaccess.php
View File

@@ -108,6 +108,7 @@ function roots_add_htaccess($rules) {
$rules .= "\nAddType application/x-chrome-extension crx"; $rules .= "\nAddType application/x-chrome-extension crx";
$rules .= "\nAddType application/x-xpinstall xpi"; $rules .= "\nAddType application/x-xpinstall xpi";
$rules .= "\nAddType application/octet-stream safariextz"; $rules .= "\nAddType application/octet-stream safariextz";
$rules .= "\nAddType text/x-vcard vcf";
$rules .= "\n"; $rules .= "\n";
$rules .= "\n"; $rules .= "\n";
$rules .= "\n"; $rules .= "\n";