From 40aa75e14d93ea3f2683528858b3fb43fe6c6d60 Mon Sep 17 00:00:00 2001 From: "jan@jan-wieners.de" Date: Thu, 1 Oct 2015 17:17:19 +0200 Subject: [PATCH 1/5] Changed bootstrap's default navigation bar breakpoint to 920px to make sure that navbar is displayed well on small screen resolutions. --- dist/css/bootstrap-theme.min.css | 2 +- src/css/bootstrap-theme.css | 48 +++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dist/css/bootstrap-theme.min.css b/dist/css/bootstrap-theme.min.css index 9895d60..60c9677 100644 --- a/dist/css/bootstrap-theme.min.css +++ b/dist/css/bootstrap-theme.min.css @@ -2,4 +2,4 @@ * Bootstrap v3.3.4 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{background-color:rgba(85,114,161,.9)}.navbar-default .navbar-brand,.navbar-default .navbar-nav>li>a{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file + */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);@media (max-width:920px){.navbar-header{float:none}.navbar-toggle{display:block}.navbar-collapse{border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:7.5px -15px}.navbar-nav>li{float:none}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px}}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file diff --git a/src/css/bootstrap-theme.css b/src/css/bootstrap-theme.css index 405db27..33e96d8 100644 --- a/src/css/bootstrap-theme.css +++ b/src/css/bootstrap-theme.css @@ -5,6 +5,43 @@ */ @import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext); +/* Change bootstrap's default breakpoint */ +@media (max-width: 920px) { + + .navbar-header { + + float: none; + } + .navbar-toggle { + + display: block; + } + .navbar-collapse { + + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + } + .navbar-collapse.collapse { + + display: none !important; + } + .navbar-nav { + + float: none !important; + margin: 7.5px -15px; + } + .navbar-nav>li { + + float: none; + } + .navbar-nav>li>a { + + padding-top: 10px; + padding-bottom: 10px; + } +} + + body { font-family: 'Source Sans Pro',Arial,Helvetica,sans-serif; } @@ -14,11 +51,15 @@ a { } .navbar-default { - background-color: rgba(85, 114, 161, 0.9); + + border: 0; + background-color: rgba(85, 114, 161, 0.9); } .navbar-default .navbar-nav > li > a { + color: #fff; + line-height: 23px; } .navbar-default .navbar-brand { @@ -47,6 +88,11 @@ a { color: #fff; } +.navbar-form { + + padding-top: 1px; +} + .idai-footer { margin-top: 10px; padding: 30px; From 540d6fed238cea5a1aa998a9efe1b58b99858698 Mon Sep 17 00:00:00 2001 From: "jan@jan-wieners.de" Date: Thu, 1 Oct 2015 17:32:59 +0200 Subject: [PATCH 2/5] Changed colour scheme of collapse button. --- dist/css/bootstrap-theme.min.css | 2 +- src/css/bootstrap-theme.css | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dist/css/bootstrap-theme.min.css b/dist/css/bootstrap-theme.min.css index 60c9677..225c849 100644 --- a/dist/css/bootstrap-theme.min.css +++ b/dist/css/bootstrap-theme.min.css @@ -2,4 +2,4 @@ * Bootstrap v3.3.4 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);@media (max-width:920px){.navbar-header{float:none}.navbar-toggle{display:block}.navbar-collapse{border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:7.5px -15px}.navbar-nav>li{float:none}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px}}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file + */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);@media (max-width:920px){.navbar-default{padding:7px 0 0}.navbar-header{float:none}.navbar-toggle{display:block}.navbar-collapse{border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:7px -15px}.navbar-nav>li{float:none}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px}}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#6E8BBA}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file diff --git a/src/css/bootstrap-theme.css b/src/css/bootstrap-theme.css index 33e96d8..361e813 100644 --- a/src/css/bootstrap-theme.css +++ b/src/css/bootstrap-theme.css @@ -8,32 +8,43 @@ /* Change bootstrap's default breakpoint */ @media (max-width: 920px) { + .navbar-default { + + padding: 7px 0 0 0; + } + .navbar-header { float: none; } + .navbar-toggle { display: block; } + .navbar-collapse { border-top: 1px solid transparent; box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); } + .navbar-collapse.collapse { display: none !important; } + .navbar-nav { float: none !important; - margin: 7.5px -15px; + margin: 7px -15px; } + .navbar-nav>li { float: none; } + .navbar-nav>li>a { padding-top: 10px; @@ -138,6 +149,21 @@ a { left: 25px; } +.navbar-default .navbar-toggle { + + border-color: #fff; +} + +.navbar-default .navbar-toggle .icon-bar { + + background-color: #fff; +} + +.navbar-default .navbar-toggle:focus, .navbar-default .navbar-toggle:hover { + + background-color: #6E8BBA; +} + /* as described in angular-ui bootstrap guide */ .nav, .pagination, .carousel, .panel-title a { cursor: pointer; From e674efc57ab97bf8aea1ddd7c378532bac1cae24 Mon Sep 17 00:00:00 2001 From: Jan Wieners Date: Fri, 2 Oct 2015 17:24:40 +0200 Subject: [PATCH 3/5] Changed display of navbar items in medium-sized resolutions. --- dist/css/bootstrap-theme.min.css | 2 +- src/css/bootstrap-theme.css | 37 ++++++++++++++++++------ src/partials/directives/idai-navbar.html | 3 +- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dist/css/bootstrap-theme.min.css b/dist/css/bootstrap-theme.min.css index 225c849..0d91263 100644 --- a/dist/css/bootstrap-theme.min.css +++ b/dist/css/bootstrap-theme.min.css @@ -2,4 +2,4 @@ * Bootstrap v3.3.4 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);@media (max-width:920px){.navbar-default{padding:7px 0 0}.navbar-header{float:none}.navbar-toggle{display:block}.navbar-collapse{border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:7px -15px}.navbar-nav>li{float:none}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px}}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#6E8BBA}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file + */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);.navbar-default .navbar-collapse,.navbar-default .navbar-form{border:none}@media (max-width:925px){.navbar-default{padding:0;margin:0}.navbar-header{float:none}.navbar-toggle{display:block;padding:7px;margin-top:10px}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:15px;padding-right:15px}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:0}.navbar-nav>li{float:none}.navbar-form{padding-top:15px}}#kleinerGreif{height:36px;width:36px;margin-top:-8px;margin-bottom:-8px}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{box-shadow:none;padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#6E8BBA}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file diff --git a/src/css/bootstrap-theme.css b/src/css/bootstrap-theme.css index 361e813..47a448c 100644 --- a/src/css/bootstrap-theme.css +++ b/src/css/bootstrap-theme.css @@ -5,12 +5,23 @@ */ @import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext); +.navbar-default .navbar-collapse, .navbar-default .navbar-form { + + border: none; +} + +.navbar-form { + + box-shadow: none; +} + /* Change bootstrap's default breakpoint */ -@media (max-width: 920px) { +@media (max-width: 925px) { .navbar-default { - padding: 7px 0 0 0; + padding: 0; + margin: 0; } .navbar-header { @@ -21,12 +32,14 @@ .navbar-toggle { display: block; + padding: 7px 7px; + margin-top: 10px; } - .navbar-collapse { + .navbar-fixed-bottom .navbar-collapse, .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse { - border-top: 1px solid transparent; - box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + padding-left: 15px; + padding-right: 15px; } .navbar-collapse.collapse { @@ -37,7 +50,7 @@ .navbar-nav { float: none !important; - margin: 7px -15px; + margin: 0; } .navbar-nav>li { @@ -45,13 +58,19 @@ float: none; } - .navbar-nav>li>a { + .navbar-form { - padding-top: 10px; - padding-bottom: 10px; + padding-top: 15px; } } +#kleinerGreif { + + height: 36px; + width: 36px; + margin-top: -8px; + margin-bottom: -8px; +} body { font-family: 'Source Sans Pro',Arial,Helvetica,sans-serif; diff --git a/src/partials/directives/idai-navbar.html b/src/partials/directives/idai-navbar.html index 4bcc2b5..b9bb7a2 100644 --- a/src/partials/directives/idai-navbar.html +++ b/src/partials/directives/idai-navbar.html @@ -4,8 +4,7 @@
  • - +
      From e7b00a5cc6fd19a922b329683b4ae532da264bfa Mon Sep 17 00:00:00 2001 From: "jan@jan-wieners.de" Date: Sat, 3 Oct 2015 17:15:39 +0200 Subject: [PATCH 4/5] Finished work on navigation bar: Navigation bar now looks good in small resolutions. --- dist/css/bootstrap-theme.min.css | 2 +- src/css/bootstrap-theme.css | 96 +++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dist/css/bootstrap-theme.min.css b/dist/css/bootstrap-theme.min.css index 0d91263..dea22fd 100644 --- a/dist/css/bootstrap-theme.min.css +++ b/dist/css/bootstrap-theme.min.css @@ -2,4 +2,4 @@ * Bootstrap v3.3.4 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);.navbar-default .navbar-collapse,.navbar-default .navbar-form{border:none}@media (max-width:925px){.navbar-default{padding:0;margin:0}.navbar-header{float:none}.navbar-toggle{display:block;padding:7px;margin-top:10px}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:15px;padding-right:15px}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:0}.navbar-nav>li{float:none}.navbar-form{padding-top:15px}}#kleinerGreif{height:36px;width:36px;margin-top:-8px;margin-bottom:-8px}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{box-shadow:none;padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#6E8BBA}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file + */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);.navbar-default .navbar-collapse,.navbar-default .navbar-form{border:none}.navbar-form{box-shadow:none}@media (max-width:925px){.navbar-default{padding:0;margin:0}.navbar-header{float:none}.navbar-toggle{display:block;padding:7px;margin-top:10px;margin-right:10px}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:15px;padding-right:15px}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:0}.navbar-nav>li{float:none}}@media (min-width:768px) and (max-width:925px){.navbar-form{margin:8px -15px;padding:10px 15px}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control{float:left;margin-bottom:0;position:relative;width:100%;z-index:2}.navbar-left{float:none!important}}@media (max-width:767px){.navbar-nav>li>a{padding-bottom:15px;padding-top:15px}.navbar-collapse{box-shadow:none}.navbar .nav>li>.dropdown-menu::before{border-bottom:7px solid #fff;border-left:7px solid transparent;border-right:7px solid transparent;content:"";display:inline-block;left:25px;position:absolute;top:-7px}.navbar-nav>li>.dropdown-menu{border-top-left-radius:0;border-top-right-radius:0;margin-top:0}.open>.dropdown-menu{display:block}.dropdown-menu{background-clip:padding-box!important;background-color:#fff!important;border:1px solid rgba(0,0,0,.15)!important;box-shadow:0 6px 12px rgba(0,0,0,.176)!important;font-size:14px!important;left:0;list-style:none;margin:0!important;min-width:160px!important;padding:5px 0!important;position:absolute!important;text-align:left!important;top:100%!important;z-index:1000!important}.dropdown-menu>li>a{clear:both!important;color:#333!important;display:block!important;font-weight:400!important;line-height:1.42857!important;padding:3px 20px!important;white-space:nowrap!important}}#kleinerGreif{height:36px;width:36px;margin-top:-8px;margin-bottom:-8px}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#6E8BBA}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file diff --git a/src/css/bootstrap-theme.css b/src/css/bootstrap-theme.css index 47a448c..20f2abe 100644 --- a/src/css/bootstrap-theme.css +++ b/src/css/bootstrap-theme.css @@ -15,7 +15,6 @@ box-shadow: none; } -/* Change bootstrap's default breakpoint */ @media (max-width: 925px) { .navbar-default { @@ -34,6 +33,7 @@ display: block; padding: 7px 7px; margin-top: 10px; + margin-right: 10px; } .navbar-fixed-bottom .navbar-collapse, .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse { @@ -57,13 +57,106 @@ float: none; } +} + +/* Spread form input item over whole width */ +@media (min-width: 768px) and (max-width: 925px) { .navbar-form { + margin: 8px -15px; + padding: 10px 15px; + } + + .input-group .form-control, .input-group-addon, .input-group-btn { + + display: table-cell; + } + + .input-group .form-control { + float: left; + margin-bottom: 0; + position: relative; + width: 100%; + z-index: 2; + } + + .navbar-left { + float: none !important; + } +} + +/* / First breakpoint */ + +/* Second breakpoint */ +@media (max-width: 767px) { + + .navbar-nav > li > a { + + padding-bottom: 15px; padding-top: 15px; } + + .navbar-collapse { + + box-shadow: none; + } + + .navbar .nav > li > .dropdown-menu::before { + + border-bottom: 7px solid #fff; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + content: ""; + display: inline-block; + left: 25px; + position: absolute; + top: -7px; + } + + .navbar-nav > li > .dropdown-menu { + + border-top-left-radius: 0; + border-top-right-radius: 0; + margin-top: 0; + } + + .open > .dropdown-menu { + display: block; + } + + .dropdown-menu { + + background-clip: padding-box !important; + background-color: #fff !important; + border: 1px solid rgba(0, 0, 0, 0.15) !important; + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176) !important; + font-size: 14px !important; + left: 0; + list-style: outside none none; + margin: 0 !important; + min-width: 160px !important; + padding: 5px 0 !important; + position: absolute !important; + text-align: left !important; + top: 100% !important; + z-index: 1000 !important; + } + + .dropdown-menu > li > a { + + clear: both !important; + color: #333 !important; + display: block !important; + font-weight: 400 !important; + line-height: 1.42857 !important; + padding: 3px 20px !important; + white-space: nowrap !important; + } } +/* / Second breakpoint */ + #kleinerGreif { height: 36px; @@ -158,6 +251,7 @@ a { } .navbar .nav > li > .dropdown-menu:before { + content: ''; display: inline-block; border-left: 7px solid transparent; From eba063b5c39e2b64657ffd8f36b49eb30c13f500 Mon Sep 17 00:00:00 2001 From: "jan@jan-wieners.de" Date: Sun, 4 Oct 2015 16:55:46 +0200 Subject: [PATCH 5/5] Bugfix: Ensure that dropdown symbol in navigation bar stays white. --- dist/css/bootstrap-theme.min.css | 2 +- src/css/bootstrap-theme.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dist/css/bootstrap-theme.min.css b/dist/css/bootstrap-theme.min.css index dea22fd..28514ad 100644 --- a/dist/css/bootstrap-theme.min.css +++ b/dist/css/bootstrap-theme.min.css @@ -2,4 +2,4 @@ * Bootstrap v3.3.4 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);.navbar-default .navbar-collapse,.navbar-default .navbar-form{border:none}.navbar-form{box-shadow:none}@media (max-width:925px){.navbar-default{padding:0;margin:0}.navbar-header{float:none}.navbar-toggle{display:block;padding:7px;margin-top:10px;margin-right:10px}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:15px;padding-right:15px}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:0}.navbar-nav>li{float:none}}@media (min-width:768px) and (max-width:925px){.navbar-form{margin:8px -15px;padding:10px 15px}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control{float:left;margin-bottom:0;position:relative;width:100%;z-index:2}.navbar-left{float:none!important}}@media (max-width:767px){.navbar-nav>li>a{padding-bottom:15px;padding-top:15px}.navbar-collapse{box-shadow:none}.navbar .nav>li>.dropdown-menu::before{border-bottom:7px solid #fff;border-left:7px solid transparent;border-right:7px solid transparent;content:"";display:inline-block;left:25px;position:absolute;top:-7px}.navbar-nav>li>.dropdown-menu{border-top-left-radius:0;border-top-right-radius:0;margin-top:0}.open>.dropdown-menu{display:block}.dropdown-menu{background-clip:padding-box!important;background-color:#fff!important;border:1px solid rgba(0,0,0,.15)!important;box-shadow:0 6px 12px rgba(0,0,0,.176)!important;font-size:14px!important;left:0;list-style:none;margin:0!important;min-width:160px!important;padding:5px 0!important;position:absolute!important;text-align:left!important;top:100%!important;z-index:1000!important}.dropdown-menu>li>a{clear:both!important;color:#333!important;display:block!important;font-weight:400!important;line-height:1.42857!important;padding:3px 20px!important;white-space:nowrap!important}}#kleinerGreif{height:36px;width:36px;margin-top:-8px;margin-bottom:-8px}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#6E8BBA}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file + */@import url(////fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext);.navbar-default .navbar-collapse,.navbar-default .navbar-form{border:none}.navbar-form{box-shadow:none}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#fff}@media (max-width:925px){.navbar-default{padding:0;margin:0}.navbar-header{float:none}.navbar-toggle{display:block;padding:7px;margin-top:10px;margin-right:10px}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:15px;padding-right:15px}.navbar-collapse.collapse{display:none!important}.navbar-nav{float:none!important;margin:0}.navbar-nav>li{float:none}}@media (min-width:768px) and (max-width:925px){.navbar-form{margin:8px -15px;padding:10px 15px}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control{float:left;margin-bottom:0;position:relative;width:100%;z-index:2}.navbar-left{float:none!important}}@media (max-width:767px){.navbar-nav>li>a{padding-bottom:15px;padding-top:15px}.navbar-collapse{box-shadow:none}.navbar .nav>li>.dropdown-menu::before{border-bottom:7px solid #fff;border-left:7px solid transparent;border-right:7px solid transparent;content:"";display:inline-block;left:25px;position:absolute;top:-7px}.navbar-nav>li>.dropdown-menu{border-top-left-radius:0;border-top-right-radius:0;margin-top:0}.open>.dropdown-menu{display:block}.dropdown-menu{background-clip:padding-box!important;background-color:#fff!important;border:1px solid rgba(0,0,0,.15)!important;box-shadow:0 6px 12px rgba(0,0,0,.176)!important;font-size:14px!important;left:0;list-style:none;margin:0!important;min-width:160px!important;padding:5px 0!important;position:absolute!important;text-align:left!important;top:100%!important;z-index:1000!important}.dropdown-menu>li>a{clear:both!important;color:#333!important;display:block!important;font-weight:400!important;line-height:1.42857!important;padding:3px 20px!important;white-space:nowrap!important}}#kleinerGreif{height:36px;width:36px;margin-top:-8px;margin-bottom:-8px}body{font-family:'Source Sans Pro',Arial,Helvetica,sans-serif}a{color:#37588e}.navbar-default{border:0;background-color:rgba(85,114,161,.9)}.navbar-default .navbar-nav>li>a{color:#fff;line-height:23px}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a.btn-default{color:#777}.navbar-default .text-primary{color:#ccc}.navbar-default a:hover .navbar-brand{color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>li>a:hover{background-color:rgba(119,142,180,.9);color:#fff}.navbar-form{padding-top:1px}.idai-footer{margin-top:10px;padding:30px;background-color:#e2e2e2}.form-control:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#89B5FF}.form-control:focus~.input-group-btn .btn-default{border:1px solid #89B5FF}.small,small{font-size:90%}.btn-primary{background-color:#5283d2;border-color:#4A76BD}.btn-primary:hover{background-color:#5572a1;border-color:#4C6791}.btn-group-sm>.btn,.btn-sm{font-size:13px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #fff;position:absolute;top:-7px;left:25px}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#6E8BBA}.carousel,.nav,.pagination,.panel-title a{cursor:pointer}.loading{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;display:block;width:20px;height:20px;margin:0 auto;border-width:1px;border-style:solid;border-color:transparent #428bca #428bca transparent;border-radius:10px;-webkit-animation:spin 1.5s linear infinite;animation:spin 1.5s linear infinite}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(720deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(720deg)}}.picker-modal .list-group-item.preselected{background-color:#f5f5f5}.alert{padding:0}.alert .alert-message{padding:15px}.alert.ng-enter,.alert.ng-leave,.alert.ng-move{transition:all .5s linear;overflow:hidden}.alert.ng-enter,.alert.ng-leave.ng-leave-active,.alert.ng-move{max-height:0;opacity:0}.alert.ng-enter.ng-enter-active,.alert.ng-leave,.alert.ng-move.ng-move-active{max-height:100px;opacity:1} \ No newline at end of file diff --git a/src/css/bootstrap-theme.css b/src/css/bootstrap-theme.css index 20f2abe..19b1345 100644 --- a/src/css/bootstrap-theme.css +++ b/src/css/bootstrap-theme.css @@ -15,6 +15,11 @@ box-shadow: none; } +.navbar-default .navbar-nav > li > a:focus, .navbar-default .navbar-nav > li > a:hover { + + color: #fff; +} + @media (max-width: 925px) { .navbar-default {