From 0602314a782dd03b565d862a849dfc6ceaea60e3 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 1 Jun 2018 17:28:42 +0200 Subject: [PATCH] load search-navigator.css before app styles (fixes selector specificity) --- .../sonar-web/src/main/js/apps/coding-rules/components/App.tsx | 2 +- .../src/main/js/apps/component-measures/components/App.js | 2 +- server/sonar-web/src/main/js/apps/issues/components/App.tsx | 2 +- .../src/main/js/apps/projects/components/AllProjects.tsx | 2 +- .../main/js/apps/quality-gates/components/QualityGatesApp.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx index 8a4bba330b8..e0c989cc633 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx @@ -53,8 +53,8 @@ import FiltersHeader from '../../../components/common/FiltersHeader'; import SearchBox from '../../../components/controls/SearchBox'; import { searchQualityProfiles, Profile } from '../../../api/quality-profiles'; import { scrollToElement } from '../../../helpers/scrolling'; -import '../styles.css'; import '../../../components/search-navigator.css'; +import '../styles.css'; const PAGE_SIZE = 100; const LIMIT_BEFORE_LOAD_MORE = 5; diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/App.js b/server/sonar-web/src/main/js/apps/component-measures/components/App.js index e08fcd60aed..a9e552dc77d 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/App.js +++ b/server/sonar-web/src/main/js/apps/component-measures/components/App.js @@ -38,8 +38,8 @@ import { getDisplayMetrics } from '../../../helpers/measures'; /*:: import type { RawQuery } from '../../../helpers/query'; */ /*:: import type { Metric } from '../../../store/metrics/actions'; */ /*:: import type { MeasureEnhanced } from '../../../components/measure/types'; */ -import '../style.css'; import '../../../components/search-navigator.css'; +import '../style.css'; /*:: type Props = {| branchLike?: { id?: string; name: string }, diff --git a/server/sonar-web/src/main/js/apps/issues/components/App.tsx b/server/sonar-web/src/main/js/apps/issues/components/App.tsx index ec8f1ccd38a..708e786183e 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/App.tsx @@ -70,8 +70,8 @@ import { scrollToElement } from '../../../helpers/scrolling'; import EmptySearch from '../../../components/common/EmptySearch'; import Checkbox from '../../../components/controls/Checkbox'; import DropdownIcon from '../../../components/icons-components/DropdownIcon'; -import '../styles.css'; import '../../../components/search-navigator.css'; +import '../styles.css'; interface FetchIssuesPromise { components: ReferencedComponent[]; diff --git a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx index af1e89e5ed5..2da30f32e17 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx @@ -36,8 +36,8 @@ import { RawQuery } from '../../../helpers/query'; import { Project, Facets } from '../types'; import { fetchProjects, parseSorting, SORTING_SWITCH } from '../utils'; import { parseUrlQuery, Query } from '../query'; -import '../styles.css'; import '../../../components/search-navigator.css'; +import '../styles.css'; export interface Props { currentUser: CurrentUser; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/QualityGatesApp.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/QualityGatesApp.tsx index d7031041608..5365defbe8e 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/QualityGatesApp.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/QualityGatesApp.tsx @@ -28,8 +28,8 @@ import { fetchQualityGates } from '../../../api/quality-gates'; import { translate } from '../../../helpers/l10n'; import { getQualityGateUrl } from '../../../helpers/urls'; import { Organization, QualityGate } from '../../../app/types'; -import '../styles.css'; import '../../../components/search-navigator.css'; +import '../styles.css'; interface Props { children: React.ReactElement<{ -- 2.39.5