From 567516031be3f12e88a9d48f20bcd10e9fdb23dd Mon Sep 17 00:00:00 2001
From: HelloWorld <helloworld@qq.com>
Date: Wed, 27 Nov 2019 16:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=8E=92tag=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E7=B1=BB=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/tags-controller.js |  2 +-
 public/views/tags.html                        | 40 +++++++------------
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index 6db0865..aa540d9 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -545,7 +545,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara
     });
 
     setTimeout(() => {
-        $('.js-tag-label .ui.label .icon').popup();
+        $('.js-tag-label .icon').popup();
     }, 3000);
 
     function clickCmp(a, b) {
diff --git a/public/views/tags.html b/public/views/tags.html
index ef02595..6d951fe 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -1,29 +1,19 @@
 <div class="ui segment js-tags">
-    <div class="ui container" ng-show="!editMode" style="cursor:default;padding: 10px 0px">
-        <div class="ui grid">
-            <div class="two wide column  js-tag-label" style="padding: 10px;">
-                <div class="ui small label" ng-class="{green:costomTag.bookmarkClicked}" ng-click="getBookmarks(-1, 1)">
-                    {{ costomTag.name }} ({{ costomTag.cnt || 0 }})
-                </div>
-            </div>
-            <div class="two wide column  js-tag-label" ng-if="tag.cnt" style="padding: 10px;" ng-repeat="tag in tags">
-                <div class="ui small label" ng-class="{green:tag.bookmarkClicked}" ng-click="getBookmarks(tag.id, 1)">
-                    {{ tag.name }} ({{ tag.cnt || 0 }})
-                </div>
-            </div>
-            <div class="two wide column  js-tag-label" style="padding: 10px;">
-                <div class="ui small label" ng-class="{green:costomAllUsersTag.bookmarkClicked}" ng-click="getBookmarks(-2, 1)">
-                    {{ costomAllUsersTag.name }} ({{ costomAllUsersTag.cnt || 0 }})
-                </div>
-            </div>
-            <div class="two wide column js-tag-label" style="padding: 10px;">
-                <div class="ui small label">
-                    <i class="plus icon" data-content="点击添加分类" data-position="top center" ng-click="showAddTag()"></i>
-                    <i class="pencil alternate icon" data-content="点击进入分类编辑模式" data-position="top center" ng-click="toggleMode(true)"></i>
-                    <i class="table icon" style="margin-right:0px;" data-content="点击以条目显示" data-position="top center" ng-show="showMode=='table'" ng-click="toggleShowMode('item')"></i>
-                    <i class="list icon" style="margin-right:0px;" data-content="点击以表格显示" data-position="top center" ng-show="showMode=='item'" ng-click="toggleShowMode('table')"></i>
-                </div>
-            </div>
+    <div class="ui container" ng-show="!editMode" style="cursor:default">
+        <div class="ui label" style="margin:3px 15px 8px 0px;cursor:default;" ng-class="{green:costomTag.bookmarkClicked}" ng-click="getBookmarks(-1, 1)">
+            {{ costomTag.name }} ({{ costomTag.cnt || 0 }})
+        </div>
+        <div class="ui label" style="margin:3px 15px 8px 0px;cursor:default;" ng-if="tag.cnt" ng-repeat="tag in tags" ng-class="{green:tag.bookmarkClicked}" ng-click="getBookmarks(tag.id, 1)">
+            {{ tag.name }} ({{ tag.cnt || 0 }})
+        </div>
+        <div class="ui label" style="margin:3px 15px 8px 0px;cursor:default;" ng-class="{green:costomAllUsersTag.bookmarkClicked}" ng-click="getBookmarks(-2, 1)">
+            {{ costomAllUsersTag.name }} ({{ costomAllUsersTag.cnt || 0 }})
+        </div>
+        <div class="ui label js-tag-label" style="margin:3px 15px 8px 0px;cursor:default;">
+            <i class="plus icon" data-content="点击添加分类" data-position="top center" ng-click="showAddTag()"></i>
+            <i class="pencil alternate icon" data-content="点击进入分类编辑模式" data-position="top center" ng-click="toggleMode(true)"></i>
+            <i class="table icon" style="margin-right:0px;" data-content="点击以条目显示" data-position="top center" ng-show="showMode=='table'" ng-click="toggleShowMode('item')"></i>
+            <i class="list icon" style="margin-right:0px;" data-content="点击以表格显示" data-position="top center" ng-show="showMode=='item'" ng-click="toggleShowMode('table')"></i>
         </div>
     </div>
     <div class="ui container" ng-show="editMode" ng-mousedown="storeTagIndex()" ng-mouseup="updateTagIndex()">