From aca12e8a3f1a3965aa1b156e991527f8074fef95 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 23 May 2014 10:44:59 +0200 Subject: [PATCH] SONAR-5333 Improve widget consistency --- .../core/widgets/issues/issues.html.erb | 20 +++++++++---------- sonar-server/src/main/less/dashboard.less | 8 ++++---- sonar-server/src/main/less/style.less | 10 +++++++--- sonar-server/src/main/less/variables.less | 3 ++- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb index da99e2c143d..55a193ae798 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb @@ -99,10 +99,10 @@ - <%= link_to message('blocker'), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'BLOCKER'}, :class => 'widget-link drilldown_BLOCKER' -%> + <%= message('blocker') -%> - <%= format_measure(blocker_issues) -%> + <%= link_to format_measure(blocker_issues), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'BLOCKER'}, :class => 'widget-link drilldown_BLOCKER' -%> <%= dashboard_configuration.selected_period? ? format_variation(blocker_issues) : trend_icon(blocker_issues, :empty => true) -%> @@ -121,10 +121,10 @@ - <%= link_to message('critical'), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'CRITICAL'}, :class => 'widget-link drilldown_CRITICAL' -%> + <%= message('critical') -%> - <%= format_measure(critical_issues) -%> + <%= link_to format_measure(critical_issues), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'CRITICAL'}, :class => 'widget-link drilldown_CRITICAL' -%> <%= dashboard_configuration.selected_period? ? format_variation(critical_issues) : trend_icon(critical_issues, :empty => true) -%> @@ -143,10 +143,10 @@ - <%= link_to message('major'), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'MAJOR'}, :class => 'widget-link drilldown_MAJOR' -%> + <%= message('major') -%> - <%= format_measure(major_issues) -%> + <%= link_to format_measure(major_issues), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'MAJOR'}, :class => 'widget-link drilldown_MAJOR' -%> <%= dashboard_configuration.selected_period? ? format_variation(major_issues) : trend_icon(major_issues, :empty => true) -%> @@ -165,10 +165,10 @@ - <%= link_to message('minor'), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'MINOR'}, :class => 'widget-link drilldown_MINOR' -%> + <%= message('minor') -%> - <%= format_measure(minor_issues) -%> + <%= link_to format_measure(minor_issues), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'MINOR'}, :class => 'widget-link drilldown_MINOR' -%> <%= dashboard_configuration.selected_period? ? format_variation(minor_issues) : trend_icon(minor_issues, :empty => true) -%> @@ -187,10 +187,10 @@ - <%= link_to message('info'), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'INFO'}, :class => 'widget-link drilldown_INFO' -%> + <%= message('info') -%> - <%= format_measure(info_issues) -%> + <%= link_to format_measure(info_issues), {:controller => 'drilldown', :action => 'issues', :id => @project.key, :severity => 'INFO'}, :class => 'widget-link drilldown_INFO' -%> <%= dashboard_configuration.selected_period? ? format_variation(info_issues) : trend_icon(info_issues, :empty => true) -%> diff --git a/sonar-server/src/main/less/dashboard.less b/sonar-server/src/main/less/dashboard.less index 602ab689ecf..4f8602ac5bd 100644 --- a/sonar-server/src/main/less/dashboard.less +++ b/sonar-server/src/main/less/dashboard.less @@ -322,8 +322,9 @@ .widget-label { display: block; - font-size: @smallFontSize; + font-size: @baseFontSize; line-height: 1.2; + font-weight: 300; } .widget-number { @@ -356,7 +357,7 @@ margin-top: 10px; .widget-link, .widget-number { .widget-big; } - .widget-label { font-size: @baseFontSize; } + .widget-label { font-size: @bigFontSize; } } .widget-measure-container { @@ -389,9 +390,8 @@ display: inline-block; line-height: 1.5; margin-right: 10px; - font-size: 18px; + font-size: @bigFontSize; font-weight: 300; -// text-transform: uppercase; white-space: nowrap; } diff --git a/sonar-server/src/main/less/style.less b/sonar-server/src/main/less/style.less index d831295cd76..c304886ab5b 100644 --- a/sonar-server/src/main/less/style.less +++ b/sonar-server/src/main/less/style.less @@ -1504,12 +1504,16 @@ span.empty_widget { padding: 0 10px 7px 0; h3 { - color: @secondFontColor; - font-size: @smallFontSize; + line-height: 1.2; + font-size: @bigFontSize; font-weight: 300; } - a { .widget-link; } + a { + .widget-link; + + .rating { color: #fff; } + } } .big { diff --git a/sonar-server/src/main/less/variables.less b/sonar-server/src/main/less/variables.less index 729a845f9b2..663e984d2f3 100644 --- a/sonar-server/src/main/less/variables.less +++ b/sonar-server/src/main/less/variables.less @@ -2,10 +2,11 @@ * Fonts */ +@smallFontSize: 12px; @baseFontSize: 13px; +@bigFontSize: 16px; @baseFontColor: #444; @secondFontColor: #777; -@smallFontSize: 12px; @headerFontSize: 16px; -- 2.39.5