Skip to content

Commit

Permalink
Merge pull request #431 from scouttyg/chatbar-fixes
Browse files Browse the repository at this point in the history
Fixed slight Chat tab bar alignment issues
  • Loading branch information
scouttyg committed Mar 14, 2015
2 parents 547764f + 89b3d7d commit 0fecfe9
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions app/assets/stylesheets/layout/_nav.sass
Expand Up @@ -79,7 +79,7 @@
+box-shadow(none)
min-height: 100%
overflow-x: auto
padding-top: 5px
padding-top: 10px
white-space: nowrap
+hide-scrollbar

Expand All @@ -99,6 +99,8 @@
color: #585d5f
font-weight: bold

&.destroyable a
margin-right: 18px
.close_channel
color: #AEB9BD

Expand Down Expand Up @@ -132,7 +134,7 @@
@media (min-width: $medium)
background: image-url('tabs/tab-inactive-middle.png') bottom repeat-x
color: #585d5f
line-height: 30px
line-height: 25px
margin: 0 30px

&:before
Expand All @@ -153,7 +155,7 @@
&,
&:before,
&:after
height: 30px
height: 25px
display: inline-block

&.active
Expand All @@ -167,6 +169,7 @@

.close_channel
width: auto
position: relative
right: -5px
position: absolute
right: 0px
top: 6px
z-index: 100

0 comments on commit 0fecfe9

Please sign in to comment.