Skip to content

Commit

Permalink
tab styling
Browse files Browse the repository at this point in the history
  • Loading branch information
kevzettler committed Apr 2, 2012
1 parent ab4e6de commit ed2bbb2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/backbone/kandan.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ window.Kandan =
$("#channels").tabs 'option', 'tabTemplate', '''
<li>
<a href="#{href}">#{label}</a>
<span class="ui-icon ui-icon-close">x</span>
<a href="#" class="ui-icon ui-icon-close">x</a>
</li>
'''

Expand Down
16 changes: 14 additions & 2 deletions app/assets/stylesheets/_chat_area.sass
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,19 @@
background: $active-tab-bg
border: none
a
color: $active-tab-color
color: $active-tab-color !important

html body .ui-tabs .ui-tabs-nav li
top: 3px !important
margin-right: 5px

a.ui-icon-close
margin-top: 4px
color: $header-bg-1
cursor: hover

.create_channel
cursor: hover

.ui-tabs
+border-radius(0px)
Expand All @@ -18,7 +30,7 @@
border: none
.ui-tabs-nav
position: fixed
top: 2px
top: 0px
left: 90px
z-index: 20
li a
Expand Down
7 changes: 5 additions & 2 deletions app/assets/templates/chatarea.jst.eco
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<ul>
<% for channel in @channels.models: %>
<li>
<a href="#<%= "channels-#{channel.get('id')}" %>"><%= channel.get('name') %></a><span class="ui-icon ui-icon-close">x</span>
<a href="#<%= "channels-#{channel.get('id')}" %>"><%= channel.get('name') %></a>
<a href="#" class="ui-icon ui-icon-close">x</a>
</li>
<% end %>
<li><div class="create_channel">+</div></li>
<li>
<a href="#" class="create_channel">+</a>
</li>
</ul>

0 comments on commit ed2bbb2

Please sign in to comment.