[Sprites] update sprites after develop merge

app/assets/javascripts/app/views/aspect_view.js

@@ -3,6 +3,8 @@ app.views.Aspect = app.views.Base.extend({
 
   tagName: "li",
 
+  className: 'sub_nav_item',
+
   initialize: function(){
     if (this.model.get('selected')){
       this.$el.addClass('active');
@@ -16,6 +18,7 @@ app.views.Aspect = app.views.Base.extend({
   toggleAspect: function(evt){
     if (evt) { evt.preventDefault(); };
     this.$el.toggleClass('active');
+    this.$el.find('.icons-check_yes_ok').toggleClass('invisible')
     this.model.toggleSelected();
     app.router.aspects_stream();
   },

app/assets/stylesheets/application.css.sass

@@ -1427,6 +1427,7 @@ footer
       :top 1px solid #ddd
 
   .branding-powered_by_diaspora
+    :display inline-block
     :margin-top 3px
     :height 11px
     :width 145px
@@ -2370,20 +2371,6 @@ ul.left_nav
     :text
       :decoration none
 
-  ul.sub_nav
-    li:hover,
-    li.hover
-      @include border-radius(2px)
-      :background
-        :color lighten($blue,45%)
-      .edit,
-      .unfollow_icon
-        :display inline-block
-
-        .icons-monotone_close_exit_delete
-          :height 16px
-          :width 16px
-
   .invisible
     :visibility hidden
 
@@ -2428,7 +2415,7 @@ ul.left_nav
     :padding 3px 7px
 
   a.home_selector,
-  a.tag_selector,
+  li.aspect_element,
   a.element_selector
     &:hover
       @include border-radius(2px)
@@ -2444,8 +2431,6 @@ ul.left_nav
     @include opacity(0.3)
     :position absolute
     :display none
-    :background
-      :color white
     :padding 0 5px
     &:hover
       @include opacity(1)
@@ -2512,7 +2497,7 @@ ul.left_nav
           :decoration none
 
       a.tag_selector
-        :width 140px
+        :width 117px
         :overflow hidden
         :position relative
         :display inline-block
@@ -2524,10 +2509,6 @@ ul.left_nav
           :position absolute
           :top 0px
           :left 100px
-          @include horizontal-linear-gradient(rgba(255,255,255,0),rgba(255,255,255,1))
-        &:hover
-          :width auto
-          :z-index 0.9
         &:hover:after
           :background none
 
@@ -2540,19 +2521,28 @@ ul.left_nav
           :margin-left 3px
           :vertical-align middle
 
-      li:hover,
+        .icons-deletelabel
+          :height 8px
+          :width 8px
+          :margin-top 4px
+
+      li.unfollow,
+      li.sub_nav_item
+        :width 172px
+
+      li.unfollow:hover,
+      li.sub_nav_item:hover,
       li.hover
-        width: 172px
         @include border-radius(2px)
         :background
           :color lighten($blue,45%)
         .edit,
         .unfollow_icon
-          :display inline-block
-          :position absolute
-          :top 0
-          :left 0
           :z-index 1
+          :display inline-block
+          .icons-monotone_close_exit_delete
+            :height 16px
+            :width 16px
 
   .user_card
     :margin-left 8px
@@ -3033,11 +3023,12 @@ a.toggle_selector
 
 .left_nav
   #new_tag_following
+    :width 137px
     :margin
       :left 24px
 
     input[type='text']
-      :width 100%
+      :width 137px
       :font
         :size 13px
 

app/assets/templates/aspect_tpl.jst.hbs

@@ -1,6 +1,10 @@
-<div class="edit">
-  <a href="/aspects/{{id}}/edit" rel="facebox">
-    <img alt="Pencil" src="{{imageUrl "icons/pencil.png"}}" title="{{t 'edit'}} {{name}}">
-  </a>
-</div>
+<a href="/aspects/{{id}}/edit" rel="facebox">
+  <div class="edit icons-pencil" alt="Pencil" title="{{t 'edit'}} {{name}}">
+  </div>
+</a>
+{{#if selected}}
+  <div class="icons-check_yes_ok"></div>
+{{else}}
+  <div class="icons-check_yes_ok invisible"></div>
+{{/if}}
 <a class="aspect_selector name" data-guid="{{id}}" href="/aspects/query"> {{name}} </a>

app/assets/templates/tag_following_tpl.jst.hbs

@@ -1,9 +1,9 @@
-<div class="unfollow_icon hidden">
-  <a href="#" id="unfollow_{{name}}" rel="nofollow" class="delete tag_following_delete" title="{{t "delete"}}">
-    <img alt="Deletelabel" src="{{imageUrl "deletelabel.png"}}" />
-  <a/>
-</div>
-
 <a class="tag_selector" href="/tags/{{name}}">
   #{{ name }}
 </a>
+
+<div class="unfollow_icon hidden">
+  <a href="#" id="unfollow_{{name}}" rel="nofollow" class="delete tag_following_delete" title="{{t "delete"}}">
+    <div alt="Deletelabel" class="icons-deletelabel"></div>
+  <a/>
+</div>

app/views/contacts/_aspect_listings.haml

@@ -29,7 +29,7 @@
 
     %ul.sub_nav
       %li.aspect_element{:class => ("active" if params["set"] == "only_sharing")}
-        .icons-check_yes_ok{:class => "invisible"}
+        .icons-check_yes_ok{:class => ("invisible" if params["set"] == "only_sharing")}
         %a.community_aspect_selector{:href => contacts_path(:set => "only_sharing")}
           = t('contacts.index.only_sharing_with_me')
         .contact_count

app/views/layouts/_footer.html.haml

@@ -1,5 +1,5 @@
 %footer
   .container
+    .branding-powered_by_diaspora
     %ul#footer_nav
       = render :partial =>'shared/links'
-      = image_tag 'branding/powered_by_diaspora.png', :height => "11px", :width => "145px"