fix SONAR-6041 update breadcrumb styles

diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index 2ce259390f6f7beacf2604c76292149cd4d507d7..7b78f9bdde3b881718ecbbfb19d8f0ed80832fa1 100644 (file)
--- a/server/sonar-web/Gruntfile.coffee
+++ b/server/sonar-web/Gruntfile.coffee
@@ -9,7 +9,7 @@ module.exports = (grunt) ->
       dev:
         files:
           '<%= pkg.assets %>css/sonar.css': [
-            '<%= pkg.sources %>less/yui-reset-font.less'
+            '<%= pkg.sources %>less/init.less'
             '<%= pkg.sources %>less/jquery-ui.less'
             '<%= pkg.sources %>less/select2.less'
             '<%= pkg.sources %>less/select2-sonar.less'
@@ -28,7 +28,7 @@ module.exports = (grunt) ->
           cleancss: true
         files:
           '<%= pkg.assets %>css/sonar.css': [
-            '<%= pkg.sources %>less/yui-reset-font.less'
+            '<%= pkg.sources %>less/init.less'
             '<%= pkg.sources %>less/jquery-ui.less'
             '<%= pkg.sources %>less/select2.less'
             '<%= pkg.sources %>less/select2-sonar.less'

diff --git a/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs
index df091ff766e478efd37dcc5a2ecadab2e85f4006..7b6155d5a49ca9f39bebfe996dec35fa622eccab 100644 (file)
--- a/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs
+++ b/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs
@@ -1,5 +1,5 @@
 <div class="container">
-  <ul class="nav navbar-nav">
+  <ul class="nav nav-crumbs navbar-nav navbar-nav-pills">
     {{#each breadcrumbs}}
       <li>
         <a href="{{link url}}">

diff --git a/server/sonar-web/src/main/less/init.less b/server/sonar-web/src/main/less/init.less
new file mode 100644 (file)
index 0000000..3cebf11
--- /dev/null
+++ b/server/sonar-web/src/main/less/init.less
@@ -0,0 +1,170 @@
+@import (reference) "variables";
+@import (reference) "mixins";
+
+html {
+  color: @baseFontColor;
+  background: #fff;
+}
+
+body {
+  font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-size: @baseFontSize;
+  line-height: 1.231;
+}
+
+* {
+  margin: 0;
+  padding: 0
+}
+
+a {
+  border-bottom: 1px solid @lightBlue;
+  color: @darkBlue;
+  cursor: pointer;
+  outline: none;
+  text-decoration: none;
+  .trans;
+
+  &:hover {
+    color: @blue;
+  }
+
+  &:active, &:focus {
+    color: @darkBlue;
+  }
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+fieldset, img {
+  border: 0;
+}
+
+address, caption, cite, code, dfn, em, strong, th, var {
+  font-style: normal;
+  font-weight: normal;
+}
+
+ol, ul {
+  list-style: none;
+}
+
+caption, th {
+  text-align: left;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-size: 100%;
+  font-weight: normal;
+}
+
+q:before, q:after {
+  content: '';
+}
+
+abbr, acronym {
+  border: 0;
+  font-variant: normal;
+}
+
+sup {
+  vertical-align: text-top;
+}
+
+sub {
+  vertical-align: text-bottom;
+}
+
+input, textarea, select {
+  font-family: inherit;
+  font-size: inherit;
+  font-weight: inherit;
+}
+
+select, input, button, textarea {
+  font-size: inherit;
+  font-family: inherit;
+}
+
+/*Remove button padding in FF*/
+select::-moz-focus-inner, input::-moz-focus-inner, button::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+legend {
+  color: #000
+}
+
+/* font */
+body {
+  font: 13px/1.231 arial, helvetica, clean, sans-serif;
+}
+
+select, input, button, textarea {
+  font: 99% arial, helvetica, clean, sans-serif
+}
+
+pre, code, kbd, samp, tt {
+  font-family: monospace;
+  line-height: 1;
+}
+
+code {
+  font-size: 93%;
+}
+
+small {
+  color: #aaa;
+  font-size: 85%;
+  font-style: normal;
+}
+
+em {
+  font-weight: bold;
+}
+
+
+@font-face {
+  font-family: 'Roboto';
+  src: url('../fonts/Roboto-Light-webfont.eot');
+  src: url('../fonts/Roboto-Light-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/Roboto-Light-webfont.woff') format('woff'),
+  url('../fonts/Roboto-Light-webfont.ttf') format('truetype'),
+  url('../fonts/Roboto-Light-webfont.svg#robotolight') format('svg');
+  font-weight: 300;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Roboto';
+  src: url('../fonts/Roboto-Regular-webfont.eot');
+  src: url('../fonts/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/Roboto-Regular-webfont.woff') format('woff'),
+  url('../fonts/Roboto-Regular-webfont.ttf') format('truetype'),
+  url('../fonts/Roboto-Regular-webfont.svg#robotoregular') format('svg');
+  font-weight: 400;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Roboto';
+  src: url('../fonts/Roboto-Medium-webfont.eot');
+  src: url('../fonts/Roboto-Medium-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/Roboto-Medium-webfont.woff') format('woff'),
+  url('../fonts/Roboto-Medium-webfont.ttf') format('truetype'),
+  url('../fonts/Roboto-Medium-webfont.svg#robotomedium') format('svg');
+  font-weight: 500;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Roboto';
+  src: url('../fonts/Roboto-Bold-webfont.eot');
+  src: url('../fonts/Roboto-Bold-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/Roboto-Bold-webfont.woff') format('woff'),
+  url('../fonts/Roboto-Bold-webfont.ttf') format('truetype'),
+  url('../fonts/Roboto-Bold-webfont.svg#robotobold') format('svg');
+  font-weight: 700;
+  font-style: normal;
+}

diff --git a/server/sonar-web/src/main/less/style.less b/server/sonar-web/src/main/less/style.less
index d14edf4f27fe0c878c3a5d1dd26126e4bbdcf827..bef12e86ca4267300ab13b84cee314249ff43323 100644 (file)
--- a/server/sonar-web/src/main/less/style.less
+++ b/server/sonar-web/src/main/less/style.less
@@ -58,10 +58,6 @@
 /*
   GENERAL
 */
-a {
-  cursor: pointer;
-}
-
 a.icon-favorite,
 a.icon-not-favorite {
   .link-no-underline;
@@ -101,10 +97,6 @@ a.icon-not-favorite {
   white-space: nowrap;
 }
 
-code {
-  font-size: 93%;
-}
-
 .hidden {
   display: none;
   visibility: hidden;
@@ -134,20 +126,6 @@ code {
   font-size: @smallFontSize;
 }
 
-input[type].small {
-
-}
-
-small {
-  color: #AAA;
-  font-size: 85%;
-  font-style: normal;
-}
-
-em {
-  font-weight: bold;
-}
-
 em.mandatory {
   color: #990000;
   font-style: italic;

diff --git a/server/sonar-web/src/main/less/ui.less b/server/sonar-web/src/main/less/ui.less
index f8fc1c1da669241a74218059547422382733582f..9c289d3c39cbe35f1d40d7d35b9bd3060d381186 100644 (file)
--- a/server/sonar-web/src/main/less/ui.less
+++ b/server/sonar-web/src/main/less/ui.less
@@ -2,64 +2,6 @@
 @import (reference) "mixins";
 
 
-
-@font-face {
-  font-family: 'Roboto';
-  src: url('../fonts/Roboto-Light-webfont.eot');
-  src: url('../fonts/Roboto-Light-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/Roboto-Light-webfont.woff') format('woff'),
-  url('../fonts/Roboto-Light-webfont.ttf') format('truetype'),
-  url('../fonts/Roboto-Light-webfont.svg#robotolight') format('svg');
-  font-weight: 300;
-  font-style: normal;
-}
-@font-face {
-  font-family: 'Roboto';
-  src: url('../fonts/Roboto-Regular-webfont.eot');
-  src: url('../fonts/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/Roboto-Regular-webfont.woff') format('woff'),
-  url('../fonts/Roboto-Regular-webfont.ttf') format('truetype'),
-  url('../fonts/Roboto-Regular-webfont.svg#robotoregular') format('svg');
-  font-weight: 400;
-  font-style: normal;
-}
-@font-face {
-  font-family: 'Roboto';
-  src: url('../fonts/Roboto-Medium-webfont.eot');
-  src: url('../fonts/Roboto-Medium-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/Roboto-Medium-webfont.woff') format('woff'),
-  url('../fonts/Roboto-Medium-webfont.ttf') format('truetype'),
-  url('../fonts/Roboto-Medium-webfont.svg#robotomedium') format('svg');
-  font-weight: 500;
-  font-style: normal;
-}
-@font-face {
-  font-family: 'Roboto';
-  src: url('../fonts/Roboto-Bold-webfont.eot');
-  src: url('../fonts/Roboto-Bold-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/Roboto-Bold-webfont.woff') format('woff'),
-  url('../fonts/Roboto-Bold-webfont.ttf') format('truetype'),
-  url('../fonts/Roboto-Bold-webfont.svg#robotobold') format('svg');
-  font-weight: 700;
-  font-style: normal;
-}
-
-
-body {
-  font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-}
-
-select, input, button, textarea {
-  font-size: 99%;
-  font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-}
-
-/*Remove button padding in FF*/
-select::-moz-focus-inner, input::-moz-focus-inner, button::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-
 /*
  * Common
  */
@@ -164,15 +106,9 @@ select::-moz-focus-inner, input::-moz-focus-inner, button::-moz-focus-inner {
   }
 }
 
-
-a {
-  cursor: pointer;
-  .underlined-link;
-
-  &.active-link {
-    border-bottom: none;
-    font-weight: 500;
-  }
+a.active-link {
+  border-bottom: none;
+  font-weight: 500;
 }
 
 
@@ -479,6 +415,15 @@ input[type=button] {
 
 .nav > li > a {
   position: relative;
-  display: block;
+  display: inline-block;
+  vertical-align: middle;
   padding: 10px 15px;
 }
+
+
+.nav-crumbs > li + li:before {
+  content: " /";
+  display: inline-block;
+  vertical-align: middle;
+  color: @secondFontColor;
+}

diff --git a/server/sonar-web/src/main/less/yui-reset-font.less b/server/sonar-web/src/main/less/yui-reset-font.less
deleted file mode 100644 (file)
index bf3e732..0000000
--- a/server/sonar-web/src/main/less/yui-reset-font.less
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-YUI 3.6.0 (build 5521)
-Copyright 2012 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-/* reset */
-html{color:#000;background:#FFF}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}ol,ul{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:''}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:text-top}sub{vertical-align:text-bottom}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}input,textarea,select{*font-size:100%}legend{color:#000}
-
-/* font */
-body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif}table{font-size:inherit;font:100%}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}
\ No newline at end of file