From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 31 Mar 2014 11:03:50 +0000 (+0600)
Subject: SONAR-5173 Check, move, add, delete icons
X-Git-Tag: 4.3~222
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eedb157b31fcdb5f5989dcfed60276b9e2f6a918;p=sonarqube.git

SONAR-5173 Check, move, add, delete icons
---

diff --git a/sonar-server/src/main/less/icons.less b/sonar-server/src/main/less/icons.less
index 46bc7f6517a..ebb133ef49c 100644
--- a/sonar-server/src/main/less/icons.less
+++ b/sonar-server/src/main/less/icons.less
@@ -262,6 +262,8 @@ a[class^="icon-"], a[class*=" icon-"] {
 }
 .icon-check:before {
   content: "\f00c";
+  color: @green;
+  font-size: @iconFontSize;
 }
 .icon-default:before {
   position: relative;
@@ -323,6 +325,7 @@ a[class^="icon-"], a[class*=" icon-"] {
 }
 .icon-delete:before {
   content: "\f00d";
+  color: @red;
   font-size: @iconFontSize;
 }
 .icon-compare:before {
@@ -336,25 +339,31 @@ a[class^="icon-"], a[class*=" icon-"] {
 }
 .icon-plus:before {
   content: "\f067";
+  color: @green;
+  font-size: @iconFontSize;
 }
 .icon-link:before {
   content: "\f127";
   font-size: @iconSmallFontSize;
 }
 .icon-move-down:before {
-  content: "\f0d7";
+  content: "\f063";
+  color: @darkBlue;
   font-size: @iconFontSize;
 }
 .icon-move-up:before {
-  content: "\f0d8";
+  content: "\f062";
+  color: @darkBlue;
   font-size: @iconFontSize;
 }
 .icon-move-left:before {
-  content: "\f0d9";
+  content: "\f060";
+  color: @darkBlue;
   font-size: @iconFontSize;
 }
 .icon-move-right:before {
-  content: "\f0da";
+  content: "\f061";
+  color: @darkBlue;
   font-size: @iconFontSize;
 }
 .icon-scm:before {
diff --git a/sonar-server/src/main/less/variables.less b/sonar-server/src/main/less/variables.less
index 34bcca25b83..bcec0d56123 100644
--- a/sonar-server/src/main/less/variables.less
+++ b/sonar-server/src/main/less/variables.less
@@ -25,6 +25,8 @@
 @orange: #f90;
 @purple: #9139d4;
 
+@darkBlue: darken(@blue, 20%);
+
 @highlighted: @blue;
 @contextBackground: lighten(@purple, 40%);
 @contextBorder: lighten(@purple, 30%);
@@ -54,8 +56,6 @@
 @resolutionFalsePositiveColor: @baseFontColor;
 @resolutionRemovedColor: @baseFontColor;
 
-@qualifierColor: darken(@orange, 30%);
-
 
 
 /*
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb
index 6273069f0be..5737650fb80 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb
@@ -23,7 +23,7 @@
           <div class="description"><%= h dashboard.description -%></div>
         </td>
         <td class="shared">
-          <%= boolean_icon(dashboard.shared) -%>
+          <% if (dashboard.shared) %><i class="icon-check"></i><% end %>
         </td>
         <td class="owner">
           <%= h(dashboard.user_name || message('dashboard.username.default')) -%>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb
index 46ddb076eac..68240dea729 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb
@@ -23,19 +23,19 @@
           <div class="description"><%= h dashboard.description -%></div>
         </td>
         <td class="shared">
-          <%= boolean_icon(dashboard.shared, {:id => "dashboard-#{index}-shared"}) -%>
+          <% if (dashboard.shared) %><i class="icon-check" id='<%= "dashboard-#{index}-shared" -%>'></i><% end %>
         </td>
         <td class="owner">
           <%= h(dashboard.user_name || message('dashboard.username.default')) -%>
         </td>
         <td class="order">
           <% if index > 0 %>
-            <%= link_to image_tag('blue-up.png'), {:action => :up, :id => dashboard.id, :resource => resource_id}, :method => :post, :id => "up-#{u dashboard.name}" %>
+            <%= link_to '', {:action => :up, :id => dashboard.id, :resource => resource_id}, :method => :post, :id => "up-#{u dashboard.name}", :class => "icon-move-up" %>
           <% else %>
             <%= image_tag('transparent_16.gif') %>
           <% end %>
           <% if index < @actives.size-1 %>
-            <%= link_to image_tag('blue-down.png'), {:action => :down, :id => dashboard.id, :resource => resource_id}, :method => :post, :id => "down-#{u dashboard.name}" %>
+            <%= link_to '', {:action => :down, :id => dashboard.id, :resource => resource_id}, :method => :post, :id => "down-#{u dashboard.name}", :class => "icon-move-down" %>
           <% else %>
             <%= image_tag('transparent_16.gif') %>
         <% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb
index 47433622e54..abfba14a59a 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb
@@ -1,6 +1,7 @@
 <div class="admin_page">
   <ul style="float: right" class="horizontal">
-    <li class="marginleft10 add">
+    <li class="marginleft10">
+      <i class="icon-plus"></i>
       <%= link_to message('create'), {:action => :create_form, :resource => (@resource.id if @resource)}, :id => "create-link-dashboard", :class => 'open-modal link-action' %>
     </li>
   </ul>