diff options
Diffstat (limited to 'simplex')
-rw-r--r-- | simplex/bootstrap.css | 121 | ||||
-rw-r--r-- | simplex/bootstrap.min.css | 27 | ||||
-rwxr-xr-x | simplex/bootswatch.less | 152 |
3 files changed, 153 insertions, 147 deletions
diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index 8a682733..6617ec4b 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -4749,8 +4749,8 @@ a.badge:hover { .affix { position: fixed; } -h6 { - color: inherit; +hr { + border-bottom: none; } .navbar .navbar-inner { -webkit-box-shadow: inset 0 -1px #cfcaca; @@ -5009,6 +5009,39 @@ div.subnav .dropdown.open:hover .dropdown-toggle { background-color: #fbebe9; color: #d9230f; } +.breadcrumb { + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + border: 0px solid transparent; +} +.breadcrumb li { + padding-top: 5px; + text-shadow: none; +} +.breadcrumb a { + text-shadow: none; +} +.breadcrumb a:hover { + text-decoration: none; +} +.pagination li > a { + padding: 4px 14px 0; + color: #555555; +} +.pagination li > a:hover { + background-color: #fbebe9; + color: #d9230f; +} +.pagination li.active > a { + background-color: #fbebe9; + color: #d9230f; +} +.btn { + padding-top: .6em; + font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-weight: bold; +} legend { border-bottom: 1px solid #ddd; font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -5029,38 +5062,6 @@ legend { .input-prepend .btn { line-height: 16px; } -.btn { - padding-top: .6em; - font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; - font-weight: bold; -} -.modal-header { - border-bottom: none; -} -.modal-header, -.modal-body { - background-color: #fefefe; -} -.modal-footer { - background-color: #f7f7f7; -} -i[class^="icon-"] { - opacity: 0.5; - vertical-align: -2px; -} -hr { - border-bottom: none; -} -.progress { - background-color: #e3e3e3; - background-image: -moz-linear-gradient(top, #e0e0e0, #e8e8e8); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8)); - background-image: -webkit-linear-gradient(top, #e0e0e0, #e8e8e8); - background-image: -o-linear-gradient(top, #e0e0e0, #e8e8e8); - background-image: linear-gradient(to bottom, #e0e0e0, #e8e8e8); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe0e0e0', endColorstr='#ffe8e8e8', GradientType=0); -} .label { padding: 4px 4px 3px; margin-left: 1px; @@ -5068,11 +5069,9 @@ hr { line-height: 26px; font-weight: normal; } -.hero-unit { - background-color: #fefefe; - -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); +i[class^="icon-"] { + opacity: 0.5; + vertical-align: -2px; } .well { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); @@ -5080,37 +5079,35 @@ hr { box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); border: none; } -.thumbnail { - padding: 10px; - background-color: #ffffff; -} -.breadcrumb { +.hero-unit { + background-color: #fefefe; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); - border: 0px solid transparent; } -.breadcrumb li { - padding-top: 5px; - text-shadow: none; -} -.breadcrumb a { - text-shadow: none; +.thumbnail { + padding: 10px; + background-color: #ffffff; } -.breadcrumb a:hover { - text-decoration: none; +.progress { + background-color: #e3e3e3; + background-image: -moz-linear-gradient(top, #e0e0e0, #e8e8e8); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8)); + background-image: -webkit-linear-gradient(top, #e0e0e0, #e8e8e8); + background-image: -o-linear-gradient(top, #e0e0e0, #e8e8e8); + background-image: linear-gradient(to bottom, #e0e0e0, #e8e8e8); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe0e0e0', endColorstr='#ffe8e8e8', GradientType=0); } -.pagination li > a { - padding: 4px 14px 0; - color: #555555; +.modal-header { + border-bottom: none; } -.pagination li > a:hover { - background-color: #fbebe9; - color: #d9230f; +.modal-header, +.modal-body { + background-color: #fefefe; } -.pagination li.active > a { - background-color: #fbebe9; - color: #d9230f; +.modal-footer { + background-color: #f7f7f7; } @media (max-width: 979px) { .nav-collapse.collapse .navbar-form, diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index 90b63c7e..7e5af63c 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -801,7 +801,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .show{display:block;} .invisible{visibility:hidden;} .affix{position:fixed;} -h6{color:inherit;} +hr{border-bottom:none;} .navbar .navbar-inner{-webkit-box-shadow:inset 0 -1px #cfcaca;-moz-box-shadow:inset 0 -1px #cfcaca;box-shadow:inset 0 -1px #cfcaca;} .navbar .brand{padding:12px 20px 8px;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;}.navbar .brand:hover{color:#d9230f;} .navbar .nav>li>a{padding:13px 15px 6px;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;text-shadow:none;}.navbar .nav>li>a:hover{text-decoration:none;} @@ -845,26 +845,25 @@ div.subnav .dropdown.open:hover .dropdown-toggle{background-color:transparent;} .nav-pills .dropdown.open .dropdown-toggle,.nav-pills .dropdown.open:hover .dropdown-toggle{background-color:#fbebe9;color:#d9230f;}.nav-pills .dropdown.open .dropdown-toggle .caret,.nav-pills .dropdown.open:hover .dropdown-toggle .caret{border-top-color:#d9230f;border-bottom-color:#d9230f;} .nav-list li>a{color:#555555;}.nav-list li>a:hover{background-color:#fbebe9;color:#d9230f;} .nav-list li.active>a,.nav-list li.active>a:hover{background-color:#fbebe9;color:#d9230f;} +.breadcrumb{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:0px solid transparent;}.breadcrumb li{padding-top:5px;text-shadow:none;} +.breadcrumb a{text-shadow:none;} +.breadcrumb a:hover{text-decoration:none;} +.pagination li>a{padding:4px 14px 0;color:#555555;}.pagination li>a:hover{background-color:#fbebe9;color:#d9230f;} +.pagination li.active>a{background-color:#fbebe9;color:#d9230f;} +.btn{padding-top:.6em;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;} legend{border-bottom:1px solid #ddd;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;} .navbar-search .search-query{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#f7f7f7;color:#555555;} .help-inline,.help-block{font-size:13px;} .input-append .btn,.input-prepend .btn{line-height:16px;} -.btn{padding-top:.6em;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;} -.modal-header{border-bottom:none;} -.modal-header,.modal-body{background-color:#fefefe;} -.modal-footer{background-color:#f7f7f7;} -i[class^="icon-"]{opacity:0.5;vertical-align:-2px;} -hr{border-bottom:none;} -.progress{background-color:#e3e3e3;background-image:-moz-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8));background-image:-webkit-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-o-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:linear-gradient(to bottom, #e0e0e0, #e8e8e8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe0e0e0', endColorstr='#ffe8e8e8', GradientType=0);} .label{padding:4px 4px 3px;margin-left:1px;margin-right:1px;line-height:26px;font-weight:normal;} -.hero-unit{background-color:#fefefe;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);} +i[class^="icon-"]{opacity:0.5;vertical-align:-2px;} .well{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:none;} +.hero-unit{background-color:#fefefe;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);} .thumbnail{padding:10px;background-color:#ffffff;} -.breadcrumb{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:0px solid transparent;}.breadcrumb li{padding-top:5px;text-shadow:none;} -.breadcrumb a{text-shadow:none;} -.breadcrumb a:hover{text-decoration:none;} -.pagination li>a{padding:4px 14px 0;color:#555555;}.pagination li>a:hover{background-color:#fbebe9;color:#d9230f;} -.pagination li.active>a{background-color:#fbebe9;color:#d9230f;} +.progress{background-color:#e3e3e3;background-image:-moz-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8));background-image:-webkit-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-o-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:linear-gradient(to bottom, #e0e0e0, #e8e8e8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe0e0e0', endColorstr='#ffe8e8e8', GradientType=0);} +.modal-header{border-bottom:none;} +.modal-header,.modal-body{background-color:#fefefe;} +.modal-footer{background-color:#f7f7f7;} @media (max-width:979px){.nav-collapse.collapse .navbar-form,.nav-collapse.collapse .navbar-search{border-top:1px solid #eeeeee;border-bottom:1px solid #eeeeee;}}.pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index 5d61ebd6..30cd90ad 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -3,15 +3,18 @@ // Version: 2.1.0 // ----------------------------------------------------- -@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); - @boxShadow: 1px 1px 1px rgba(0, 0, 0, 0.2); // TYPOGRAPHY // ----------------------------------------------------- -h6 { - color: @headingsColor; +@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); + +// SCAFFOLDING +// ----------------------------------------------------- + +hr { + border-bottom: none; } // NAVBAR @@ -151,9 +154,7 @@ h6 { .nav-header { color: rgba(255, 255, 255, 0.7); } - } - } } @@ -359,6 +360,55 @@ div.subnav { } } +.breadcrumb { + .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); + border: 0px solid transparent; + + li { + padding-top: 5px; + text-shadow: none; + } + + a { + text-shadow: none; + } + + a:hover { + text-decoration: none; + } +} + +.pagination { + + li > a { + padding: 4px 14px 0; + color: @textColor; + + &:hover { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } + } + + li.active > a { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } +} + + +// BUTTONS +// ----------------------------------------------------- + +.btn { + padding-top: .6em; + font-family: @headingsFontFamily; + font-weight: bold; +} + +// TABLES +// ----------------------------------------------------- + // FORMS // ----------------------------------------------------- @@ -383,29 +433,18 @@ legend { line-height: 16px; } -// BUTTONS +// DROPDOWNS // ----------------------------------------------------- -.btn { - padding-top: .6em; - font-family: @headingsFontFamily; - font-weight: bold; -} - -// MODALS +// ALERTS, LABELS, BADGES // ----------------------------------------------------- -.modal-header { - border-bottom: none; -} - -.modal-header, -.modal-body { - background-color: @navbarBackground; -} - -.modal-footer { - background-color: @bodyBackground; +.label { + padding: 4px 4px 3px; + margin-left: 1px; + margin-right: 1px; + line-height: 26px; + font-weight: normal; } // MISCELLANEOUS @@ -416,20 +455,9 @@ i[class^="icon-"]{ vertical-align: -2px; } -hr { - border-bottom: none; -} - -.progress { - #gradient > .vertical(#e0e0e0, #e8e8e8); -} - -.label { - padding: 4px 4px 3px; - margin-left: 1px; - margin-right: 1px; - line-height: 26px; - font-weight: normal; +.well { + .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); + border: none; } .hero-unit { @@ -437,52 +465,34 @@ hr { .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); } -.well { - .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); - border: none; -} - .thumbnail { padding: 10px; background-color: @white; } -.breadcrumb { - .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); - border: 0px solid transparent; - - li { - padding-top: 5px; - text-shadow: none; - } - - a { - text-shadow: none; - } - - a:hover { - text-decoration: none; - } +.progress { + #gradient > .vertical(#e0e0e0, #e8e8e8); } -.pagination { +.modal { - li > a { - padding: 4px 14px 0; - color: @textColor; + &-header { + border-bottom: none; + } - &:hover { - background-color: @dropdownLinkBackgroundHover; - color: @linkColor; - } + &-header, + &-body { + background-color: @navbarBackground; } - li.active > a { - background-color: @dropdownLinkBackgroundHover; - color: @linkColor; + &-footer { + background-color: @bodyBackground; } } +// MEDIA QUERIES +// ----------------------------------------------------- + @media (max-width: 979px) { .nav-collapse.collapse .navbar-form, |