diff options
Diffstat (limited to 'simplex')
| -rw-r--r-- | simplex/bootstrap.css | 273 | ||||
| -rw-r--r-- | simplex/bootstrap.min.css | 64 | ||||
| -rwxr-xr-x | simplex/bootswatch.less | 143 | ||||
| -rwxr-xr-x | simplex/variables.less | 5 |
4 files changed, 257 insertions, 228 deletions
diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index 03bacda6..8b8f7ef0 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.0.3 + * Bootstrap v2.0.4 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -62,6 +62,9 @@ img { border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img { + max-width: none; +} button, input, select, @@ -340,9 +343,6 @@ a:hover { } p { margin: 0 0 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; } p small { font-size: 11px; @@ -491,7 +491,7 @@ em { } abbr[title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -608,7 +608,7 @@ legend { line-height: 36px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { font-size: 13.5px; @@ -632,72 +632,111 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -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: #555555; +} +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: #ffffff; border: 1px solid #cccccc; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + -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: #ffffff; - 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; } @@ -711,27 +750,21 @@ input[type="file"] { line-height: 28px; } -input[type="file"] { - line-height: 18px \9; -} select { width: 220px; - background-color: #ffffff; + 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 { @@ -758,39 +791,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; } @@ -820,6 +820,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 { @@ -882,12 +890,16 @@ input[type="checkbox"][readonly] { .control-group.warning .help-inline { color: #ff6600; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #ff6600; border-color: #ff6600; } +.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 { @@ -907,12 +919,16 @@ input[type="checkbox"][readonly] { .control-group.error .help-inline { color: #e32c3b; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #e32c3b; border-color: #e32c3b; } +.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 { @@ -932,12 +948,16 @@ input[type="checkbox"][readonly] { .control-group.success .help-inline { color: #3d9400; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { color: #3d9400; border-color: #3d9400; } +.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 { @@ -971,7 +991,7 @@ select:focus:required:invalid:focus { margin-top: 18px; margin-bottom: 18px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, @@ -993,10 +1013,13 @@ select:focus:required:invalid:focus { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); } :-moz-placeholder { - color: #999999; + color: #555555; +} +:-ms-input-placeholder { + color: #555555; } ::-webkit-input-placeholder { - color: #999999; + color: #555555; } .help-block, .help-inline { @@ -1981,10 +2004,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; } @@ -2038,7 +2061,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; @@ -2047,7 +2069,6 @@ table .span24 { } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -3081,6 +3102,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; } @@ -4189,14 +4213,15 @@ h6, padding-top: 10px; color: #333333; } -.navbar .nav > li > a { - padding-top: 14px; +.navbar .navbar-text { + padding: 14px 10px 11px; text-shadow: none; font-weight: normal; font-size: 11px; + line-height: 19px; } -.navbar .navbar-text { - padding: 14px 10px 11px; +.navbar .nav > li > a { + padding-top: 14px; text-shadow: none; font-weight: normal; font-size: 11px; @@ -4212,8 +4237,14 @@ h6, .navbar .nav li.open.dropdown .dropdown-toggle .caret { border-top-color: #555555; } -.dropdown.open .dropdown-toggle { +.navbar .nav-collapse .nav li > a { color: #333333; + font-weight: normal; +} +.navbar .nav-collapse .nav li > a:hover { + background-color: transparent; + color: #000000; + text-decoration: underline; } div.subnav { background-image: none; @@ -4243,25 +4274,6 @@ div.subnav .nav > li.open > a:hover { border-left: 1px solid whiteSmoke; border-right: 1px solid #E5E5E5; } -.dropdown-menu { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - font-size: 11px; -} -.nav .nav-header { - font-weight: normal; - text-transform: none; -} -.navbar .nav-collapse.in .nav li > a { - color: #333333; - font-weight: normal; -} -.navbar .nav-collapse.in .nav li > a:hover { - background-color: transparent; - color: #000000; - text-decoration: underline; -} @media (max-width: 979px) { form.navbar-form, form.navbar-search { @@ -4269,10 +4281,23 @@ div.subnav .nav > li.open > a:hover { border-bottom: 1px solid #ccc; } } +.nav .nav-header { + font-weight: normal; + text-transform: none; +} .nav > li > a { font-size: 11px; border-width: 1px; } +.dropdown-menu { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + font-size: 11px; +} +.dropdown.open .dropdown-toggle { + color: #333333; +} .nav-tabs > li > a, .nav-tabs > li > a:hover, .tabbable > .nav-tabs > li > a, diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index b733b61b..4437c842 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -8,6 +8,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;} @@ -70,7 +71,7 @@ a:hover{color:#1d4ba8;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:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;} +p{margin:0 0 9px;}p small{font-size:11px;color:#999999;} .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:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} @@ -98,7 +99,7 @@ hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid # strong{font-weight:bold;} em{font-style:italic;} .muted{color:#999999;} -abbr[title]{cursor:help;border-bottom:1px dotted #ddd;} +abbr[title]{cursor:help;border-bottom:1px dotted #999999;} 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:#999999;}blockquote small:before{content:'\2014 \00A0';} @@ -114,32 +115,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:#333333;border:0;border-bottom:1px solid #eee;}legend small{font-size:13.5px;color:#999999;} +legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:13.5px;color:#999999;} label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;} input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} -label{display:block;margin-bottom:5px;color:#333333;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;background-color:#ffffff;border:1px solid #cccccc;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +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:#555555;} +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:#ffffff;border:1px solid #cccccc;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-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:#ffffff;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:#ffffff;} +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;} @@ -147,6 +142,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;} @@ -163,20 +159,21 @@ 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:#ff6600;} -.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#ff6600;border-color:#ff6600;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#cc5200;-webkit-box-shadow:0 0 6px #ffa366;-moz-box-shadow:0 0 6px #ffa366;box-shadow:0 0 6px #ffa366;} +.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#ff6600;border-color:#ff6600;}.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:#cc5200;-webkit-box-shadow:0 0 6px #ffa366;-moz-box-shadow:0 0 6px #ffa366;box-shadow:0 0 6px #ffa366;} .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#ff6600;background-color:#fcf8e3;border-color:#ff6600;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#e32c3b;} -.control-group.error input,.control-group.error select,.control-group.error textarea{color:#e32c3b;border-color:#e32c3b;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#c21a28;-webkit-box-shadow:0 0 6px #ef868f;-moz-box-shadow:0 0 6px #ef868f;box-shadow:0 0 6px #ef868f;} +.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#e32c3b;border-color:#e32c3b;}.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:#c21a28;-webkit-box-shadow:0 0 6px #ef868f;-moz-box-shadow:0 0 6px #ef868f;box-shadow:0 0 6px #ef868f;} .control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#e32c3b;background-color:#f2dede;border-color:#e32c3b;} .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#3d9400;} -.control-group.success input,.control-group.success select,.control-group.success textarea{color:#3d9400;border-color:#3d9400;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#286100;-webkit-box-shadow:0 0 6px #67fa00;-moz-box-shadow:0 0 6px #67fa00;box-shadow:0 0 6px #67fa00;} +.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#3d9400;border-color:#3d9400;}.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:#286100;-webkit-box-shadow:0 0 6px #67fa00;-moz-box-shadow:0 0 6px #67fa00;box-shadow:0 0 6px #67fa00;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#3d9400;background-color:#dff0d8;border-color:#3d9400;} 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:#f5f5f5;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:#f5f5f5;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:#ffffff;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:#999999;} -::-webkit-input-placeholder{color:#999999;} +:-moz-placeholder{color:#555555;} +:-ms-input-placeholder{color:#555555;} +::-webkit-input-placeholder{color:#555555;} .help-block,.help-inline{color:#555555;} .help-block{display:block;margin-bottom:9px;} .help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} @@ -399,15 +396,15 @@ table .span24{float:none;width:1884px;margin-left:0;} .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 a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;} .dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#366ddc;} -.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;} @@ -559,6 +556,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:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#ffffff;border:1px solid #b3b3b3;-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:#333333;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;} @@ -716,20 +714,20 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} h6,.hero-unit{color:#333333;} .navbar .navbar-inner{-webkit-box-shadow:inset 0 -1px #cfcaca;-moz-box-shadow:inset 0 -1px #cfcaca;box-shadow:inset 0 -1px #cfcaca;border-bottom:1px solid #FFF;border-bottom:none;} .navbar .brand{padding-top:10px;color:#333333;} +.navbar .navbar-text{padding:14px 10px 11px;text-shadow:none;font-weight:normal;font-size:11px;line-height:19px;} .navbar .nav>li>a{padding-top:14px;text-shadow:none;font-weight:normal;font-size:11px;} -.navbar .navbar-text{padding:14px 10px 11px;text-shadow:none;font-weight:normal;font-size:11px;} .navbar .nav>li>a:hover{text-decoration:underline;} .navbar .nav .active>a,.navbar .nav .active>a:hover{background-color:transparent;} .navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav li.open.dropdown .dropdown-toggle .caret{border-top-color:#555555;} -.dropdown.open .dropdown-toggle{color:#333333;} +.navbar .nav-collapse .nav li>a{color:#333333;font-weight:normal;} +.navbar .nav-collapse .nav li>a:hover{background-color:transparent;color:#000000;text-decoration:underline;} div.subnav{background-image:none;background-color:#f3f3f3;border-bottom:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);}div.subnav.subnav-fixed{-webkit-box-shadow:inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3);box-shadow:inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3);} div.subnav .nav>li>a{padding-top:12px;color:#555555;font-weight:normal;font-size:11px;}div.subnav .nav>li>a:hover{text-decoration:underline;} div.subnav .nav>li.open>a,div.subnav .nav>li.open>a:hover{background-color:transparent;border-left:1px solid whiteSmoke;border-right:1px solid #E5E5E5;} +@media (max-width:979px){form.navbar-form,form.navbar-search{border-top:1px solid #ccc;border-bottom:1px solid #ccc;}}.nav .nav-header{font-weight:normal;text-transform:none;} +.nav>li>a{font-size:11px;border-width:1px;} .dropdown-menu{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-size:11px;} -.nav .nav-header{font-weight:normal;text-transform:none;} -.navbar .nav-collapse.in .nav li>a{color:#333333;font-weight:normal;} -.navbar .nav-collapse.in .nav li>a:hover{background-color:transparent;color:#000000;text-decoration:underline;} -@media (max-width:979px){form.navbar-form,form.navbar-search{border-top:1px solid #ccc;border-bottom:1px solid #ccc;}}.nav>li>a{font-size:11px;border-width:1px;} +.dropdown.open .dropdown-toggle{color:#333333;} .nav-tabs>li>a,.nav-tabs>li>a:hover,.tabbable>.nav-tabs>li>a,.tabbable>.nav-tabs>li>a:hover{background-color:#e5e5e5;border:1px solid #ccc;} .tabbable>.nav-tabs>li.active>a{border-bottom:1px solid transparent;} .tabbable.tabs-below>.nav-tabs>li.active>a,.tabbable.tabs-left>.nav-tabs>li.active>a,.tabbable.tabs-right>.nav-tabs>li.active>a{border-bottom:1px solid #ccc;} diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index 2f281e5a..3b7de2e6 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -1,6 +1,6 @@ // Bootswatch.less // Swatch: Simplex -// Version: 2.0.3 +// Version: 2.0.4 // ----------------------------------------------------- @boxShadow: 0 1px 1px rgba(0, 0, 0, 0.3); @@ -15,71 +15,82 @@ h6, .hero-unit { // NAVBAR // ----------------------------------------------------- -.navbar .navbar-inner { - .box-shadow(inset 0 -1px #CFCACA); - border-bottom: 1px solid #FFF; - border-bottom: none; -} +.navbar { -.navbar .brand { - padding-top: 10px; - color: @headingsColor; -} + .navbar-inner { + .box-shadow(inset 0 -1px #CFCACA); + border-bottom: 1px solid #FFF; + border-bottom: none; + } -.navbar .nav > li > a { - padding-top: 14px; - text-shadow: none; - font-weight: normal; - font-size: 11px; -} + .brand { + padding-top: 10px; + color: @headingsColor; + } -.navbar .navbar-text { - padding: 14px 10px 11px; - text-shadow: none; - font-weight: normal; - font-size: 11px; -} + .navbar-text { + padding: 14px 10px 11px; + text-shadow: none; + font-weight: normal; + font-size: 11px; + line-height: 19px; + } -.navbar .nav > li > a:hover { - text-decoration: underline; -} + .nav > li > a { + padding-top: 14px; + text-shadow: none; + font-weight: normal; + font-size: 11px; + } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - background-color: transparent; -} + .nav > li > a:hover { + text-decoration: underline; + } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.open.dropdown .dropdown-toggle .caret { - border-top-color: @textColor; -} + .nav .active > a, + .nav .active > a:hover { + background-color: transparent; + } -.dropdown.open .dropdown-toggle { - color: @headingsColor; + .nav li.dropdown .dropdown-toggle .caret, + .nav li.open.dropdown .dropdown-toggle .caret { + border-top-color: @textColor; + } + + .nav-collapse .nav li > a { + color: @headingsColor; + font-weight: normal; + } + + .nav-collapse .nav li > a:hover { + background-color: transparent; + color: @black; + text-decoration: underline; + } } div.subnav { - + background-image: none; background-color: @navbarBackground; border-bottom: 1px solid transparent; .box-shadow(@boxShadow); - + &.subnav-fixed { .box-shadow(inset 0 5px #fff~"," @boxShadow); } - + .nav > li > a { padding-top: 12px; color: @navbarText; font-weight: normal; font-size: 11px; - + &:hover { text-decoration: underline; } } - + .nav > li.open > a, .nav > li.open > a:hover { background-color: transparent; @@ -88,26 +99,6 @@ div.subnav { } } -.dropdown-menu { - .border-radius(0); - font-size: 11px; -} - -.nav .nav-header { - font-weight: normal; - text-transform: none; -} -.navbar .nav-collapse.in .nav li > a { - color: @headingsColor; - font-weight: normal; -} - -.navbar .nav-collapse.in .nav li > a:hover { - background-color: transparent; - color: @black; - text-decoration: underline; -} - @media (max-width: 979px) { form.navbar-form, form.navbar-search { border-top: 1px solid #ccc; @@ -118,11 +109,25 @@ div.subnav { // NAV // ----------------------------------------------------- +.nav .nav-header { + font-weight: normal; + text-transform: none; +} + .nav > li > a { font-size: 11px; border-width: 1px; } +.dropdown-menu { + .border-radius(0); + font-size: 11px; +} + +.dropdown.open .dropdown-toggle { + color: @headingsColor; +} + .nav-tabs > li > a, .nav-tabs > li > a:hover, .tabbable > .nav-tabs > li > a, @@ -176,33 +181,33 @@ legend { // ----------------------------------------------------- .btn { - .border-radius(2px); - font-weight: bold; - #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); + .border-radius(2px); + font-weight: bold; + #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); } .btn-primary { - .buttonBackground(lighten(@btnPrimaryBackground, 5%), @btnPrimaryBackground); + .buttonBackground(lighten(@btnPrimaryBackground, 5%), @btnPrimaryBackground); } .btn-warning { - .buttonBackground(lighten(@orange, 5%), @orange); + .buttonBackground(lighten(@orange, 5%), @orange); } .btn-danger { - .buttonBackground(lighten(@red, 5%), @red); + .buttonBackground(lighten(@red, 5%), @red); } .btn-success { - .buttonBackground(lighten(@green, 5%), @green); + .buttonBackground(lighten(@green, 5%), @green); } .btn-info { - .buttonBackground(lighten(#5bc0de, 5%), #5bc0de); + .buttonBackground(lighten(#5bc0de, 5%), #5bc0de); } .btn-inverse { - .buttonBackground(lighten(@purple, 5%), @purple); + .buttonBackground(lighten(@purple, 5%), @purple); } // MODALS diff --git a/simplex/variables.less b/simplex/variables.less index c2192746..eb89f440 100755 --- a/simplex/variables.less +++ b/simplex/variables.less @@ -1,7 +1,7 @@ // Variables.less // Variables to customize the look and feel of Bootstrap // Swatch: Simplex -// Version: 2.0.3 +// Version: 2.0.4 // ----------------------------------------------------- // GLOBAL VALUES @@ -107,7 +107,8 @@ @dropdownLinkColor: @grayDark; @dropdownLinkColorHover: @white; @dropdownLinkBackgroundHover: @linkColor; - +@dropdownDividerTop: #e5e5e5; +@dropdownDividerBottom: @white; |