diff options
author | Thomas Park <thomas@thomaspark.me> | 2012-08-24 21:27:41 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2012-08-24 21:27:41 -0400 |
commit | 0501a78aa63ee43167f6fd103f9e810f46c8bcaf (patch) | |
tree | 0c24e26b405accf8f25e95ede72b2546a5504d42 /united | |
parent | 74c226b2c3495871e73d3b389c41ebcaff8bd120 (diff) |
all: organized sections in less
Diffstat (limited to 'united')
-rw-r--r-- | united/bootstrap.css | 12 | ||||
-rw-r--r-- | united/bootstrap.min.css | 2 | ||||
-rwxr-xr-x | united/bootswatch.less | 33 |
3 files changed, 32 insertions, 15 deletions
diff --git a/united/bootstrap.css b/united/bootstrap.css index e7deaf87..e86d6f88 100644 --- a/united/bootstrap.css +++ b/united/bootstrap.css @@ -4793,6 +4793,12 @@ a.badge:hover { .navbar .nav-collapse.collapse .nav-header { color: #f5f5f5; } +.nav-tabs .open .dropdown-toggle, +.nav-pills .open .dropdown-toggle, +.nav > li.dropdown.open.active > a:hover { + border-right: 1px solid #C03D14; + border-left: 1px solid #E6633A; +} .btn-primary { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -4855,12 +4861,6 @@ a.badge:hover { .btn-warning.active { background-color: #e7a413 \9; } -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - border-right: 1px solid #C03D14; - border-left: 1px solid #E6633A; -} .alert { text-shadow: none; } diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css index 5a27f12d..18b68af9 100644 --- a/united/bootstrap.min.css +++ b/united/bootstrap.min.css @@ -809,11 +809,11 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .navbar .nav-collapse.collapse .nav li>a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.3);background-image:none;} .navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:0px solid #dd4814;border-bottom:0px solid #dd4814;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse.collapse .nav-header{color:#f5f5f5;} +.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-right:1px solid #C03D14;border-left:1px solid #E6633A;} .btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e86537;background-image:-moz-linear-gradient(top, #ef784e, #dd4814);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ef784e), to(#dd4814));background-image:-webkit-linear-gradient(top, #ef784e, #dd4814);background-image:-o-linear-gradient(top, #ef784e, #dd4814);background-image:linear-gradient(to bottom, #ef784e, #dd4814);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffef784e', endColorstr='#ffdd4814', GradientType=0);border-color:#dd4814 #dd4814 #97310e;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#dd4814;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#dd4814;*background-color:#c64012;} .btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;} .btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#f3c768;background-image:-moz-linear-gradient(top, #f5d185, #efb73e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5d185), to(#efb73e));background-image:-webkit-linear-gradient(top, #f5d185, #efb73e);background-image:-o-linear-gradient(top, #f5d185, #efb73e);background-image:linear-gradient(to bottom, #f5d185, #efb73e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5d185', endColorstr='#ffefb73e', GradientType=0);border-color:#efb73e #efb73e #cf9311;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#efb73e;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#efb73e;*background-color:#edae26;} .btn-warning:active,.btn-warning.active{background-color:#e7a413 \9;} -.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-right:1px solid #C03D14;border-left:1px solid #E6633A;} .alert{text-shadow:none;} .hero-unit{border:1px solid rgba(0, 0, 0, 0.05);-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);}.hero-unit h1{line-height:1.6em;} .pull-right{float:right;} diff --git a/united/bootswatch.less b/united/bootswatch.less index 8efda4a6..f2d20b6e 100755 --- a/united/bootswatch.less +++ b/united/bootswatch.less @@ -8,6 +8,9 @@ @import url(https://fonts.googleapis.com/css?family=Ubuntu); +// SCAFFOLDING +// ----------------------------------------------------- + // NAVBAR // ----------------------------------------------------- @@ -69,6 +72,16 @@ } } +// NAV +// ----------------------------------------------------- + +.nav-tabs .open .dropdown-toggle, +.nav-pills .open .dropdown-toggle, +.nav > li.dropdown.open.active > a:hover { + border-right: 1px solid #C03D14; + border-left: 1px solid #E6633A; +} + // BUTTONS // ----------------------------------------------------- @@ -80,24 +93,25 @@ .buttonBackground(lighten(@yellow, 15%), @yellow); } -// NAVIGATION +// TABLES // ----------------------------------------------------- +// FORMS +// ----------------------------------------------------- -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - border-right: 1px solid #C03D14; - border-left: 1px solid #E6633A; -} +// DROPDOWNS +// ----------------------------------------------------- -// MISC +// ALERTS, LABELS, BADGES // ----------------------------------------------------- .alert { text-shadow: none; } +// MISC +// ----------------------------------------------------- + .hero-unit { border: 1px solid rgba(0,0,0,.05); .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); @@ -106,3 +120,6 @@ line-height: 1.6em; } } + +// MEDIA QUERIES +// ----------------------------------------------------- |