aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-08-08 12:16:32 +0600
committerStas Vilchik <vilchiks@gmail.com>2014-08-08 12:16:32 +0600
commitdd6f4667773af0e383742e741e06047281d41c90 (patch)
tree2dcb5081d159f1647ffa7eaeaa9eab9d617d140b /server/sonar-web
parent69d839b6a2c57789ddab3425829a0b9246232678 (diff)
downloadsonarqube-dd6f4667773af0e383742e741e06047281d41c90.tar.gz
sonarqube-dd6f4667773af0e383742e741e06047281d41c90.zip
SONAR-5498 Make all links consistent
Diffstat (limited to 'server/sonar-web')
-rw-r--r--server/sonar-web/src/main/less/component-viewer.less2
-rw-r--r--server/sonar-web/src/main/less/dashboard.less30
-rw-r--r--server/sonar-web/src/main/less/layout.less2
-rw-r--r--server/sonar-web/src/main/less/navigator/config.less2
-rw-r--r--server/sonar-web/src/main/less/select-list.less9
-rw-r--r--server/sonar-web/src/main/less/style.less23
-rw-r--r--server/sonar-web/src/main/less/ui.less2
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb2
8 files changed, 30 insertions, 42 deletions
diff --git a/server/sonar-web/src/main/less/component-viewer.less b/server/sonar-web/src/main/less/component-viewer.less
index b1268b39243..58ee62b571d 100644
--- a/server/sonar-web/src/main/less/component-viewer.less
+++ b/server/sonar-web/src/main/less/component-viewer.less
@@ -593,8 +593,6 @@
.component-viewer-header-time-changes {
padding: 10px;
-
- & > a { .link-no-underline; }
}
.component-viewer-header-sqale-rating {
diff --git a/server/sonar-web/src/main/less/dashboard.less b/server/sonar-web/src/main/less/dashboard.less
index 65987d2f5ec..27fee9ba006 100644
--- a/server/sonar-web/src/main/less/dashboard.less
+++ b/server/sonar-web/src/main/less/dashboard.less
@@ -54,13 +54,10 @@
}
#dashboard .widget_props {
- background-color: #FFF6BF;
- border: 1px solid #FFD324;
- margin-bottom: 10px;
+ background-color: #FFFBE2;
+ border: 1px solid #FCE174;
+ margin: 5px;
padding: 5px;
- border-radius: 0 0 3px 3px;
- -moz-border-radius: 0 0 3px 3px;
- -webkit-border-radius: 0 0 3px 3px;
}
#dashboard .widget-title {
@@ -71,10 +68,8 @@
font-size: 14px;
font-weight: 400;
text-transform: uppercase;
-}
-#dashboard .widget-title a {
- .link-no-underline;
+ a { .link-no-underline; }
}
/*CONFIGURATION*/
@@ -85,12 +80,9 @@
}
#dashboard #widget_defs, #dashboard #edit-layout {
- background-color: #FFF6BF;
- border: 2px solid #FFD324;
- padding: 3px;
- border-radius: 3px;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
+ background-color: #FFFBE2;
+ border: 1px solid #FCE174;
+ padding: 5px;
overflow-x: hidden;
}
@@ -116,9 +108,9 @@
#dashboard .widget_def {
display: inline-block;
vertical-align: top;
- border: 1px solid #FFD324;
+ border: 1px solid #FCE174;
padding: 5px;
- margin: 3px;
+ margin: 5px;
white-space: normal;
width: 250px;
min-height: 100px;
@@ -252,7 +244,7 @@
#dashboard .widget-header {
line-height: 16px;
- padding: 3px 5px;
+ padding: 3px 5px 5px;
background-color: #efefef;
border: 1px solid #ddd;
border-bottom: 0;
@@ -269,8 +261,6 @@
#dashboard .widget-actions {
float: right;
- overflow: hidden; /* clears float for most browsers */
- zoom: 1;
}
#dashboard .widget-actions a {
diff --git a/server/sonar-web/src/main/less/layout.less b/server/sonar-web/src/main/less/layout.less
index 75579aa28af..fa1c19ab380 100644
--- a/server/sonar-web/src/main/less/layout.less
+++ b/server/sonar-web/src/main/less/layout.less
@@ -73,7 +73,7 @@ body, a {
color: #fff;
.link-no-underline;
- &.selected { color: @blue; }
+ &.selected, &:hover, &:focus { color: @blue; }
}
#nav-left {
diff --git a/server/sonar-web/src/main/less/navigator/config.less b/server/sonar-web/src/main/less/navigator/config.less
index 55da018b1de..a973cbdebb8 100644
--- a/server/sonar-web/src/main/less/navigator/config.less
+++ b/server/sonar-web/src/main/less/navigator/config.less
@@ -22,7 +22,7 @@
@navigatorBorderColor: @barBorderColor;
@navigatorBorderLightColor: @barBorderColor;
-@navigatorHeaderColor: darken(@blue, 10%);
+@navigatorHeaderColor: @baseFontColor;
@navigatorFacetStatColor: @secondFontColor;
@navigatorFacetInactiveBackground: lighten(@barBackgroundColor, 4%);
diff --git a/server/sonar-web/src/main/less/select-list.less b/server/sonar-web/src/main/less/select-list.less
index 90f9d64f594..d608d665000 100644
--- a/server/sonar-web/src/main/less/select-list.less
+++ b/server/sonar-web/src/main/less/select-list.less
@@ -1,3 +1,6 @@
+@import (reference) 'variables';
+@import (reference) 'mixins';
+
.select-list-container {
min-width: 500px;
-moz-box-sizing: border-box;
@@ -115,9 +118,9 @@
width: 110px;
height: 27px;
line-height: 25px;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
+ .box-sizing(border-box);
border: 1px solid #bfbfbf;
+ color: @baseFontColor;
text-align: center;
cursor: pointer;
transition: background-color 0.2s ease;
@@ -125,12 +128,14 @@
.select-list-control-button:hover {
background-color: #f6f6f6;
+ color: @baseFontColor;
}
.select-list-control-button:active,
.select-list-control-button.active {
z-index: 2;
background-color: #efefef;
+ color: @baseFontColor;
}
.select-list-control-button + .select-list-control-button {
diff --git a/server/sonar-web/src/main/less/style.less b/server/sonar-web/src/main/less/style.less
index db1329484a0..edccb7b69f9 100644
--- a/server/sonar-web/src/main/less/style.less
+++ b/server/sonar-web/src/main/less/style.less
@@ -210,34 +210,24 @@ a.external {
/* ------------------- PAGE ------------------- */
h1, .h1 {
- color: #444;
+ color: @baseFontColor;
font-size: 16px;
}
-h1 a {
- color: #444;
- text-decoration: none;
- border-bottom: 1px dotted #2B547D;
-}
-
h2, .h2 {
- color: #2B547D;
+ color: @baseFontColor;
font-size: 16px;
font-weight: normal;
}
-h2 a {
- color: #2B547D;
- text-decoration: none;
- border-bottom: 1px dotted #2B547D;
-}
-
h3, .h3 {
+ color: @baseFontColor;
font-size: 100%;
font-weight: bold;
}
h4, .h4 {
+ color: @baseFontColor;
font-size: 85%;
color: #777;
}
@@ -340,6 +330,10 @@ h1 img, .h1 img, h2 img, .h2 img, h3 img, .h3 img, h4 img, .h4 img {
padding: 3px 0 10px;
}
+#login_form a {
+ border-bottom-color: @blue;
+}
+
#login_form .desc {
font-size: 85%;
font-weight: normal;
@@ -813,6 +807,7 @@ th.operations, td.operations {
margin: 0;
font-size: 12px;
padding: 0 0 10px 0;
+ .trans(border-color);
.error {
line-height: normal;
diff --git a/server/sonar-web/src/main/less/ui.less b/server/sonar-web/src/main/less/ui.less
index 374bb140db2..a2e1b2f161d 100644
--- a/server/sonar-web/src/main/less/ui.less
+++ b/server/sonar-web/src/main/less/ui.less
@@ -139,7 +139,7 @@ select::-moz-focus-inner, input::-moz-focus-inner, button::-moz-focus-inner {
}
}
-.link-no-underline() {
+.link-no-underline {
border-bottom: none;
}
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb
index f24a454aa46..20683976b1f 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb
@@ -45,7 +45,7 @@
<%= link_to_favourite(project) -%>
<% end %>
<% if snapshot.display_dashboard? %>
- <%= link_to image_tag('zoom.png'), {:controller => 'dashboard', :id => snapshot.project.id} %>
+ <%= link_to image_tag('zoom.png'), {:controller => 'dashboard', :id => snapshot.project.id}, :class => 'link-no-underline' %>
<% else %>
<%= link_to_resource(project, '<i class="icon-detach"></i>') %>
<% end %>