fix(common.item-menu): design modification

davinkevin · Jan 14, 2016 · 2f86e7f · 2f86e7f
1 parent a5881ad
commit 2f86e7f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/www/app/common/component/item-menu/item-menu.html b/www/app/common/component/item-menu/item-menu.html
@@ -2,7 +2,7 @@
     <button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle><i class="glyphicon glyphicon-option-vertical"></i></button>
     <ul uib-dropdown-menu class="dropdown-menu-right" role="menu">
         <li ng-if="::(imc.localRead)" ng-show="imc.item.isDownloaded">
-            <a target="_self" ng-href="{{ ::imc.item.proxyURL }}">
+            <a target="_self" class="with-link" ng-href="{{ ::imc.item.proxyURL }}">
                 <span class="glyphicon glyphicon-play text-success"></span> Read
             </a>
             <a ng-show="imc.item.isDownloaded" copy="{{ ::imc.item.proxyURL }}" class="pull-right">
@@ -35,7 +35,7 @@
             </a>
         </li>
         <li>
-            <a target="_self" ng-href="{{ ::imc.item.url }}">
+            <a target="_self" class="with-link" ng-href="{{ ::imc.item.url }}">
                 <span class="glyphicon glyphicon-globe text-info"></span> Read OnLine
             </a>
             <a copy="{{ ::imc.item.url }}" class="pull-right">

diff --git a/www/app/common/component/item-menu/item-menu.js b/www/app/common/component/item-menu/item-menu.js
@@ -1,8 +1,6 @@
 /**
     * Created by kevin on 05/12/2015 for Podcast Server
     */
-
-import _ from 'lodash';
 import {Component, View, Module} from '../../../decorators';
 import DownloadManager from '../../service/data/downloadManager';
 import playlistService from '../../service/playlistService';
@@ -47,7 +45,7 @@ export default class ItemMenuComponent {
 
     reset(item) {
         return item.reset()
-            .then((itemReseted) => _.assign(item, itemReseted))
+            .then((itemReseted) => Object.assign(item, itemReseted))
             .then((itemInList) => this.playlistService.remove(itemInList));
     }
 

diff --git a/www/app/common/component/item-menu/item-menu.less b/www/app/common/component/item-menu/item-menu.less
@@ -1,9 +1,13 @@
 item-menu {
-  .dropdown-menu > li > a {
-    display: inline-block;
-
-    &[copy] {
-      padding: 0 4px 4px 0;
+  .dropdown-menu > li {
+    a.with-link {
+      display: inline-block;
+      padding-right:8px;
+    }
+    a + a[copy] {
+      display: inline-block;
+      width: 30px;
+      padding: 3px 6px 3px 8px;
     }
   }
 }