diff options
-rw-r--r-- | spruce/bootstrap.css | 47 | ||||
-rw-r--r-- | spruce/bootstrap.min.css | 16 | ||||
-rwxr-xr-x | spruce/bootswatch.less | 34 |
3 files changed, 6 insertions, 91 deletions
diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css index c39930f1..00b8e37b 100644 --- a/spruce/bootstrap.css +++ b/spruce/bootstrap.css @@ -5254,9 +5254,6 @@ div.subnav { background-color: #015b4e; background-image: none; border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; } div.subnav .nav > li > a { padding: 12px 12px 10px; @@ -5365,9 +5362,6 @@ div.subnav.subnav-fixed { -moz-box-shadow: none; box-shadow: none; border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; } .breadcrumb li { color: #ffffff; @@ -5393,9 +5387,6 @@ div.subnav.subnav-fixed { -moz-box-shadow: none; box-shadow: none; border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; } .pagination ul > li > a, .pagination ul > li > span { @@ -5436,9 +5427,6 @@ div.subnav.subnav-fixed { color: #ffffff; } .btn { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; font-family: 'Crete Round', serif; font-weight: normal; text-shadow: none; @@ -5451,22 +5439,6 @@ div.subnav.subnav-fixed { -moz-box-shadow: none; box-shadow: none; } -.table, -.table.table-bordered, -.table.table-striped { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child, -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} .table th, .table-striped tbody tr:nth-child(odd) th { background-color: #015b4e; @@ -5502,9 +5474,6 @@ select { } .form-actions { border-top: none; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; } .control-group.warning .control-label, .control-group.error .control-label, @@ -5585,18 +5554,12 @@ select { } .well { border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } .hero-unit { border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; } .thumbnail { border: none; @@ -5604,11 +5567,6 @@ select { -moz-box-shadow: none; box-shadow: none; } -.thumbnail img { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} .dropdown-menu .nav-header { color: #ffffff; text-shadow: none; @@ -5642,11 +5600,6 @@ select { .modal-footer label { color: #555555; } -.modal-footer { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} .popover-title { color: #ffffff; } diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css index 9da4dc47..cb2d677f 100644 --- a/spruce/bootstrap.min.css +++ b/spruce/bootstrap.min.css @@ -703,7 +703,6 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar-inverse .nav li.dropdown>a:hover .caret{border-top-color:#333333;border-bottom-color:#333333;} .navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} .navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ffffff;} .navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#ffffff;border-color:#dddddd;-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;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#555555;} .navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#555555;} .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#555555;} @@ -895,17 +894,15 @@ div.subnav.subnav-fixed{top:55px;} .breadcrumb li a:hover{color:#ffffff;} .breadcrumb li .divider{color:#ffffff;} .breadcrumb .active{color:#ffffff;} -.pagination ul{background-color:#015b4e;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.pagination ul{background-color:#015b4e;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-color:transparent;} .pagination ul>li>a,.pagination ul>li>span{background-color:#015b4e;border-color:transparent;color:#ffffff;}.pagination ul>li>a:hover,.pagination ul>li>span:hover{background-color:#013435;color:#ffffff;} .pagination ul>.active>a,.pagination ul>.active>span{background-color:#013435;color:#ffffff;} .pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{background-color:#028d79;color:#ffffff;} .pager li>a,.pager li>span{border:none;background-color:#015b4e;color:#ffffff;}.pager li>a:hover,.pager li>span:hover{background-color:#013435;} .pager .disabled a,.pager .disabled a:hover{background-color:#028d79;color:#ffffff;} -.btn{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-family:'Crete Round',serif;font-weight:normal;text-shadow:none;} +.btn{font-family:'Crete Round',serif;font-weight:normal;text-shadow:none;} .btn-large{font-size:18px;} .btn-group .dropdown-toggle{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.table,.table.table-bordered,.table.table-striped{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child,.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .table th,.table-striped tbody tr:nth-child(odd) th{background-color:#015b4e;color:#ffffff;} .table tbody tr.success td{background-color:#B5EEAA;} .table tbody tr.error td{background-color:#EEB8B8;} @@ -914,7 +911,7 @@ legend{border-bottom:none;font-family:'Crete Round',serif;font-weight:normal;col label,.help-block,input[type="file"]{color:#333333;} input,textarea,select{color:#555555;} .uneditable-input{color:#555555;} -.form-actions{border-top:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.form-actions{border-top:none;} .control-group.warning .control-label,.control-group.error .control-label,.control-group.success .control-label{color:#555555;} .control-group.error .help-block,.control-group.error .help-inline{color:#d14432;} .control-group.error input,.control-group.error select,.control-group.error textarea{border:1px solid #d14432;color:#555555;} @@ -929,16 +926,15 @@ input,textarea,select{color:#555555;} .badge-important,.label-important{background-color:#d65747;} .badge-info,.label-info{background-color:#34a7c8;} .badge-inverse,.label-inverse{background-color:#555555;} -.well{border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.hero-unit{border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.thumbnail{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.thumbnail img{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.well{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.hero-unit{border:none;} +.thumbnail{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .dropdown-menu .nav-header{color:#ffffff;text-shadow:none;} .dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{background-image:none;} .progress{background-color:#d5d5d5;background-image:none;} [class^="icon-"],[class*=" icon-"]{vertical-align:baseline;} .modal-header{padding:12px 15px 6px;background-color:#015b4e;} .modal-body,.modal-footer{background-color:#333333;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.modal-body label,.modal-footer label{color:#555555;} -.modal-footer{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} .popover-title{color:#ffffff;} .pull-right{float:right;} .pull-left{float:left;} diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less index 4d834a7b..10b0d47e 100755 --- a/spruce/bootswatch.less +++ b/spruce/bootswatch.less @@ -189,7 +189,6 @@ div.subnav { background-color: @green; background-image: none; border-color: transparent; - .border-radius(0); .nav > li > a { padding: 12px 12px 10px; @@ -332,7 +331,6 @@ div.subnav { background-image: none; .box-shadow(none); border-color: transparent; - .border-radius(0); li { color: @white; @@ -364,7 +362,6 @@ div.subnav { background-image: none; .box-shadow(none); border-color: transparent; - .border-radius(0); } @@ -419,7 +416,6 @@ div.subnav { // -------------------------------------------------- .btn { - .border-radius(0); font-family: @headingsFontFamily; font-weight: @headingsFontWeight; text-shadow: none; @@ -436,25 +432,6 @@ div.subnav { // TABLES // -------------------------------------------------- -.table, -.table.table-bordered, -.table.table-striped { - .border-radius(0); -} - -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child, -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child, -.table-bordered tbody:last-child tr:last-child td:first-child, { - .border-radius(0); -} - -.table thead tr th:first-child, -.table tbody tr td:first-child { - // border-left: none; -} - .table th, .table-striped tbody tr:nth-child(odd) th { background-color: @green; @@ -500,7 +477,6 @@ input, textarea, select { .form-actions { border-top: none; - .border-radius(4px); } .control-group { @@ -604,22 +580,16 @@ input, textarea, select { .well { border: none; - .border-radius(0); .box-shadow(none); } .hero-unit { border: none; - .border-radius(0); } .thumbnail { border: none; .box-shadow(none); - - img { - .border-radius(4px); - } } .dropdown-menu .nav-header { @@ -660,10 +630,6 @@ input, textarea, select { color: @textColor; } } - - &-footer { - .border-radius(0 0 4px 4px); - } } .popover { |