Merge pull request #578 from glowing-bear/ui-fixes

Fix broken < 1400px display and broken light color theme
This commit is contained in:
Lorenz Hübschle-Schneider 2015-03-25 18:10:31 +01:00
commit 0e0484b5f0
3 changed files with 26 additions and 7 deletions

View file

@ -213,19 +213,13 @@ input[type=text], input[type=password], #sendMessage, .badge {
overflow: hidden;
}
.nav-pills {
font-size: 14px;
}
.nav-pills li+li {
margin-top: 0;
}
.nav-pills li:nth-child(2n) {
background: #232323;
}
.nav-pills > li > a {
border-radius: 0;
color: #ddd;
padding: 5px 10px;
}
.nav-pills > li > a:hover, .nav-pills > li > a:hover span {
color: #222;
@ -580,6 +574,15 @@ img.emojione {
.content[sidebar-state=visible] .footer {
padding-left: 200px;
}
.nav-pills {
font-size: 14px;
}
.nav-pills li a {
padding: 10px 15px;
}
#nicklist {
width: 140px;
}
@ -670,6 +673,14 @@ img.emojione {
min-height: 0%;
}
.nav-pills {
font-size: 14px;
}
.nav-pills li a {
padding: 10px 15px;
}
#bufferlines {
height: 100%;
padding-bottom: 0;

View file

@ -65,6 +65,10 @@ input[type=text], input[type=password], #sendMessage, .badge {
color: #aaa;
}
.nav-pills li:nth-child(2n) {
background: #232323;
}
.nav-pills > li > a {
color: #ddd;
}

View file

@ -61,6 +61,10 @@ select.form-control, select option, input[type=text], input[type=password], #sen
color: #aaa;
}
.nav-pills li:nth-child(2n) {
background: #e1e1e1;
}
.nav-pills > li > a {
color: #222;
}