From: Stas Vilchik Date: Wed, 4 Feb 2015 19:53:35 +0000 (+0100) Subject: rework css X-Git-Tag: 5.1-RC1~397 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e0aa81c1df99db3039775c3aa2dbad5e685b64be;p=sonarqube.git rework css --- diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee index 739811baabc..87c48f34b3c 100644 --- a/server/sonar-web/Gruntfile.coffee +++ b/server/sonar-web/Gruntfile.coffee @@ -9,18 +9,16 @@ module.exports = (grunt) -> dev: files: '<%= grunt.option("assetsDir") || pkg.assets %>css/sonar.css': [ - '<%= pkg.sources %>less/init.less' '<%= pkg.sources %>less/jquery-ui.less' '<%= pkg.sources %>less/select2.less' '<%= pkg.sources %>less/select2-sonar.less' - '<%= pkg.sources %>less/layout.less' + + '<%= pkg.sources %>less/init.less' + '<%= pkg.sources %>less/components.less' + '<%= pkg.sources %>less/pages.less' + '<%= pkg.sources %>less/style.less' - '<%= pkg.sources %>less/icons.less' - '<%= pkg.sources %>less/ui.less' - '<%= pkg.sources %>less/sonar-colorizer.less' - '<%= pkg.sources %>less/dashboard.less' - '<%= pkg.sources %>less/select-list.less' - '<%= pkg.sources %>less/navigator.less' + '<%= pkg.sources %>less/*.less' ] build: @@ -28,18 +26,16 @@ module.exports = (grunt) -> cleancss: true files: '<%= grunt.option("assetsDir") || pkg.assets %>css/sonar.css': [ - '<%= pkg.sources %>less/init.less' '<%= pkg.sources %>less/jquery-ui.less' '<%= pkg.sources %>less/select2.less' '<%= pkg.sources %>less/select2-sonar.less' - '<%= pkg.sources %>less/layout.less' + + '<%= pkg.sources %>less/init.less' + '<%= pkg.sources %>less/components.less' + '<%= pkg.sources %>less/pages.less' + '<%= pkg.sources %>less/style.less' - '<%= pkg.sources %>less/icons.less' - '<%= pkg.sources %>less/ui.less' - '<%= pkg.sources %>less/sonar-colorizer.less' - '<%= pkg.sources %>less/dashboard.less' - '<%= pkg.sources %>less/select-list.less' - '<%= pkg.sources %>less/navigator.less' + '<%= pkg.sources %>less/*.less' ] diff --git a/server/sonar-web/src/main/hbs/nav/nav-settings-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-settings-navbar.hbs index a3a80218b5c..d368d724dd1 100644 --- a/server/sonar-web/src/main/hbs/nav/nav-settings-navbar.hbs +++ b/server/sonar-web/src/main/hbs/nav/nav-settings-navbar.hbs @@ -1,5 +1,11 @@
-