[ATLAS-211] UI tweaks for Tags

MPR-Global · Nov 3, 2015 · 1da040e · 1da040e
1 parent 8cadfd7
commit 1da040e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/dashboard/public/css/common.css b/dashboard/public/css/common.css
@@ -337,6 +337,14 @@ Tags on Home Page design
     white-space: nowrap;
     text-transform: capitalize; 
 }
+.searchResultCount {
+    max-width: 500px;
+    display: list-item;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    text-transform: capitalize; 
+}
 
 .maxwidth125px {
     max-width: 125px !important;

diff --git a/dashboard/public/css/tags.css b/dashboard/public/css/tags.css
@@ -17,7 +17,7 @@
  */
 
 .add-tag {
-  margin-top: 3px;
+  margin-top: -7px;
 }
 .inputs input{
 	height: 50px;
@@ -107,4 +107,10 @@
 }
 .searchResults td{
 	border: 0;
+}
+.tagalign{
+   margin-top: 14px;
+}
+.tagsAdded{
+  display: inline;
 }
diff --git a/dashboard/public/modules/search/views/search.html b/dashboard/public/modules/search/views/search.html
@@ -34,7 +34,7 @@
         <div class="col-lg-12 padding0 searchresults">
             <div ng-switch on="searchMessage">
                 <div ng-switch-when="load-gif" class="search-spinner"><img src="../img/spinner.gif" align="middle" /></div>
-                <div ng-switch-default><h4 ng-show="searchMessage" title="{{searchMessage}}" class="tabsearchResult">{{searchMessage}}</h4></div>
+                <div ng-switch-default><h4 ng-show="searchMessage" title="{{searchMessage}}" class="searchResultCount">{{searchMessage}}</h4></div>
             </div>
             <div class="panel panel-default" ng-show='resultCount > 0'>
               <table class="table table-bordered datatable" >

diff --git a/dashboard/public/modules/tags/instance/views/tags.html b/dashboard/public/modules/tags/instance/views/tags.html
@@ -17,13 +17,11 @@
   -->
 <div data-ng-controller="InstanceTagController">
   <div class="container tag-list wordBreak">
-    <h4>Tags</h4>
-    <ul>
+    <h4 class="tagsAdded">Tags</h4>
+    <a ng-click="openAddTag()" href="" class="add-tag btn btn-primary pull-right">Add tag</a>
+    <ul class="tagalign">
       <li ng-repeat="trait in traitsList" class="list-group-item pointer tabsearchanchor maxwidth125px" popover="{{trait.values}}" popover-title="{{trait.typeName}} Values" popover-trigger="mouseenter" >
         {{trait.typeName}} <a href="" class="anchorAbsolute" ng-click="detachTag($event, trait.typeName)"> <i class="fa fa-times"></i> </a> </li>
-
-      <li class="list-group-item"><a ng-click="openAddTag()" href=""
-        class="add-tag btn btn-primary">Add tag</a></li>
     </ul>
   </div>
 </div>