diff options
| author | Mark Otto <[email protected]> | 2011-06-28 15:11:41 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-06-28 15:11:41 -0700 |
| commit | 4e95e558db14a2de80c6cdfd5712c15c8130a951 (patch) | |
| tree | fba6ce1ad1c748dcea295ee7e4f9bdb68c4ea552 /docs | |
| parent | 01c5e74bb3a351feb0c83ff14fb22244647eb82b (diff) | |
| download | bootstrap-4e95e558db14a2de80c6cdfd5712c15c8130a951.tar.xz bootstrap-4e95e558db14a2de80c6cdfd5712c15c8130a951.zip | |
reseting baseline to 18px, fixing wells, moving pre styles for chili to docs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/docs.css | 43 | ||||
| -rw-r--r-- | docs/index.html | 8 |
2 files changed, 46 insertions, 5 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9c61dfb02..6f96d166e 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 c22c305af..d1adc9a5d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -11,7 +11,6 @@ <!-- Le javascript --> <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script> <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> - <script src="assets/js/jquery/hashgrid.js"></script> <script src="assets/js/jquery/chili/jquery.chili-2.2.js"></script> <script src="assets/js/jquery/chili/recipes.js"></script> <script id="setup">ChiliBook.lineNumbers = true;</script> @@ -744,6 +743,7 @@ <label for="xlInput">X-Large Input</label> <div class="input"> <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" /> + <span class="help-inline">Small snippet of help text</span> </div> </div> <!-- /clearfix --> </fieldset> @@ -1180,12 +1180,12 @@ <section id="modals"> <div class="page-header"> - <h1>Modals <small>Rules and conditions for displaying content in popovers.</small></h1> + <h1>Modals <small>Rules and conditions for displaying content in dialog boxes</small></h1> </div> <div class="row"> <div class="span4 columns"> - <h2>Tweet Modal</h2> - <p>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</p> + <h2>Example modal</h2> + <p>Modals—dialogs or lightboxes—are great for contextual actions in situations where it's important that the background context be maintained.</p> </div> <div class="span12 columns"> <div class="modal-backdrop" style="position:relative; min-height:200px; padding:40px; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px; z-index: 1"> |