From 6636f09c08c7ac49eafdbba440721bcfee0ff819 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Thu, 14 Jun 2012 22:30:04 -0400 Subject: 2.0.3 -> 2.0.4 closes #24 --- cyborg/bootstrap.css | 252 ++++++++++++++++++++++++++--------------------- cyborg/bootstrap.min.css | 61 ++++++------ cyborg/bootswatch.less | 93 +++++++++-------- cyborg/variables.less | 5 +- 4 files changed, 219 insertions(+), 192 deletions(-) (limited to 'cyborg') diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css index 40cf6f00..f19e133a 100644 --- a/cyborg/bootstrap.css +++ b/cyborg/bootstrap.css @@ -1,6 +1,6 @@ @import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700'); /*! - * Bootstrap v2.0.3 + * Bootstrap v2.0.4 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -63,6 +63,9 @@ img { border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img { + max-width: none; +} button, input, select, @@ -341,9 +344,6 @@ a:hover { } p { margin: 0 0 9px; - font-family: 'Droid Sans', sans-serif; - font-size: 13px; - line-height: 18px; } p small { font-size: 11px; @@ -492,7 +492,7 @@ em { } abbr[title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #adafae; } abbr.initialism { font-size: 90%; @@ -609,7 +609,7 @@ legend { line-height: 36px; color: #282828; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { font-size: 13.5px; @@ -633,72 +633,111 @@ textarea { label { display: block; margin-bottom: 5px; - color: #282828; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; height: 18px; padding: 4px; margin-bottom: 9px; font-size: 13px; line-height: 18px; color: #999999; +} +input, +textarea { + width: 210px; +} +textarea { + height: auto; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { background-color: #cccccc; border: 1px solid #bbbbbb; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -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-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -ms-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; - height: auto; - padding: 0; +input[type="radio"], +input[type="checkbox"] { margin: 3px 0; *margin-top: 0; /* IE7 */ line-height: normal; cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ - - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; } -input[type="image"] { - border: 0; -} -input[type="file"] { +input[type="submit"], +input[type="reset"], +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - padding: initial; - line-height: initial; - background-color: #cccccc; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; } -input[type="button"], -input[type="reset"], -input[type="submit"] { +.uneditable-textarea { width: auto; height: auto; } @@ -712,27 +751,21 @@ input[type="file"] { line-height: 28px; } -input[type="file"] { - line-height: 18px \9; -} select { width: 220px; - background-color: #cccccc; + border: 1px solid #bbb; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -textarea { - height: auto; -} -input[type="hidden"] { - display: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } .radio, .checkbox { @@ -759,39 +792,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -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-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -821,6 +821,14 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { @@ -883,12 +891,16 @@ input[type="checkbox"][readonly] { .control-group.warning .help-inline { color: #a47e3c; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #a47e3c; border-color: #a47e3c; } +.control-group.warning .checkbox:focus, +.control-group.warning .radio:focus, .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { @@ -908,12 +920,16 @@ input[type="checkbox"][readonly] { .control-group.error .help-inline { color: #b94a48; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b94a48; border-color: #b94a48; } +.control-group.error .checkbox:focus, +.control-group.error .radio:focus, .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { @@ -933,12 +949,16 @@ input[type="checkbox"][readonly] { .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; border-color: #468847; } +.control-group.success .checkbox:focus, +.control-group.success .radio:focus, .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { @@ -972,7 +992,7 @@ select:focus:required:invalid:focus { margin-top: 18px; margin-bottom: 18px; background-color: transparent; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, @@ -996,6 +1016,9 @@ select:focus:required:invalid:focus { :-moz-placeholder { color: #adafae; } +:-ms-input-placeholder { + color: #adafae; +} ::-webkit-input-placeholder { color: #adafae; } @@ -1960,8 +1983,8 @@ table .span24 { margin: 8px 1px; *margin: -5px 0 5px; overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; + background-color: transparent; + border-bottom: 1px solid #222222; } .dropdown-menu a { display: block; @@ -1982,10 +2005,10 @@ table .span24 { .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -2039,7 +2062,6 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; -ms-transition: opacity 0.15s linear; @@ -2048,7 +2070,6 @@ table .span24 { } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -3082,6 +3103,9 @@ input[type="submit"].btn.btn-mini { .navbar-search .search-query:-moz-placeholder { color: #cccccc; } +.navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} .navbar-search .search-query::-webkit-input-placeholder { color: #cccccc; } @@ -4230,6 +4254,9 @@ body { .navbar .brand:hover { border-bottom: 3px solid #33b5e5; } +.navbar .navbar-text { + line-height: 43px; +} .navbar .nav li > a { padding: 13px 10px 8px; border-bottom: 3px solid rgba(0, 0, 0, 0); @@ -4251,14 +4278,19 @@ body { -moz-border-radius: 1px; border-radius: 1px; } -.navbar .search-query :-moz-placeholder, -.navbar .search-query:focus :-moz-placeholder, -.navbar .search-query.focused :-moz-placeholder { +.navbar .search-query:-moz-placeholder, +.navbar .search-query:focus:-moz-placeholder, +.navbar .search-query.focused:-moz-placeholder { + color: #999999; +} +.navbar .search-query:-ms-input-placeholder, +.navbar .search-query:focus:-ms-input-placeholder, +.navbar .search-query.focused:-ms-input-placeholder { color: #999999; } -.navbar .search-query ::-webkit-input-placeholder, -.navbar .search-query:focus ::-webkit-input-placeholder, -.navbar .search-query.focused ::-webkit-input-placeholder { +.navbar .search-query::-webkit-input-placeholder, +.navbar .search-query:focus::-webkit-input-placeholder, +.navbar .search-query.focused::-webkit-input-placeholder { color: #999999; } .navbar .nav li.dropdown.active.open .dropdown-toggle:hover { @@ -4286,10 +4318,6 @@ body { background-color: #33b5e5; border-bottom: 3px solid transparent; } -.dropdown-menu .divider { - background-color: #222; - border-bottom: 0px solid white; -} div.subnav { position: static; background-color: #020202; @@ -4705,7 +4733,7 @@ select:focus { -webkit-border-radius: 1px; -moz-border-radius: 1px; border-radius: 1px; - border-top: solid 1px rgba(255, 255, 255, 0.3); + border-top: solid 1px #353535; background-color: #282828; } .modal-header { @@ -4739,7 +4767,7 @@ pre { .well, .hero-unit { background-color: #131517; - border-top: solid 1px rgba(255, 255, 255, 0.1); + border-top: solid 1px #353535; -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8); -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8); diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css index 69f2b7d6..f201f685 100644 --- a/cyborg/bootstrap.min.css +++ b/cyborg/bootstrap.min.css @@ -9,6 +9,7 @@ sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} sup{top:-0.5em;} sub{bottom:-0.25em;} img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;} +#map_canvas img{max-width:none;} button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} button,input{*overflow:visible;line-height:normal;} button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} @@ -71,7 +72,7 @@ a:hover{color:#ffffff;text-decoration:underline;} .container:after{clear:both;} .container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";} .container-fluid:after{clear:both;} -p{margin:0 0 9px;font-family:'Droid Sans',sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#adafae;} +p{margin:0 0 9px;}p small{font-size:11px;color:#adafae;} .lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;} h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:normal;color:#ffffff;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#adafae;} h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} @@ -99,7 +100,7 @@ hr{margin:18px 0;border:0;border-top:1px solid #999999;border-bottom:1px solid # strong{font-weight:bold;} em{font-style:italic;} .muted{color:#adafae;} -abbr[title]{cursor:help;border-bottom:1px dotted #ddd;} +abbr[title]{cursor:help;border-bottom:1px dotted #adafae;} abbr.initialism{font-size:90%;text-transform:uppercase;} blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} blockquote small{display:block;line-height:18px;color:#adafae;}blockquote small:before{content:'\2014 \00A0';} @@ -115,32 +116,26 @@ pre code{padding:0;color:inherit;background-color:transparent;border:0;} .pre-scrollable{max-height:340px;overflow-y:scroll;} form{margin:0 0 18px;} fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#282828;border:0;border-bottom:1px solid #eee;}legend small{font-size:13.5px;color:#adafae;} +legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#282828;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:13.5px;color:#adafae;} label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;} input,button,select,textarea{font-family:'Droid Sans',sans-serif;} -label{display:block;margin-bottom:5px;color:#282828;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#999999;background-color:#cccccc;border:1px solid #bbbbbb;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +label{display:block;margin-bottom:5px;} +select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#999999;} +input,textarea{width:210px;} +textarea{height:auto;} +textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#cccccc;border:1px solid #bbbbbb;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-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-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);} +input[type="radio"],input[type="checkbox"]{margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;} +input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;} .uneditable-textarea{width:auto;height:auto;} -label input,label textarea,label select{display:block;} -input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;background-color:transparent;border:0 \9;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -input[type="image"]{border:0;} -input[type="file"]{width:auto;padding:initial;line-height:initial;background-color:#cccccc;background-color:initial;border:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;} select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;} -input[type="file"]{line-height:18px \9;} -select{width:220px;background-color:#cccccc;} +select{width:220px;border:1px solid #bbb;} select[multiple],select[size]{height:auto;} -input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -textarea{height:auto;} -input[type="hidden"]{display:none;} +select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} .radio,.checkbox{min-height:18px;padding-left:18px;} .radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} .radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} -input,textarea{-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-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} -input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);} -input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .input-mini{width:60px;} .input-small{width:90px;} .input-medium{width:150px;} @@ -148,6 +143,7 @@ input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus, .input-xlarge{width:270px;} .input-xxlarge{width:530px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0;} +.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block;} input,textarea,.uneditable-input{margin-left:0;} input.span12, textarea.span12, .uneditable-input.span12{width:930px;} input.span11, textarea.span11, .uneditable-input.span11{width:850px;} @@ -164,19 +160,20 @@ input.span1, textarea.span1, .uneditable-input.span1{width:50px;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;border-color:#ddd;} input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;} .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#a47e3c;} -.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#a47e3c;border-color:#a47e3c;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#7f612e;-webkit-box-shadow:0 0 6px #ceae78;-moz-box-shadow:0 0 6px #ceae78;box-shadow:0 0 6px #ceae78;} +.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#a47e3c;border-color:#a47e3c;}.control-group.warning .checkbox:focus,.control-group.warning .radio:focus,.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#7f612e;-webkit-box-shadow:0 0 6px #ceae78;-moz-box-shadow:0 0 6px #ceae78;box-shadow:0 0 6px #ceae78;} .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#a47e3c;background-color:#eeeeee;border-color:#a47e3c;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} -.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} +.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error .checkbox:focus,.control-group.error .radio:focus,.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} .control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#eeeeee;border-color:#b94a48;} .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} -.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} +.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success .checkbox:focus,.control-group.success .radio:focus,.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#eeeeee;border-color:#468847;} input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:transparent;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} +.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:transparent;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} .form-actions:after{clear:both;} .uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#cccccc;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);} :-moz-placeholder{color:#adafae;} +:-ms-input-placeholder{color:#adafae;} ::-webkit-input-placeholder{color:#adafae;} .help-block,.help-inline{color:#999999;} .help-block{display:block;margin-bottom:9px;} @@ -397,18 +394,18 @@ table .span24{float:none;width:1884px;margin-left:0;} .dropdown .caret{margin-top:8px;margin-left:2px;} .dropdown:hover .caret,.open .caret{opacity:1;filter:alpha(opacity=100);} .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:4px 0;margin:1px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} -.dropdown-menu .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.dropdown-menu .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:transparent;border-bottom:1px solid #222222;} .dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#999999;white-space:nowrap;} .dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#33b5e5;} -.open{*z-index:1000;}.open .dropdown-menu{display:block;} -.pull-right .dropdown-menu{right:0;left:auto;} +.open{*z-index:1000;}.open >.dropdown-menu{display:block;} +.pull-right>.dropdown-menu{right:0;left:auto;} .dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";} .dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;} .typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;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);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} .well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;filter:alpha(opacity=100);} +.fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;} .collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;} .close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} @@ -560,6 +557,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} .navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:'Droid Sans',sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#424242;border:1px solid #000000;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;} +.navbar-search .search-query:-ms-input-placeholder{color:#cccccc;} .navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#282828;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} .navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} @@ -723,17 +721,18 @@ body{min-height:100%;background-color:#121417;background-image:-moz-linear-gradi .page-header{border-bottom:2px solid #33b5e5;} .navbar .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-bottom:2px solid #33b5e5;} .navbar .brand{padding:12px 20px 8px;}.navbar .brand:hover{border-bottom:3px solid #33b5e5;} +.navbar .navbar-text{line-height:43px;} .navbar .nav li>a{padding:13px 10px 8px;border-bottom:3px solid rgba(0, 0, 0, 0);border-left:1px solid #222;}.navbar .nav li>a:hover{border-bottom:3px solid #33b5e5;} .navbar .nav .active>a{border-bottom:3px solid #33b5e5;} -.navbar .search-query,.navbar .search-query:focus,.navbar .search-query.focused{color:#adafae;text-shadow:none;background-color:#222;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}.navbar .search-query :-moz-placeholder,.navbar .search-query:focus :-moz-placeholder,.navbar .search-query.focused :-moz-placeholder{color:#999999;} -.navbar .search-query ::-webkit-input-placeholder,.navbar .search-query:focus ::-webkit-input-placeholder,.navbar .search-query.focused ::-webkit-input-placeholder{color:#999999;} +.navbar .search-query,.navbar .search-query:focus,.navbar .search-query.focused{color:#adafae;text-shadow:none;background-color:#222;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}.navbar .search-query:-moz-placeholder,.navbar .search-query:focus:-moz-placeholder,.navbar .search-query.focused:-moz-placeholder{color:#999999;} +.navbar .search-query:-ms-input-placeholder,.navbar .search-query:focus:-ms-input-placeholder,.navbar .search-query.focused:-ms-input-placeholder{color:#999999;} +.navbar .search-query::-webkit-input-placeholder,.navbar .search-query:focus::-webkit-input-placeholder,.navbar .search-query.focused::-webkit-input-placeholder{color:#999999;} .navbar .nav li.dropdown.active.open .dropdown-toggle:hover{border-bottom:3px solid #33b5e5;border-left:1px solid #222;} .navbar .dropdown-menu::before,.navbar .dropdown-menu::after{display:none;} .navbar .nav-collapse.in .nav>li>a{border-left:0;} .navbar .nav-collapse.in .nav a:hover{background-color:#33b5e5;} .dropdown-menu{background-color:#191A1A;border-left:solid 1px rgba(255, 255, 255, 0.1);-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);} .dropdown-menu li>a:hover{background-color:#33b5e5;border-bottom:3px solid transparent;} -.dropdown-menu .divider{background-color:#222;border-bottom:0px solid white;} div.subnav{position:static;background-color:#020202;background-image:none;border:0;}div.subnav.subnav-fixed{position:relative;left:-1px;top:auto;} div.subnav .nav>li>a,div.subnav .nav .active a{background-color:#020202;border-left:1px solid #222;border-right:0;color:#eeeeee;} div.subnav .nav li.nav-header{text-shadow:none;} @@ -783,12 +782,12 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado input:focus,textarea:focus,input.focused,textarea.focused{border-color:#52a8ec;outline:0;outline:thin dotted \9;} input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} .form-actions{border-top:1px solid #222;} -.modal{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;border-top:solid 1px rgba(255, 255, 255, 0.3);background-color:#282828;} +.modal{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;border-top:solid 1px #353535;background-color:#282828;} .modal-header{border-bottom:1px solid #222;} .modal-footer{background-color:#282828;border-top:1px solid #222;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .table,.well,.hero-unit,.prettyprint,input,textarea,select{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;} code,pre{background-color:#eeeeee;} -.well,.hero-unit{background-color:#131517;border-top:solid 1px rgba(255, 255, 255, 0.1);-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);} +.well,.hero-unit{background-color:#131517;border-top:solid 1px #353535;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);} blockquote{border-left:5px solid #33b5e5;}blockquote.pull-right{border-right:5px solid #33b5e5;} .thumbnail{border-color:#222;} .progress{background-color:#060606;background-image:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less index 7f8726a4..ae5252c1 100755 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -1,6 +1,6 @@ // Bootswatch.less // Swatch: Cyborg -// Version: 2.0.3 +// Version: 2.0.4 // ----------------------------------------------------- // TYPOGRAPHY @@ -50,35 +50,39 @@ body { // ----------------------------------------------------- .navbar { - + .navbar-inner { .border-radius(0); .box-shadow(none); border-bottom: 2px solid @blue } - + .brand { padding: 12px 20px 8px; - + &:hover { border-bottom: 3px solid @blue } } - + + .navbar-text { + line-height: 43px; + } + .nav li > a { padding: 13px 10px 8px; border-bottom: 3px solid rgba(0, 0, 0, 0); border-left: 1px solid #222; - + &:hover { border-bottom: 3px solid @blue } } - + .nav .active > a { border-bottom: 3px solid @blue } - + .search-query, .search-query:focus, .search-query.focused { @@ -87,13 +91,13 @@ body { background-color: #222; .border-radius(1px); .placeholder(@gray); - } - + } + .nav li.dropdown.active.open .dropdown-toggle:hover { border-bottom: 3px solid @blue; border-left: 1px solid #222; } - + .dropdown-menu::before, .dropdown-menu::after { display: none; @@ -120,18 +124,13 @@ body { border-bottom: 3px solid transparent; } -.dropdown-menu .divider { - background-color: #222; - border-bottom: 0px solid white; -} - div.subnav { position: static; background-color: @grayDarker; background-image: none; border: 0; - - + + &.subnav-fixed { position: relative; left: -1px; @@ -158,14 +157,14 @@ div.subnav { border-left: 1px solid #222; color: @white; } - + .nav .open .dropdown-toggle { border: 0; border-left: 1px solid #222; border-bottom: 2px solid @blue; background-color: #060606; } - + .nav .open .dropdown-menu { background-color: @grayDarker; border-left: solid 1px rgba(255, 255, 255, 0.1); @@ -183,7 +182,7 @@ div.subnav { border-top: 1px solid #222; border-left: 1px solid #222; } - + .subnav .nav > li + li > a:hover, .subnav .nav > li:first-child > a:hover { border-bottom: 0; @@ -195,20 +194,20 @@ div.subnav { // ----------------------------------------------------- .nav-list { - + li > a { - text-shadow: none; + text-shadow: none; } - + li > a:hover { background-color: @blue; - color: @white; + color: @white; } - + .nav-header { text-shadow: none; } - + .divider { background-color: transparent; border-bottom: 1px solid #222; @@ -216,9 +215,9 @@ div.subnav { } .nav-tabs { - + border-bottom: 1px solid #222; - + li > a:hover, li.active > a, li.active > a:hover { @@ -226,12 +225,12 @@ div.subnav { background-color: @blue; color: @white; } - + .open .dropdown-toggle { background-color: #060606 !important; border: 1px solid #222; } - + .dropdown-menu li > a:hover { border: none; } @@ -241,24 +240,24 @@ div.subnav { li > a:hover { background-color: @blue; - color: @white; + color: @white; } - + .open .dropdown-toggle { background-color: #060606; } - + .dropdown-menu li > a:hover { border: none; } } .nav-stacked { - + li > a { - border: 1px solid #222 !important; + border: 1px solid #222 !important; } - + li > a:hover, li.active > a { background-color: @blue; @@ -279,12 +278,12 @@ div.subnav { border-width: 0; .box-shadow(none); font-size: 14px; - + li > a { color: @blue; text-shadow: none; } - + li.active { text-shadow: none; } @@ -294,16 +293,16 @@ div.subnav { ul { .box-shadow(none); } - + a { border: 0; font-size: 14px; } - + a:hover, .active a { background-color: @blue; color: @white; - } + } } // BUTTONS @@ -314,7 +313,7 @@ div.subnav { .buttonBackground(darken(@gray, 20%), darken(@gray, 30%)); color: @white; text-shadow: none; - + &:hover { text-shadow: none; color: @white; @@ -363,7 +362,7 @@ div.subnav { input, textarea, select { border-width: 2px; -} +} legend, label { color: @textColor; @@ -405,7 +404,7 @@ select:focus { .modal { .border-radius(1px); - border-top: solid 1px rgba(255, 255, 255, 0.3); + border-top: solid 1px lighten(@grayDark, 5%); background-color: @grayDark; } @@ -433,13 +432,13 @@ code, pre { .well, .hero-unit { background-color: #131517; - border-top: solid 1px rgba(255, 255, 255, 0.1); + border-top: solid 1px lighten(@grayDark, 5%); .box-shadow(0 2px 4px rgba(0,0,0,.8)); } blockquote { border-left: 5px solid @blue; - + &.pull-right { border-right: 5px solid @blue; } diff --git a/cyborg/variables.less b/cyborg/variables.less index 7ee3bfd3..dd90072c 100755 --- a/cyborg/variables.less +++ b/cyborg/variables.less @@ -1,7 +1,7 @@ // Variables.less // Variables to customize the look and feel of Bootstrap // Swatch: Cyborg -// Version: 2.0.3 +// Version: 2.0.4 // ----------------------------------------------------- // GLOBAL VALUES @@ -107,7 +107,8 @@ @dropdownLinkColor: @textColor; @dropdownLinkColorHover: @white; @dropdownLinkBackgroundHover: @linkColor; - +@dropdownDividerTop: transparent; +@dropdownDividerBottom: #222; -- cgit v1.2.3