diff options
author | Thomas Park <thomas@thomaspark.me> | 2012-03-17 17:34:40 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2012-03-17 17:34:40 -0400 |
commit | 0887b39681ec6578ec9ca9010e729db956d310c2 (patch) | |
tree | 2eb81cd9ff551b563039af20292b88d49d7656a8 | |
parent | 50a1df71e0eec41b6df2063b82086f784c237b23 (diff) |
cyborg: modal tweak, no rounded corners, subnav border fix
-rw-r--r-- | cyborg/bootstrap.css | 13 | ||||
-rw-r--r-- | cyborg/bootstrap.min.css | 9 | ||||
-rwxr-xr-x | cyborg/bootswatch.less | 15 |
3 files changed, 25 insertions, 12 deletions
diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css index 3abf73aa..f4372ecb 100644 --- a/cyborg/bootstrap.css +++ b/cyborg/bootstrap.css @@ -4111,12 +4111,15 @@ div.subnav.subnav-fixed { left: -1px; top: auto; } -div.subnav .nav li > a, +div.subnav .nav > li > a, div.subnav .nav .active a { + background-color: #020202; border-left: 1px solid #222; border-right: 0; color: #eeeeee; - background-color: #020202; +} +div.subnav .nav li.nav-header { + text-shadow: none; } .subnav .nav > li > a:hover, .subnav .nav > li.active > a:hover, @@ -4134,7 +4137,7 @@ div.subnav .nav .dropdown.open .dropdown-toggle { } div.subnav .nav .dropdown.open .dropdown-menu { background-color: #020202; - border-left: 0; + border-left: solid 1px rgba(256, 256, 256, 0.1); } div.subnav .nav .dropdown.open .dropdown-menu li > a:hover { border-bottom: 0; @@ -4492,6 +4495,9 @@ footer.footer { border-top: 1px solid #222; } .modal { + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; border-top: solid 1px rgba(256, 256, 256, 0.3); background-color: #282828; } @@ -4510,6 +4516,7 @@ footer.footer { } .table, .well, +.hero-unit, .prettyprint, input, textarea, diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css index 2d1ea029..f927c15a 100644 --- a/cyborg/bootstrap.min.css +++ b/cyborg/bootstrap.min.css @@ -710,10 +710,11 @@ body{background-color:#121417;background-image:-moz-linear-gradient(top, #060606 .navbar .nav-collapse.in .nav a:hover{background-color:#33b5e5;} 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{border-left:1px solid #222;border-right:0;color:#eeeeee;background-color:#020202;} +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;} .subnav .nav>li>a:hover,.subnav .nav>li.active>a:hover,.subnav .nav>li:first-child>a:hover{background:transparent;border-bottom:2px solid #33b5e5;border-left:1px solid #222;color:#ffffff;} div.subnav .nav .dropdown.open .dropdown-toggle{border:0;border-left:1px solid #222;border-bottom:2px solid #33b5e5;background-color:#060606;} -div.subnav .nav .dropdown.open .dropdown-menu{background-color:#020202;border-left:0;}div.subnav .nav .dropdown.open .dropdown-menu li>a:hover{border-bottom:0;background:#33b5e5;} +div.subnav .nav .dropdown.open .dropdown-menu{background-color:#020202;border-left:solid 1px rgba(256, 256, 256, 0.1);}div.subnav .nav .dropdown.open .dropdown-menu li>a:hover{border-bottom:0;background:#33b5e5;} @media (max-width:768px){div.subnav .nav>li+li>a,div.subnav .nav>li:first-child>a{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;background-color:#33b5e5;}}.nav-list>li>a,.nav-list .nav-header{text-shadow:none;} .nav-list li>a:hover,.nav-tabs li>a:hover,.nav-tabs li.active>a,.nav-pills li>a:hover,.nav-stacked li>a:hover,.nav-stacked li.active>a{background-color:#33b5e5;color:#ffffff;} .nav-tabs{border-bottom:1px solid #222;} @@ -755,10 +756,10 @@ input:focus,textarea:focus,input.focused,textarea.focused{border-color:#52a8ec;o 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{background:transparent;} .form-actions,footer.footer{border-top:1px solid #222;} -.modal{border-top:solid 1px rgba(256, 256, 256, 0.3);background-color:#282828;} +.modal{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;border-top:solid 1px rgba(256, 256, 256, 0.3);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,.prettyprint,input,textarea,select{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;} +.table,.well,.hero-unit,.prettyprint,input,textarea,select{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;} code,pre,pre.prettyprint{background-color:#eeeeee;} .well,.hero-unit{background-color:#131517;border-top:solid 1px rgba(256, 256, 256, 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);} .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 37c2c2b2..4edd3b73 100755 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -85,7 +85,7 @@ body { } .navbar .nav > li > a { - border-left: 1px solid #222; + border-left: 1px solid #222; } .dropdown-menu { @@ -130,12 +130,16 @@ div.subnav.subnav-fixed { top: auto; } -div.subnav .nav li > a, +div.subnav .nav > li > a, div.subnav .nav .active a { + background-color: @grayDarker; border-left: 1px solid #222; border-right: 0; color: @grayLighter; - background-color: @grayDarker; +} + +div.subnav .nav li.nav-header { + text-shadow: none; } .subnav .nav > li > a:hover, @@ -158,7 +162,7 @@ div.subnav .nav .dropdown.open { .dropdown-menu { background-color: @grayDarker; - border-left: 0; + border-left: solid 1px rgba(256, 256, 256, 0.1); li > a:hover { border-bottom: 0; @@ -386,6 +390,7 @@ select:focus { // ----------------------------------------------------- .modal { + .border-radius(1px); border-top: solid 1px rgba(256,256,256,.3); background-color: @grayDark; } @@ -404,7 +409,7 @@ select:focus { // MISCELLANEOUS // ----------------------------------------------------- -.table, .well, .prettyprint, input, textarea, select { +.table, .well, .hero-unit, .prettyprint, input, textarea, select { .border-radius(1px); } |