Skip to content

Commit 3aabbc6

Browse files
committed
Merge branch 'master' of https://github.com/ImagingDataCommons/IDC-WebApp into idc-test
2 parents d11bf3c + ac12079 commit 3aabbc6

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

static/css/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ nav, .site-header {
11151115
vertical-align: middle;
11161116
padding: 18px 15px 19px 15px;
11171117
}
1118-
@media(max-width: 1264px) {
1118+
@media(max-width: 1344px) {
11191119
.navbar-item {
11201120
padding: 8px 15px 8px 15px;
11211121
}

static/css/vendor.css

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3644,7 +3644,7 @@ tbody.collapse.in {
36443644
.nav-justified > .dropdown .dropdown-menu {
36453645
top: auto;
36463646
left: auto; }
3647-
@media (min-width: 1265px) {
3647+
@media (min-width: 1345px) {
36483648
.nav-justified > li, .nav-tabs.nav-justified > li {
36493649
display: table-cell;
36503650
width: 1%; }
@@ -3660,7 +3660,7 @@ tbody.collapse.in {
36603660
.nav-tabs-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:hover,
36613661
.nav-tabs-justified > .active > a:focus, .nav-tabs.nav-justified > .active > a:focus {
36623662
border: 1px solid #ddd; }
3663-
@media (min-width: 1265px) {
3663+
@media (min-width: 1345px) {
36643664
.nav-tabs-justified > li > a, .nav-tabs.nav-justified > li > a {
36653665
border-bottom: 1px solid #ddd;
36663666
border-radius: 2px 2px 0 0; }
@@ -3690,7 +3690,7 @@ tbody.collapse.in {
36903690
display: table; }
36913691
.navbar:after {
36923692
clear: both; }
3693-
@media (min-width: 1265px) {
3693+
@media (min-width: 1345px) {
36943694
.navbar {
36953695
border-radius: 2px; } }
36963696

@@ -3701,7 +3701,7 @@ tbody.collapse.in {
37013701
.navbar-header:after {
37023702
clear: both; }
37033703

3704-
@media (min-width: 1265px) {
3704+
@media (min-width: 1345px) {
37053705
.navbar-header {
37063706
float: left; } }
37073707

@@ -3719,7 +3719,7 @@ tbody.collapse.in {
37193719
clear: both; }
37203720
.navbar-collapse.in {
37213721
overflow-y: auto; }
3722-
@media (min-width: 1265px) {
3722+
@media (min-width: 1345px) {
37233723
.navbar-collapse {
37243724
width: auto;
37253725
border-top: 0;
@@ -3751,7 +3751,7 @@ tbody.collapse.in {
37513751
.container-fluid > .navbar-collapse {
37523752
margin-right: -15px;
37533753
margin-left: -15px; }
3754-
@media (min-width: 1265px) {
3754+
@media (min-width: 1345px) {
37553755
.container > .navbar-header,
37563756
.container > .navbar-collapse,
37573757
.container-fluid > .navbar-header,
@@ -3762,7 +3762,7 @@ tbody.collapse.in {
37623762
.navbar-static-top {
37633763
z-index: 1000;
37643764
border-width: 0 0 1px; }
3765-
@media (min-width: 1265px) {
3765+
@media (min-width: 1345px) {
37663766
.navbar-static-top {
37673767
border-radius: 0; } }
37683768

@@ -3772,7 +3772,7 @@ tbody.collapse.in {
37723772
right: 0;
37733773
left: 0;
37743774
z-index: 1030; }
3775-
@media (min-width: 1265px) {
3775+
@media (min-width: 1345px) {
37763776
.navbar-fixed-top,
37773777
.navbar-fixed-bottom {
37783778
border-radius: 0; } }
@@ -3796,7 +3796,7 @@ tbody.collapse.in {
37963796
text-decoration: none; }
37973797
.navbar-brand > img {
37983798
display: block; }
3799-
@media (min-width: 1265px) {
3799+
@media (min-width: 1345px) {
38003800
.navbar > .container .navbar-brand,
38013801
.navbar > .container-fluid .navbar-brand {
38023802
margin-left: -15px; } }
@@ -3822,7 +3822,7 @@ tbody.collapse.in {
38223822
background-color: #0c2127}
38233823
.navbar-toggle .icon-bar + .icon-bar {
38243824
margin-top: 4px; }
3825-
@media (min-width: 1265px) {
3825+
@media (min-width: 1345px) {
38263826
.navbar-toggle {
38273827
display: none; } }
38283828

@@ -3848,7 +3848,7 @@ tbody.collapse.in {
38483848
line-height: 20px; }
38493849
.navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus {
38503850
background-image: none; } }
3851-
@media (min-width: 1265px) {
3851+
@media (min-width: 1345px) {
38523852
.navbar-nav {
38533853
float: left;
38543854
margin: 0; }
@@ -3953,7 +3953,7 @@ tbody.collapse.in {
39533953
margin-left: 15px;
39543954
margin-right: 15px; } }
39553955

3956-
@media (min-width: 1265px) {
3956+
@media (min-width: 1345px) {
39573957
.navbar-left {
39583958
float: left !important; }
39593959
.navbar-right {

0 commit comments

Comments
 (0)