diff --git a/assets/css/bootstrap-1.0.0.css b/assets/css/bootstrap-1.0.0.css index 6cf9f7bb..0e1ab56a 100644 --- a/assets/css/bootstrap-1.0.0.css +++ b/assets/css/bootstrap-1.0.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Aug 21 20:55:56 PDT 2011 + * Date: Sun Aug 21 21:42:52 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -691,6 +691,12 @@ form fieldset legend { margin-left: 150px; font-size: 20px; line-height: 1; + *margin: 0 0 5px 145px; + /* IE6-7 */ + + *line-height: 1.5; + /* IE6-7 */ + color: #404040; } form .clearfix { @@ -877,6 +883,12 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { } .help-inline { padding-left: 5px; + *position: relative; + /* IE6-7 */ + + *top: -5px; + /* IE6-7 */ + } .help-block { display: block; @@ -925,6 +937,11 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { background: #a9dba9; border-color: #46a546; } +.input-prepend .add-on { + *margin-top: 1px; + /* IE6-7 */ + +} .input-append input[type=text] { float: left; -webkit-border-radius: 3px 0 0 3px; @@ -1625,9 +1642,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { margin: 0; border: 1px solid #ddd; border: 1px solid rgba(0, 0, 0, 0.15); - border-right: 0\9; - /* IE8 and below don't support last child. TODO: clean this up; */ - -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1645,6 +1659,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { border-right: 1px solid; border-right-color: #ddd; border-right-color: rgba(0, 0, 0, 0.15); + *border-right-color: #ddd; + /* IE6-7 */ + text-decoration: none; } .pagination ul li a:hover, .pagination ul li.active a { @@ -1654,7 +1671,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-color: none; color: #bfbfbf; } -.pagination ul li.next a, .pagination ul li:last-child a { +.pagination ul li.next a { border: 0; } .well { @@ -1846,6 +1863,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { .popover .inner { background-color: #333; background-color: rgba(0, 0, 0, 0.8); + *background-color: #333; + /* IE 6-7 */ + padding: 3px; overflow: hidden; width: 280px; diff --git a/assets/css/bootstrap-1.0.0.min.css b/assets/css/bootstrap-1.0.0.min.css index 54bc4a75..f20af750 100644 --- a/assets/css/bootstrap-1.0.0.min.css +++ b/assets/css/bootstrap-1.0.0.min.css @@ -84,7 +84,7 @@ 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:1px 3px;} pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;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{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;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;} form .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;color:#404040;} @@ -111,7 +111,7 @@ 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;} .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;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;} .help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;} -.help-inline{padding-left:5px;} +.help-inline{padding-left:5px;*position:relative;*top:-5px;} .help-block{display:block;max-width:600px;} .inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input[type=text]{display:inline-block;} .inline-inputs input.mini{width:60px;} @@ -120,6 +120,7 @@ form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{bac .input-prepend input[type=text],.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .input-prepend .add-on,.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} +.input-prepend .add-on{*margin-top:1px;} .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;} .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;} .inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list li label strong{color:#808080;} @@ -198,10 +199,10 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} .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;}.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);border-right:0\9;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}.pagination ul li{display:inline;}.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} +.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;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.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}.pagination ul li{display:inline;}.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;} .pagination ul li a:hover,.pagination ul li.active a{background-color:#c7eefe;} .pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} -.pagination ul li.next a,.pagination ul li:last-child a{border:0;} +.pagination ul li.next a{border:0;} .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-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);} .modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;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-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} @@ -220,6 +221,6 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-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);} +.popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#333;padding:3px;overflow:hidden;width:280px;-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);} .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} diff --git a/assets/css/docs.css b/assets/css/docs.css index 4fbfac9d..b7d24199 100644 --- a/assets/css/docs.css +++ b/assets/css/docs.css @@ -230,4 +230,10 @@ div.popover-well div.popover-menu-wrapper { img.large-bird { margin: 5px 0 0 310px; opacity: .1; +} + +/* Pretty Print +-------------------------------------------------- */ +PRE.prettyprint { + overflow: hidden; } \ No newline at end of file diff --git a/assets/js/application.js b/assets/js/application.js index 0de6ca96..3319e607 100644 --- a/assets/js/application.js +++ b/assets/js/application.js @@ -42,25 +42,12 @@ $(document).ready(function(){ // Dropdown example for topbar nav // =============================== - $("body").bind("click", function(e) { - $("ul.menu-dropdown").hide(); - $('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide(); + $("body").bind("click", function (e) { + $('a.menu').parent("li").removeClass("open"); }); - $("a.menu").click(function(e) { - var $target = $(this); - var $parent = $target.parent("li"); - var $siblings = $target.siblings("ul.menu-dropdown"); - var $parentSiblings = $parent.siblings("li"); - if ($parent.hasClass("open")) { - $parent.removeClass("open"); - $siblings.hide(); - } else { - $parent.addClass("open"); - $siblings.show(); - } - $parentSiblings.children("ul.menu-dropdown").hide(); - $parentSiblings.removeClass("open"); + $("a.menu").click(function (e) { + var $li = $(this).parent("li").toggleClass('open'); return false; }); diff --git a/index.html b/index.html index ebcacf27..5cb905c9 100644 --- a/index.html +++ b/index.html @@ -599,8 +599,263 @@
+<<<<<<< HEAD + +
+

Forms

+
+ +
+
+

Default styles

+

All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.

+
+
+
+
+ Example form legend +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ Some Value Here +
+
+
+ +
+ +
+
+
+ +
+ + Small snippet of help text +
+
+
+
+ Example form legend +
+ +
+
+ @ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ Example form legend +
+ +
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+ + Note: Labels surround all the options for much larger click areas and a more usable form. + +
+
+
+ +
+
+ + + to + + + All times are shown as Pacific Standard Time (GMT -08:00). +
+
+
+
+ +
+ + + Block of help text to describe the field above if need be. + +
+
+
+ +
+
    +
  • + +
    • +
  • + +
    • +
+
+
+
+   +
+
+
+
+
+ +
+ +
+
+

Stacked forms

+

Add .form-stacked to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.

+
+
+
+
+ Example form legend +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ Example form legend +
+ +
+
    +
  • + +
    • +
  • + +
    • +
+ + Note: Labels surround all the options for much larger click areas and a more usable form. + +
+
+
+
+   +
+
+
+
+ +
+
+

Buttons

+

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

+

All buttons default to a light gray style, but a blue .primary class is available. Plus, rolling your own styles is easy peasy.

+=======

Forms

+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
@@ -609,6 +864,9 @@
+<<<<<<< HEAD +   +=======
Example form legend
@@ -779,6 +1037,7 @@
+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
@@ -859,6 +1118,13 @@

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

All buttons default to a light gray style, but a blue .primary class is available. Plus, rolling your own styles is easy peasy.

+<<<<<<< HEAD +

Buttons

+
+
+   +
+=======

Example buttons

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

@@ -888,6 +1154,7 @@
+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0