From 71be078d65965418ae0a270e7e7a2c458797653a Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 9 May 2017 10:05:34 +0200 Subject: [PATCH] use prettier-css (#2035) --- server/sonar-web/package.json | 2 ++ .../apps/about/sonarqube-dot-com-styles.css | 5 +---- .../src/main/js/apps/about/styles.css | 2 +- .../js/apps/component-measures/styles.css | 9 +++----- .../src/main/js/apps/issues/styles.css | 14 +++++------- .../src/main/js/apps/overview/styles.css | 9 +++----- .../src/main/js/apps/permissions/styles.css | 4 +--- .../apps/projectActivity/components/Event.css | 4 +--- .../components/projectActivity.css | 8 ++----- .../src/main/js/apps/projects/styles.css | 6 ++--- .../main/js/apps/quality-profiles/styles.css | 8 +++---- .../src/main/js/apps/settings/styles.css | 9 +++----- .../main/js/apps/web-api/styles/web-api.css | 3 +-- .../js/components/SourceViewer/styles.css | 2 +- .../main/js/components/common/EmptySearch.css | 2 +- .../js/components/common/LocationIndex.css | 2 +- .../js/components/common/LocationMessage.css | 2 +- .../js/components/common/PrivateBadge.css | 2 +- .../common/UpgradeOrganizationBox.css | 2 +- .../src/main/js/components/ui/Rating.css | 16 ++++++++++---- server/sonar-web/yarn.lock | 22 +++++++++++++++++++ 21 files changed, 69 insertions(+), 64 deletions(-) diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json index 4ddbfe7fd06..f2b65457ee2 100644 --- a/server/sonar-web/package.json +++ b/server/sonar-web/package.json @@ -89,6 +89,7 @@ "path-exists": "2.1.0", "postcss-loader": "0.8.0", "prettier": "1.2.2", + "prettier-css": "0.0.7", "prettier-eslint": "5.1.0", "prettier-eslint-cli": "3.4.1", "react-addons-test-utils": "15.4.2", @@ -110,6 +111,7 @@ "test": "node scripts/test.js", "coverage": "npm test -- --coverage", "format": "prettier-eslint --write \"src/main/js/!(libs)/**/*.js\"", + "format-css": "prettier-css \"src/main/js/**/*.css\"", "lint": "eslint src/main/js", "typecheck": "flow src/main/js", "validate": "eslint src/main/js && flow check src/main/js && NODE_ENV=test jest --runInBand" diff --git a/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css b/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css index f89f0b1ff7a..4767143aa4e 100644 --- a/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css +++ b/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css @@ -22,9 +22,7 @@ align-items: center; } -.sqcom-about-page-intro { - -} +.sqcom-about-page-intro {} .sqcom-about-page-intro > h1 { line-height: 56px; @@ -143,4 +141,3 @@ .sqcom-about-quality-model svg { transform: translateY(-3px) !important; } - diff --git a/server/sonar-web/src/main/js/apps/about/styles.css b/server/sonar-web/src/main/js/apps/about/styles.css index 7d06cd0caf9..98e4186c6a6 100644 --- a/server/sonar-web/src/main/js/apps/about/styles.css +++ b/server/sonar-web/src/main/js/apps/about/styles.css @@ -131,7 +131,7 @@ line-height: 2; } -.about-quality-model .flex-column + .flex-column{ +.about-quality-model .flex-column + .flex-column { margin-left: 30px; padding-left: 30px; border-left: 1px solid #e6e6e6; diff --git a/server/sonar-web/src/main/js/apps/component-measures/styles.css b/server/sonar-web/src/main/js/apps/component-measures/styles.css index 4263ca5d406..12730c548c0 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/styles.css +++ b/server/sonar-web/src/main/js/apps/component-measures/styles.css @@ -5,8 +5,7 @@ margin-bottom: 20px; } -.measures-domains { -} +.measures-domains {} .measures-domains > li { margin-bottom: 20px; @@ -141,8 +140,7 @@ } .measure-details-metric, -.measure-details-value { -} +.measure-details-value {} .measure-details-metric { display: inline-block; @@ -223,8 +221,7 @@ fill: #4b9fd5; } -.measure-details-plain-list { -} +.measure-details-plain-list {} .measure-details-components { width: 300px; diff --git a/server/sonar-web/src/main/js/apps/issues/styles.css b/server/sonar-web/src/main/js/apps/issues/styles.css index 63867881965..2a4c5e6ee14 100644 --- a/server/sonar-web/src/main/js/apps/issues/styles.css +++ b/server/sonar-web/src/main/js/apps/issues/styles.css @@ -46,11 +46,9 @@ } .concise-issues-list-header, -.concise-issues-list-header-inner { -} +.concise-issues-list-header-inner {} -.concise-issues-list-header { -} +.concise-issues-list-header {} .concise-issues-list-header-inner { width: 260px; @@ -99,14 +97,14 @@ } .concise-issue-box:focus { - outline: none + outline: none; } .concise-issue-box.selected { z-index: 2; border-color: #dd4040; background-color: #ffeaea; - cursor: default + cursor: default; } .concise-issue-box-message { @@ -189,7 +187,7 @@ .issues .issue:hover { border-color: #dd4040; -} +} @media (max-width: 1320px) { .issues .issue-list { @@ -224,4 +222,4 @@ .issues-predefined-periods .search-navigator-facet { width: auto; margin-right: 4px; -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/js/apps/overview/styles.css b/server/sonar-web/src/main/js/apps/overview/styles.css index 39ca1605585..5ffdc19cd63 100644 --- a/server/sonar-web/src/main/js/apps/overview/styles.css +++ b/server/sonar-web/src/main/js/apps/overview/styles.css @@ -42,9 +42,7 @@ background-color: #f3f3f3; } -.overview-quality-gate-conditions-list { - -} +.overview-quality-gate-conditions-list {} .overview-quality-gate-condition { float: left; @@ -339,9 +337,7 @@ box-sizing: border-box; } -.overview-analysis { - -} +.overview-analysis {} .overview-analysis + .overview-analysis { margin-top: 8px; @@ -391,6 +387,7 @@ from { opacity: 0; } + to { opacity: 1; } diff --git a/server/sonar-web/src/main/js/apps/permissions/styles.css b/server/sonar-web/src/main/js/apps/permissions/styles.css index f016fa70a8b..e57af7a47f4 100644 --- a/server/sonar-web/src/main/js/apps/permissions/styles.css +++ b/server/sonar-web/src/main/js/apps/permissions/styles.css @@ -1,6 +1,4 @@ -.permissions-table { - -} +.permissions-table {} .permissions-table > tbody > tr > td { border-bottom: 10px solid #fff !important; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/Event.css b/server/sonar-web/src/main/js/apps/projectActivity/components/Event.css index 0a28479b429..ee96a69b0c0 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/Event.css +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/Event.css @@ -1,6 +1,4 @@ -.project-activity-event { - -} +.project-activity-event {} .project-activity-event + .project-activity-event { margin-top: 4px; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/projectActivity.css b/server/sonar-web/src/main/js/apps/projectActivity/components/projectActivity.css index 5e8d9a7d8de..2b69f15e803 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/projectActivity.css +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/projectActivity.css @@ -1,6 +1,4 @@ -.project-activity-days-list { - -} +.project-activity-days-list {} .project-activity-day { margin-bottom: 40px; @@ -16,9 +14,7 @@ font-weight: bold; } -.project-activity-analyses-list { - -} +.project-activity-analyses-list {} .project-activity-analysis { position: relative; diff --git a/server/sonar-web/src/main/js/apps/projects/styles.css b/server/sonar-web/src/main/js/apps/projects/styles.css index 4d113484e13..abc060f17ba 100644 --- a/server/sonar-web/src/main/js/apps/projects/styles.css +++ b/server/sonar-web/src/main/js/apps/projects/styles.css @@ -152,9 +152,7 @@ float: right; } -.projects-facets-reset .button { - -} +.projects-facets-reset .button {} .projects-facet-bar { display: inline-block; @@ -253,4 +251,4 @@ width: 500px; margin-left: -250px; text-align: center; -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/styles.css b/server/sonar-web/src/main/js/apps/quality-profiles/styles.css index 42c96abf9a8..0498b5b1d48 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/styles.css +++ b/server/sonar-web/src/main/js/apps/quality-profiles/styles.css @@ -11,7 +11,7 @@ padding-bottom: 10px; } -.quality-profiles-table-name { } +.quality-profiles-table-name {} .quality-profiles-table-inheritance { width: 280px; @@ -63,8 +63,7 @@ padding: 15px 20px 20px; } -.quality-profile-rules { -} +.quality-profile-rules {} .quality-profile-rules > header { padding: 15px 20px; @@ -98,8 +97,7 @@ margin-top: 20px; } -.quality-profile-inheritance { -} +.quality-profile-inheritance {} .quality-profile-not-found { padding-top: 100px; diff --git a/server/sonar-web/src/main/js/apps/settings/styles.css b/server/sonar-web/src/main/js/apps/settings/styles.css index 4a2926f69db..f8e42a325fd 100644 --- a/server/sonar-web/src/main/js/apps/settings/styles.css +++ b/server/sonar-web/src/main/js/apps/settings/styles.css @@ -25,8 +25,7 @@ transform: translateX(1px); } -.settings-menu { -} +.settings-menu {} .settings-menu > li { margin-bottom: 4px; @@ -163,11 +162,9 @@ border-top: 1px dotted #e6e6e6; } -.settings-sub-categories-list { -} +.settings-sub-categories-list {} -.settings-sub-categories-list > li { -} +.settings-sub-categories-list > li {} .settings-sub-categories-list > li + li { margin: 30px -20px 0; diff --git a/server/sonar-web/src/main/js/apps/web-api/styles/web-api.css b/server/sonar-web/src/main/js/apps/web-api/styles/web-api.css index 121d9b55a35..aa30002f3b3 100644 --- a/server/sonar-web/src/main/js/apps/web-api/styles/web-api.css +++ b/server/sonar-web/src/main/js/apps/web-api/styles/web-api.css @@ -32,8 +32,7 @@ line-height: 1.5; } -.web-api-domain-actions { -} +.web-api-domain-actions {} .web-api-action { padding-top: 30px; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/styles.css b/server/sonar-web/src/main/js/components/SourceViewer/styles.css index 367b35565d7..c1cf6a02e41 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/styles.css +++ b/server/sonar-web/src/main/js/components/SourceViewer/styles.css @@ -16,4 +16,4 @@ .issue-location.selected { border-color: #f4b1b0; background-color: #f4b1b0; -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/js/components/common/EmptySearch.css b/server/sonar-web/src/main/js/components/common/EmptySearch.css index 2ad32dd05e7..3bc2cf04725 100644 --- a/server/sonar-web/src/main/js/components/common/EmptySearch.css +++ b/server/sonar-web/src/main/js/components/common/EmptySearch.css @@ -4,4 +4,4 @@ border-radius: 2px; color: #777; text-align: center; -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/js/components/common/LocationIndex.css b/server/sonar-web/src/main/js/components/common/LocationIndex.css index d796e251a43..73b5cd8986e 100644 --- a/server/sonar-web/src/main/js/components/common/LocationIndex.css +++ b/server/sonar-web/src/main/js/components/common/LocationIndex.css @@ -43,4 +43,4 @@ a:hover > .location-index { .source-line-code-inner .location-index + .location-index { margin-left: 0; -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/js/components/common/LocationMessage.css b/server/sonar-web/src/main/js/components/common/LocationMessage.css index 341d13d94ac..0d9951513c1 100644 --- a/server/sonar-web/src/main/js/components/common/LocationMessage.css +++ b/server/sonar-web/src/main/js/components/common/LocationMessage.css @@ -40,4 +40,4 @@ .source-line-code .location-message { padding-top: 2px; padding-bottom: 2px; -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/js/components/common/PrivateBadge.css b/server/sonar-web/src/main/js/components/common/PrivateBadge.css index 6de55f9937f..a5a772ac53a 100644 --- a/server/sonar-web/src/main/js/components/common/PrivateBadge.css +++ b/server/sonar-web/src/main/js/components/common/PrivateBadge.css @@ -9,4 +9,4 @@ box-sizing: border-box; color: #777; font-size: 12px; -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/js/components/common/UpgradeOrganizationBox.css b/server/sonar-web/src/main/js/components/common/UpgradeOrganizationBox.css index eb5a45aa786..d997d9f484b 100644 --- a/server/sonar-web/src/main/js/components/common/UpgradeOrganizationBox.css +++ b/server/sonar-web/src/main/js/components/common/UpgradeOrganizationBox.css @@ -1,4 +1,4 @@ .upgrade-organization-box { max-width: 400px; background-color: #f3f3f3 !important; -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/js/components/ui/Rating.css b/server/sonar-web/src/main/js/components/ui/Rating.css index b16bc698e8e..2c7d5df1b4d 100644 --- a/server/sonar-web/src/main/js/components/ui/Rating.css +++ b/server/sonar-web/src/main/js/components/ui/Rating.css @@ -41,25 +41,33 @@ a > .rating-A { background-color: #b0d513; } -a .rating-B { border-bottom-color: #b0d513; } +a .rating-B { + border-bottom-color: #b0d513; +} .rating-C { background-color: #eabe06; } -a .rating-C { border-bottom-color: #eabe06; } +a .rating-C { + border-bottom-color: #eabe06; +} .rating-D { background-color: #ed7d20; } -a .rating-D { border-bottom-color: #ed7d20; } +a .rating-D { + border-bottom-color: #ed7d20; +} .rating-E { background-color: #e00; } -a .rating-E { border-bottom-color: #e00; } +a .rating-E { + border-bottom-color: #e00; +} .rating-small { width: 18px; diff --git a/server/sonar-web/yarn.lock b/server/sonar-web/yarn.lock index 2b747112c27..3936a65ab63 100644 --- a/server/sonar-web/yarn.lock +++ b/server/sonar-web/yarn.lock @@ -4725,6 +4725,15 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.1.2" +postcss@^5.2.17: + version "5.2.17" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b" + dependencies: + chalk "^1.1.3" + js-base64 "^2.1.9" + source-map "^0.5.6" + supports-color "^3.2.3" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -4737,6 +4746,13 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" +prettier-css@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/prettier-css/-/prettier-css-0.0.7.tgz#6dc62e708b9899c414f5be01cbdf3d87f4f8c84c" + dependencies: + glob "^7.1.1" + postcss "^5.2.17" + prettier-eslint-cli@3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/prettier-eslint-cli/-/prettier-eslint-cli-3.4.1.tgz#467bbf2caa0adddbed67bfc6f75b0a0cceb82311" @@ -5740,6 +5756,12 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2: dependencies: has-flag "^1.0.0" +supports-color@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + dependencies: + has-flag "^1.0.0" + svgo@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.1.tgz#287320fed972cb097e72c2bb1685f96fe08f8034" -- 2.39.5