From 4e95e558db14a2de80c6cdfd5712c15c8130a951 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 28 Jun 2011 15:11:41 -0700 Subject: [PATCH] reseting baseline to 18px, fixing wells, moving pre styles for chili to docs --- bootstrap-1.0.0.css | 215 +++++++++++++-------------------------- bootstrap-1.0.0.min.css | 85 +++++++--------- docs/assets/css/docs.css | 43 +++++++- docs/index.html | 8 +- lib/forms.less | 7 +- lib/patterns.less | 31 +++--- lib/preboot.less | 3 +- lib/scaffolding.less | 2 +- lib/tables.less | 3 +- lib/type.less | 73 +------------ 10 files changed, 178 insertions(+), 292 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 6ac88c3bbc..721698cb16 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -291,9 +291,9 @@ html, body { body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; + font-size: 13px; font-weight: normal; - line-height: 20px; + line-height: 18px; color: #808080; text-rendering: optimizeLegibility; } @@ -343,7 +343,7 @@ a:hover { text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); color: #333333; font-size: 13px; - line-height: 20px; + line-height: 18px; border: 1px solid rgba(0, 0, 0, 0.1); border-bottom-color: rgba(0, 0, 0, 0.25); -webkit-border-radius: 4px; @@ -417,10 +417,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { /* Body text -------------------------------------------------- */ p { - font-size: 14px; + font-size: 13px; font-weight: normal; - line-height: 20px; - margin-bottom: 20px; + line-height: 18px; + margin-bottom: 18px; } p small { font-size: 12px; @@ -446,16 +446,16 @@ h6 small { color: #b3b3b3; } h1 { - margin-bottom: 20px; + margin-bottom: 18px; font-size: 30px; - line-height: 40px; + line-height: 36px; } h1 small { font-size: 18px; } h2 { font-size: 24px; - line-height: 40px; + line-height: 36px; } h2 small { font-size: 14px; @@ -464,7 +464,7 @@ h3, h4, h5, h6 { - line-height: 40px; + line-height: 36px; } h3 { font-size: 18px; @@ -489,7 +489,7 @@ h6 { /* Colors -------------------------------------------------- */ ul, ol { - margin: 0 0 20px 25px; + margin: 0 0 18px 25px; } ul ul, ul ol, @@ -504,7 +504,7 @@ ol { list-style: decimal; } li { - line-height: 20px; + line-height: 18px; color: #808080; } ul.unstyled { @@ -512,52 +512,19 @@ ul.unstyled { margin-left: 0; } dl { - margin-bottom: 20px; + margin-bottom: 18px; } dl dt, dl dd { - line-height: 20px; + line-height: 18px; } dl dt { font-weight: bold; } dl dd { - margin-left: 10px; + margin-left: 9px; } /* Misc -------------------------------------------------- */ -span.label { - background-color: #ccc; - padding: 3px 5px; - font-size: 10px; - font-weight: bold; - color: #fff; - text-shadow: 0 0 1px rgba(0, 0, 0, 0.01); - text-transform: uppercase; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -span.label.expired { - background-color: #f5f5f5; - color: #999; -} -span.label.pending { - background-color: #48489b; -} -span.label.declined { - background-color: #9b4848; -} -span.label.active, span.label.approved { - background-color: #59bf59; -} -span.label.disabled { - background-color: #faa226; -} -span.label.scheduled { - background-color: #f5f5f5; - color: #59bf59; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} hr { margin: 0 0 19px; border: 0; @@ -577,21 +544,21 @@ em { color: #e6e6e6; } blockquote { - margin-bottom: 20px; + margin-bottom: 18px; border-left: 5px solid #eee; padding-left: 15px; } blockquote p { font-size: 14px; font-weight: 300; - line-height: 20px; + line-height: 18px; margin-bottom: 0; } blockquote cite { display: block; font-size: 12px; font-weight: 300; - line-height: 20px; + line-height: 18px; color: #b3b3b3; } blockquote cite:before { @@ -599,8 +566,8 @@ blockquote cite:before { } address { display: block; - line-height: 20px; - margin-bottom: 20px; + line-height: 18px; + margin-bottom: 18px; } code, pre { padding: 0 3px 2px; @@ -618,9 +585,9 @@ code { pre { background-color: #f5f5f5; display: block; - padding: 19px; - margin: 0 0 20px; - line-height: 20px; + padding: 17px; + margin: 0 0 18px; + line-height: 18px; font-size: 12px; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; @@ -628,45 +595,6 @@ pre { border-radius: 3px; white-space: pre-wrap; } -pre.css, pre.html { - background-color: #fff; -} -pre ol { - background-color: #feeed6; - list-style: decimal; - margin: -19px; - padding-left: 59px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -pre ol li { - background-color: #fff; - padding: 0 10px; - border-left: 1px solid rgba(0, 0, 0, 0.1); - border-left-color: #fddfb3; - font-size: 11px; - line-height: 20px; - color: #b3b3b3; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); - word-wrap: break-word; -} -pre ol li:first-child { - padding-top: 9px; -} -pre ol li:last-child { - padding-bottom: 9px; -} -span.html__tag_start, span.html__tag_end { - color: #277ac1; - font-weight: normal; -} -span.html__attr_name { - color: #d78b41; -} -span.html__attr_value { - color: #de4a3f; -} /* * Forms.less * Base line styles for various input types, form layouts, and states @@ -674,11 +602,11 @@ span.html__attr_value { /* Global form styles -------------------------------------------------- */ form { - margin-bottom: 20px; + margin-bottom: 18px; } form fieldset { - margin-bottom: 20px; - padding-top: 20px; + margin-bottom: 18px; + padding-top: 18px; } form fieldset legend { display: block; @@ -688,7 +616,7 @@ form fieldset legend { color: #404040; } form div.clearfix { - margin-bottom: 20px; + margin-bottom: 18px; } form label, form input, @@ -706,6 +634,7 @@ form label { float: left; width: 130px; text-align: right; + color: #404040; } form div.input { margin-left: 150px; @@ -718,13 +647,13 @@ form input[type=password], form textarea, form select, form .uneditable-input { - display: block; + display: inline-block; width: 210px; margin: 0; padding: 4px; font-size: 13px; - line-height: 20px; - height: 20px; + line-height: 18px; + height: 18px; color: #808080; border: 1px solid #bbb; -webkit-border-radius: 3px; @@ -732,8 +661,8 @@ form .uneditable-input { border-radius: 3px; } form select, form input[type=file] { - height: 30px; - line-height: 30px; + height: 27px; + line-height: 27px; } form textarea { height: auto; @@ -769,7 +698,7 @@ form div.error { -moz-border-radius: 4px; border-radius: 4px; } -form div.error > label { +form div.error > label, form div.error span.help-inline, form div.error span.help-block { color: #9d261d; } form div.error input[type=text], form div.error input[type=password], form div.error textarea { @@ -837,9 +766,9 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { } div.actions { background: #f5f5f5; - margin-top: 20px; - margin-bottom: 20px; - padding: 19px 20px 20px 150px; + margin-top: 18px; + margin-bottom: 18px; + padding: 17px 20px 18px 150px; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; @@ -856,7 +785,7 @@ div.actions div.secondary-action a:hover { } .help-inline, .help-block { font-size: 12px; - line-height: 20px; + line-height: 18px; color: #b3b3b3; } .help-inline { @@ -875,7 +804,7 @@ div.actions div.secondary-action a:hover { .help-block p { margin-bottom: 0; font-size: 12px; - line-height: 20px; + line-height: 18px; color: #b3b3b3; } .help-block ol { @@ -952,7 +881,7 @@ ul.inputs-list li label { float: none; width: auto; padding: 0; - line-height: 20px; + line-height: 18px; text-align: left; white-space: normal; } @@ -975,7 +904,7 @@ ul.inputs-list input[type=radio], ul.inputs-list input[type=checkbox] { margin-bottom: 0; } form.form-stacked fieldset { - padding-top: 10px; + padding-top: 9px; } form.form-stacked legend { margin-left: 0; @@ -990,7 +919,7 @@ form.form-stacked label { padding-top: 0; } form.form-stacked div.clearfix { - margin-bottom: 10px; + margin-bottom: 9px; } form.form-stacked div.clearfix div.input { margin-left: 0; @@ -1013,14 +942,15 @@ form.form-stacked ul.inputs-list li label { -------------------------------------------------- */ table { width: 100%; - margin-bottom: 20px; + margin-bottom: 18px; padding: 0; text-align: left; border-collapse: separate; + font-size: 13px; } table th, table td { padding: 10px 10px 9px; - line-height: 20px; + line-height: 13.5px; vertical-align: middle; border-bottom: 1px solid #ddd; } @@ -1364,23 +1294,20 @@ div.topbar ul li ul li span { background: rgba(0, 0, 0, 0.2); padding: 6px 15px; cursor: default; - color: #666; + color: #808080; border-top: 1px solid rgba(0, 0, 0, 0.2); } /* Page Headers -------------------------------------------------- */ div.page-header { - margin-bottom: 19px; + margin-bottom: 17px; border-bottom: 1px solid #ddd; - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } div.page-header h1 { - margin-bottom: 0; + margin-bottom: 8px; } /* Error Styles -------------------------------------------------- */ @@ -1415,14 +1342,14 @@ div.alert-message { /* the standard */ background-color: #e6e6e6; - margin-bottom: 20px; - padding: 10px 15px 9px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + margin-bottom: 18px; + padding: 8px 15px; color: #fff; - border-bottom: 1px solid rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-bottom: 1px solid rgba(0, 0, 0, 0.25); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } div.alert-message p { color: #fff; @@ -1460,9 +1387,9 @@ div.alert-message a.close:hover { text-decoration: none; } div.block-message { - margin-bottom: 20px; - padding: 14px 19px; - color: #333; + margin-bottom: 18px; + padding: 14px; + color: #404040; color: rgba(0, 0, 0, 0.8); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); -webkit-border-radius: 6px; @@ -1470,9 +1397,7 @@ div.block-message { border-radius: 6px; } div.block-message p { - font-size: 13px; - line-height: 18px; - color: #333; + color: #404040; color: rgba(0, 0, 0, 0.8); margin-right: 30px; margin-bottom: 0; @@ -1485,7 +1410,7 @@ div.block-message strong { } div.block-message a.close { display: block; - color: #333; + color: #404040; color: rgba(0, 0, 0, 0.5); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); } @@ -1529,23 +1454,23 @@ ul.tabs li a, ul.pills li a { } ul.tabs { width: 100%; - border-bottom: 1px solid #ccc; + border-bottom: 1px solid #b3b3b3; } ul.tabs li a { margin-bottom: -1px; margin-right: 2px; padding: 0 15px; - line-height: 39px; + line-height: 35px; -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } ul.tabs li a:hover { - background: #f5f5f5; - border-bottom: 1px solid #ccc; + background-color: #e6e6e6; + border-bottom: 1px solid #b3b3b3; } ul.tabs li.active a { - background: #fff; + background-color: #fff; padding: 0 14px; border: 1px solid #ccc; border-bottom: 0; @@ -1574,8 +1499,8 @@ ul.pills li.active a { /* Pagination -------------------------------------------------- */ div.pagination { - height: 40px; - margin: 20px 0; + height: 36px; + margin: 18px 0; } div.pagination ul { float: left; @@ -1595,7 +1520,7 @@ div.pagination ul li a { display: inline; float: left; padding: 0 14px; - line-height: 38px; + line-height: 34px; border-right: 1px solid rgba(0, 0, 0, 0.15); text-decoration: none; } @@ -1620,9 +1545,9 @@ div.well { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } /* Modals -------------------------------------------------- */ diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 401a5731b6..e6a0f10a73 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -25,71 +25,58 @@ div.row div.span14{display:inline;float:left;width:820px;margin-left:20px;}div.r div.row div.span15{display:inline;float:left;width:880px;margin-left:20px;}div.row div.span15:first-child{margin-left:0;} div.row div.span16{display:inline;float:left;width:940px;margin-left:20px;}div.row div.span16:first-child{margin-left:0;} html,body{background-color:#fff;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:normal;line-height:20px;color:#808080;text-rendering:optimizeLegibility;} +body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;} div.container{width:940px;margin:0 auto;} div.container-fluid{padding:20px;zoom:1;}div.container-fluid:after{display:block;visibility:hidden;height:0;clear:both;content:".";} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{display:inline-block;background-color:#dcdcdc;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), color-stop(0.25, #f5f5f5), to(#dcdcdc));background-image:-webkit-linear-gradient(#f5f5f5, color-stop(0.25, #f5f5f5), #dcdcdc);background-image:-moz-linear-gradient(#f5f5f5, color-stop(#f5f5f5, 0.25), #dcdcdc);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:20px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-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.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} +.btn{display:inline-block;background-color:#dcdcdc;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), color-stop(0.25, #f5f5f5), to(#dcdcdc));background-image:-webkit-linear-gradient(#f5f5f5, color-stop(0.25, #f5f5f5), #dcdcdc);background-image:-moz-linear-gradient(#f5f5f5, color-stop(#f5f5f5, 0.25), #dcdcdc);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-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.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} .btn.primary{background-color:#0069d6;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#08b5fb), to(#0069d6));background-image:-moz-linear-gradient(#08b5fb, #0069d6);background-image:-ms-linear-gradient(#08b5fb, #0069d6);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #08b5fb), color-stop(100%, #0069d6));background-image:-webkit-linear-gradient(#08b5fb, #0069d6);background-image:-o-linear-gradient(#08b5fb, #0069d6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0069d6', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0069d6', GradientType=0)";background-image:linear-gradient(#08b5fb, #0069d6);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:30px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} -p{font-size:14px;font-weight:normal;line-height:20px;margin-bottom:20px;}p small{font-size:12px;color:#b3b3b3;} +p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:18px;}p small{font-size:12px;color:#b3b3b3;} h1,h2,h3,h4,h5,h6{font-weight:500;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#b3b3b3;} -h1{margin-bottom:20px;font-size:30px;line-height:40px;}h1 small{font-size:18px;} -h2{font-size:24px;line-height:40px;}h2 small{font-size:14px;} -h3,h4,h5,h6{line-height:40px;} +h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} +h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} +h3,h4,h5,h6{line-height:36px;} h3{font-size:18px;}h3 small{font-size:14px;} h4{font-size:16px;}h4 small{font-size:12px;} h5{font-size:14px;} h6{font-size:13px;color:#b3b3b3;text-transform:uppercase;} -ul,ol{margin:0 0 20px 25px;} +ul,ol{margin:0 0 18px 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} ul{list-style:disc;} ol{list-style:decimal;} -li{line-height:20px;color:#808080;} +li{line-height:18px;color:#808080;} ul.unstyled{list-style:none;margin-left:0;} -dl{margin-bottom:20px;}dl dt,dl dd{line-height:20px;} +dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;} dl dt{font-weight:bold;} -dl dd{margin-left:10px;} -span.label{background-color:#ccc;padding:3px 5px;font-size:10px;font-weight:bold;color:#fff;text-shadow:0 0 1px rgba(0, 0, 0, 0.01);text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}span.label.expired{background-color:#f5f5f5;color:#999;} -span.label.pending{background-color:#48489b;} -span.label.declined{background-color:#9b4848;} -span.label.active,span.label.approved{background-color:#59bf59;} -span.label.disabled{background-color:#faa226;} -span.label.scheduled{background-color:#f5f5f5;color:#59bf59;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +dl dd{margin-left:9px;} hr{margin:0 0 19px;border:0;border-bottom:1px solid #eee;} strong{font-style:inherit;font-weight:bold;line-height:inherit;} em{font-style:italic;font-weight:inherit;line-height:inherit;} .muted{color:#e6e6e6;} -blockquote{margin-bottom:20px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:20px;margin-bottom:0;} -blockquote cite{display:block;font-size:12px;font-weight:300;line-height:20px;color:#b3b3b3;}blockquote cite:before{content:'\2014 \00A0';} -address{display:block;line-height:20px;margin-bottom:20px;} +blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} +blockquote cite{display:block;font-size:12px;font-weight:300;line-height:18px;color:#b3b3b3;}blockquote cite:before{content:'\2014 \00A0';} +address{display:block;line-height:18px;margin-bottom:18px;} code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:2px 3px;} -pre{background-color:#f5f5f5;display:block;padding:19px;margin:0 0 20px;line-height:20px;font-size:12px;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;} -pre.css,pre.html{background-color:#fff;} -pre ol{background-color:#feeed6;list-style:decimal;margin:-19px;padding-left:59px;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;}pre ol li{background-color:#fff;padding:0 10px;border-left:1px solid rgba(0, 0, 0, 0.1);border-left-color:#fddfb3;font-size:11px;line-height:20px;color:#b3b3b3;text-shadow:0 1px 1px rgba(255, 255, 255, 0.5);word-wrap:break-word;} -pre ol li:first-child{padding-top:9px;} -pre ol li:last-child{padding-bottom:9px;} -span.html__tag_start,span.html__tag_end{color:#277ac1;font-weight:normal;} -span.html__attr_name{color:#d78b41;} -span.html__attr_value{color:#de4a3f;} -form{margin-bottom:20px;}form fieldset{margin-bottom:20px;padding-top:20px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;} -form div.clearfix{margin-bottom:20px;} +pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;} +form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;} +form div.clearfix{margin-bottom:18px;} form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} -form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;} +form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} form div.input{margin-left:150px;} form input[type=checkbox],form input[type=radio]{cursor:pointer;} -form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:block;width:210px;margin:0;padding:4px;font-size:13px;line-height:20px;height:20px;color:#808080;border:1px solid #bbb;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -form select,form input[type=file]{height:30px;line-height:30px;} +form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #bbb;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +form select,form input[type=file]{height:27px;line-height:27px;} form textarea{height:auto;} form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);} form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.75);-webkit-box-shadow:0 0 8px rgba(82, 168, 236, 0.5);-moz-box-shadow:0 0 8px rgba(82, 168, 236, 0.5);box-shadow:0 0 8px rgba(82, 168, 236, 0.5);} -form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label{color:#9d261d;} +form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;} form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} form div.error div.input-prepend span.add-on,form div.error div.input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;} @@ -100,12 +87,12 @@ form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{wid form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;} form textarea.xxlarge{overflow-y:scroll;} form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -div.actions{background:#f5f5f5;margin-top:20px;margin-bottom:20px;padding:19px 20px 20px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}div.actions div.secondary-action{float:right;}div.actions div.secondary-action a{line-height:30px;}div.actions div.secondary-action a:hover{text-decoration:underline;} -.help-inline,.help-block{font-size:12px;line-height:20px;color:#b3b3b3;} +div.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}div.actions div.secondary-action{float:right;}div.actions div.secondary-action a{line-height:30px;}div.actions div.secondary-action a:hover{text-decoration:underline;} +.help-inline,.help-block{font-size:12px;line-height:18px;color:#b3b3b3;} .help-inline{padding-left:5px;} .help-block{display:block;max-width:600px;}.help-block h5,.help-block p,.help-block ol li{color:#808080;} .help-block p,.help-block ol li{font-size:12px;} -.help-block p{margin-bottom:0;font-size:12px;line-height:20px;color:#b3b3b3;} +.help-block p{margin-bottom:0;font-size:12px;line-height:18px;color:#b3b3b3;} .help-block ol{margin-bottom:10px;margin-left:25px;} div.inline-inputs{color:#808080;}div.inline-inputs span,div.inline-inputs input[type=text]{display:inline-block;} div.inline-inputs input.mini{width:60px;} @@ -116,17 +103,17 @@ div.input-prepend .add-on,div.input-append .add-on{background:#f5f5f5;float:left div.input-prepend .active,div.input-append .active{background:#a9dba9;border-color:#46a546;} div.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} div.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;} -ul.inputs-list{margin:0 0 5px;width:100%;}ul.inputs-list li{display:block;padding:0;width:100%;}ul.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:20px;text-align:left;white-space:normal;}ul.inputs-list li label strong{color:#808080;} +ul.inputs-list{margin:0 0 5px;width:100%;}ul.inputs-list li{display:block;padding:0;width:100%;}ul.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}ul.inputs-list li label strong{color:#808080;} ul.inputs-list li label small{font-size:12px;font-weight:normal !important;} ul.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} ul.inputs-list li:first-child{padding-top:5px;} ul.inputs-list input[type=radio],ul.inputs-list input[type=checkbox]{margin-bottom:0;} -form.form-stacked fieldset{padding-top:10px;} +form.form-stacked fieldset{padding-top:9px;} form.form-stacked legend{margin-left:0;} form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} -form.form-stacked div.clearfix{margin-bottom:10px;}form.form-stacked div.clearfix div.input{margin-left:0;} +form.form-stacked div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;} form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;} -table{width:100%;margin-bottom:20px;padding:0;text-align:left;border-collapse:separate;}table th,table td{padding:10px 10px 9px;line-height:20px;vertical-align:middle;border-bottom:1px solid #ddd;} +table{width:100%;margin-bottom:18px;padding:0;text-align:left;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} table.zebra-striped tbody tr:nth-child(odd) td{background-color:#f5f5f5;} table.zebra-striped tbody tr:hover td{background-color:#f1f1f1;} @@ -167,33 +154,33 @@ div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{ div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;} -div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#666;border-top:1px solid rgba(0, 0, 0, 0.2);} -div.page-header{margin-bottom:19px;border-bottom:1px solid #ddd;-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:0;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:20px;padding:10px 15px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;color:#fff;border-bottom:1px solid rgba(0, 0, 0, 0.25);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} +div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);} +div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} +div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} div.alert-message.error{background-color:#e06359;} div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} div.alert-message.info{background-color:#53ccfc;} div.alert-message a.close{float:right;margin-top:-2px;opacity:.5;color:#fff;font-size:20px;font-weight:bold;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}div.alert-message a.close:hover{opacity:1;text-decoration:none;} -div.block-message{margin-bottom:20px;padding:14px 19px;color:#333;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{font-size:13px;line-height:18px;color:#333;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;} +div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;} div.block-message ul{margin-bottom:0;} div.block-message strong{display:block;} -div.block-message a.close{display:block;color:#333;color:rgba(0, 0, 0, 0.5);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} +div.block-message a.close{display:block;color:#404040;color:rgba(0, 0, 0, 0.5);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} div.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;} div.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;} div.block-message.success{background:#dff1df;border:1px solid #bbe2bb;} div.block-message.info{background:#eaf9ff;border:1px solid #d1f1fe;} ul.tabs,ul.pills{margin:0 0 20px;padding:0;zoom:1;}ul.tabs:after,ul.pills:after{display:block;visibility:hidden;height:0;clear:both;content:".";} ul.tabs li,ul.pills li{display:inline;}ul.tabs li a,ul.pills li a{display:inline;float:left;width:auto;} -ul.tabs{width:100%;border-bottom:1px solid #ccc;}ul.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:39px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}ul.tabs li a:hover{background:#f5f5f5;border-bottom:1px solid #ccc;} -ul.tabs li.active a{background:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} +ul.tabs{width:100%;border-bottom:1px solid #b3b3b3;}ul.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}ul.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #b3b3b3;} +ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:40px;margin:20px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{display:inline;float:left;padding:0 14px;line-height:38px;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;} +div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{display:inline;float:left;padding:0 14px;line-height:34px;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;} div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#eaf9ff;} div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#b3b3b3;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} -div.well{background:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);} +div.well{background:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);} div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} div.modal .modal-body{padding:20px;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9c61dfb027..6f96d166e4 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -185,4 +185,45 @@ div.topbar-wrapper div.topbar { padding-right: 20px; -moz-border-radius: 4px; border-radius: 4px; -} \ No newline at end of file +} +/* Code blocks +-------------------------------------------------- */ +pre.css, pre.html { + background-color: #fff; +} +pre ol { + background-color: #feeed6; + list-style: decimal; + margin: -17px; + padding-left: 59px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +pre ol li { + background-color: #fff; + padding: 0 10px; + border-left: 1px solid rgba(0, 0, 0, 0.1); + border-left-color: #fddfb3; + font-size: 11px; + line-height: 18px; + color: #bbb; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); + word-wrap: break-word; +} +pre ol li:first-child { + padding-top: 9px; +} +pre ol li:last-child { + padding-bottom: 9px; +} +span.html__tag_start, span.html__tag_end { + color: #277ac1; + font-weight: normal; +} +span.html__attr_name { + color: #d78b41; +} +span.html__attr_value { + color: #de4a3f; +} diff --git a/docs/index.html b/docs/index.html index c22c305af5..d1adc9a5d3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -11,7 +11,6 @@ - @@ -744,6 +743,7 @@
+ Small snippet of help text
@@ -1180,12 +1180,12 @@
-

Tweet Modal

-

This is text about a modal that i am making. mark will say change this text. we will change it. It will be changed O_O

+

Example modal

+

Modals—dialogs or lightboxes—are great for contextual actions in situations where it's important that the background context be maintained.