public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing login button on circular.

Browse source
This commit is contained in:
Samuel Clay 2013-02-06 12:49:46 -08:00
parent facdb8db1c
commit e0921de100
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
media/css/circular/css/social_page.css
View file

@ -413,14 +413,14 @@ blockquote {
background: url('/../../../media/img/circular/header/icon_follow_active.png?1360004615') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-circular-tab {
.NB-header .NB-header-tabs .NB-header-tab.NB-user-tab {
background: url('/../../../media/img/circular/header/icon_circular_active.png?1360004615') no-repeat -9999px -9999px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-circular-tab .NB-icon {
.NB-header .NB-header-tabs .NB-header-tab.NB-user-tab .NB-icon {
background: url('/../../../media/img/circular/header/icon_circular.png?1360004615') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-active.NB-circular-tab .NB-icon, .NB-header .NB-header-tabs .NB-header-tab.NB-circular-tab:hover .NB-icon {
.NB-header .NB-header-tabs .NB-header-tab.NB-active.NB-user-tab .NB-icon, .NB-header .NB-header-tabs .NB-header-tab.NB-user-tab:hover .NB-icon {
background: url('/../../../media/img/circular/header/icon_circular_active.png?1360004615') no-repeat center bottom;
background-size: 17px;
}

8
media/css/circular/sass/social_page.scss
View file

@ -384,16 +384,16 @@ blockquote {
background-size: 17px;
}
&.NB-circular-tab {
&.NB-user-tab {
background: image-url('header/icon_circular_active.png') no-repeat -9999px -9999px;
}
&.NB-circular-tab .NB-icon {
&.NB-user-tab .NB-icon {
background: image-url('header/icon_circular.png') no-repeat center bottom;
background-size: 17px;
}
&.NB-active.NB-circular-tab .NB-icon,
&.NB-circular-tab:hover .NB-icon {
&.NB-active.NB-user-tab .NB-icon,
&.NB-user-tab:hover .NB-icon {
background: image-url('header/icon_circular_active.png') no-repeat center bottom;
background-size: 17px;
}

8
media/js/newsblur/social_page/social_page_login_view.js
View file

@ -17,7 +17,7 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
},
setup_login_popover: function() {
this.login_popover = this.$(".NB-circular-tab").clickover({
this.login_popover = this.$(".NB-user-tab").clickover({
html: true,
placement: "bottom",
content: this.$(".NB-circular-popover-content").html(),
@ -28,12 +28,12 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
},
on_show_popover: function() {
this.$('.NB-circular-tab').addClass('NB-active');
this.$('.NB-user-tab').addClass('NB-active');
this.$('.popover input[name=login_username]').focus();
},
on_hide_popover: function() {
this.$('.NB-circular-tab').removeClass('NB-active');
this.$('.NB-user-tab').removeClass('NB-active');
},
toggle_login_dialog: function(options) {
@ -60,9 +60,11 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
});
});
$button.addClass('open');
this.toggle_login_dialog();
} else {
$button.removeClass('open');
}
},
// ==========

2
templates/social/social_page.xhtml
View file

@ -129,7 +129,7 @@
</ul>
</div>
{% else %}
<a class="NB-header-tab NB-circular-tab" href="#">
<a class="NB-header-tab NB-user-tab" href="#">
<div class="NB-tab-inner">
<span class="NB-icon"></span>
<img src="{{ MEDIA_URL }}img/icons/silk/bullet_arrow_down.png" class="NB-arrow" />