diff --git a/app/assets/javascripts/app/views/aspect_view.js b/app/assets/javascripts/app/views/aspect_view.js
index 3fba4865c..66cc4a945 100644
--- a/app/assets/javascripts/app/views/aspect_view.js
+++ b/app/assets/javascripts/app/views/aspect_view.js
@@ -8,7 +8,7 @@ app.views.Aspect = app.views.Base.extend({
className: 'hoverable',
events: {
- 'click .icons-check_yes_ok+a': 'toggleAspect'
+ 'click .entypo.check+a': 'toggleAspect'
},
toggleAspect: function(evt) {
diff --git a/app/assets/javascripts/app/views/aspects_list_view.js b/app/assets/javascripts/app/views/aspects_list_view.js
index 6af4d41cc..29cdf45a5 100644
--- a/app/assets/javascripts/app/views/aspects_list_view.js
+++ b/app/assets/javascripts/app/views/aspects_list_view.js
@@ -58,9 +58,9 @@ app.views.AspectsList = app.views.Base.extend({
this.collection.each(function(aspect) {
var element = this.$("li[data-aspect_id="+aspect.get('id')+"]");
if (aspect.get('selected')) {
- element.find('.icons-check_yes_ok').addClass('selected');
+ element.find('.entypo.check').addClass('selected');
} else {
- element.find('.icons-check_yes_ok').removeClass('selected');
+ element.find('.entypo.check').removeClass('selected');
}
});
},
diff --git a/app/assets/stylesheets/aspects.scss b/app/assets/stylesheets/aspects.scss
index 257c0dd15..1aac43f70 100644
--- a/app/assets/stylesheets/aspects.scss
+++ b/app/assets/stylesheets/aspects.scss
@@ -31,13 +31,6 @@
}
}
-.modify_aspect {
- background: url("icons/pencil.png") no-repeat;
- width: 12px;
- height: 12px;
- display: inline-block;
-}
-
#new_aspect {
.checkbox {
margin: 0px;
diff --git a/app/assets/stylesheets/leftnavbar.scss b/app/assets/stylesheets/leftnavbar.scss
index 4c5ca103a..136297604 100644
--- a/app/assets/stylesheets/leftnavbar.scss
+++ b/app/assets/stylesheets/leftnavbar.scss
@@ -41,15 +41,34 @@
text-overflow: ellipsis;
}
- .action {
- width: 12px;
- height: 12px;
- display: none;
- float: right;
- margin: 3px;
+ #aspects_list, #tags_list {
+ .hoverable > .action {
+ visibility: hidden;
+ float: right;
+ margin: 0 3px;
+ }
+
+ .hoverable:hover > .action {
+ visibility: visible;
+ }
}
- .hoverable:hover > .action {
- display: block;
+ #aspects_list {
+ .entypo.check {
+ float: left;
+ visibility: hidden;
+ &.selected { visibility: visible; }
+ }
+
+ .selected + a {
+ color: #333333;
+ }
+ }
+
+ #tags_list {
+ .delete_tag_following {
+ font-size: 20px;
+ line-height: 15px;
+ }
}
}
diff --git a/app/assets/stylesheets/sidebar.scss b/app/assets/stylesheets/sidebar.scss
index 42af9ec5a..ca1c486ae 100644
--- a/app/assets/stylesheets/sidebar.scss
+++ b/app/assets/stylesheets/sidebar.scss
@@ -26,36 +26,7 @@
}
}
-#aspects_list {
- .icons-check_yes_ok {
- height:18px;
- width:18px;
- background: url('icons/check_yes_ok.png') no-repeat;
- float: left;
- visibility: hidden;
- }
-
- .selected {
- visibility: visible;
- }
-
- .selected + a {
- color: #333333;
- }
-}
-
-.modify_aspect {
- background: url("icons/pencil.png") no-repeat;
- width: 12px;
- height: 12px;
- display: inline-block;
-}
-
#tags_list {
- .delete_tag_following {
- background: url("icons/deletelabel.png") no-repeat;
- }
-
/* ---- override app/stylesheets/vendor/autoSuggest.css ---- */
.tag_input {
width: 100%;
diff --git a/app/assets/templates/aspect_tpl.jst.hbs b/app/assets/templates/aspect_tpl.jst.hbs
index bd3acf7ea..bba71a86f 100644
--- a/app/assets/templates/aspect_tpl.jst.hbs
+++ b/app/assets/templates/aspect_tpl.jst.hbs
@@ -1,7 +1,9 @@
-
+
+
+
{{#if selected}}
-
+
{{else}}
-
+
{{/if}}
{{name}}
diff --git a/app/assets/templates/tag_following_tpl.jst.hbs b/app/assets/templates/tag_following_tpl.jst.hbs
index bc88c255f..1453d60d4 100644
--- a/app/assets/templates/tag_following_tpl.jst.hbs
+++ b/app/assets/templates/tag_following_tpl.jst.hbs
@@ -1,4 +1,4 @@
-
+×
#{{ name }}
diff --git a/features/step_definitions/tag_steps.rb b/features/step_definitions/tag_steps.rb
index c3cbef484..c1a6bc46c 100644
--- a/features/step_definitions/tag_steps.rb
+++ b/features/step_definitions/tag_steps.rb
@@ -1,5 +1,8 @@
When(/^I unfollow the "(.*?)" tag$/) do |tag|
- page.execute_script("$('#unfollow_#{tag}').css('display', 'block')")
- find("#unfollow_#{tag}").click
+ within("#tags_list") do
+ li = find('li', text: tag)
+ li.hover
+ li.find('.delete_tag_following').click
+ end
step 'I confirm the alert'
end
diff --git a/spec/javascripts/app/views/aspect_view_spec.js b/spec/javascripts/app/views/aspect_view_spec.js
index a69792092..9f3a98cb1 100644
--- a/spec/javascripts/app/views/aspect_view_spec.js
+++ b/spec/javascripts/app/views/aspect_view_spec.js
@@ -10,7 +10,7 @@ describe("app.views.Aspect", function(){
});
it('should show the aspect selected', function(){
- expect(this.view.$el.children('.icons-check_yes_ok').hasClass('selected')).toBeTruthy();
+ expect(this.view.$el.children('.entypo.check').hasClass('selected')).toBeTruthy();
});
it('should show the name of the aspect', function(){
diff --git a/spec/javascripts/app/views/aspects_list_view_spec.js b/spec/javascripts/app/views/aspects_list_view_spec.js
index 72d029d4c..5a0ded38d 100644
--- a/spec/javascripts/app/views/aspects_list_view_spec.js
+++ b/spec/javascripts/app/views/aspects_list_view_spec.js
@@ -24,7 +24,7 @@ describe("app.views.AspectsList", function(){
});
it('should show all the aspects', function(){
- var aspect_selectors = this.view.$('.icons-check_yes_ok + a.selectable');
+ var aspect_selectors = this.view.$('.entypo.check + a.selectable');
expect(aspect_selectors.length).toBe(3);
expect(aspect_selectors[0].text).toMatch('Work');
expect(aspect_selectors[1].text).toMatch('Friends');