From 2cb0710049f3cc946ba51b1ab6e797e73b1da390 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 20 Jul 2017 17:39:24 +0200 Subject: [PATCH] make sure all pages fit on minimum width --- .../js/apps/background-tasks/background-tasks.css | 2 +- .../apps/background-tasks/components/DateFilter.js | 2 +- .../js/apps/background-tasks/components/Search.js | 4 ++-- .../src/main/js/apps/projects-admin/search.js | 2 +- .../js/apps/quality-gates/components/Condition.js | 2 +- .../src/main/js/apps/quality-profiles/styles.css | 2 +- .../src/main/less/components/side-tabs.less | 1 + server/sonar-web/src/main/less/init/forms.less | 12 +++++++----- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/background-tasks/background-tasks.css b/server/sonar-web/src/main/js/apps/background-tasks/background-tasks.css index a957b5f0250..74307146109 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/background-tasks.css +++ b/server/sonar-web/src/main/js/apps/background-tasks/background-tasks.css @@ -1,6 +1,6 @@ .bt-search-form { display: flex; - align-items: flex-start; + align-items: flex-end; } .bt-search-form > li + li { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/DateFilter.js b/server/sonar-web/src/main/js/apps/background-tasks/components/DateFilter.js index 4ca30c41c13..98bd76ece05 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/DateFilter.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/DateFilter.js @@ -67,7 +67,7 @@ export default class DateFilter extends Component { const { minSubmittedAt, maxExecutedAt } = this.props; return ( -
+
this.handleQueryChange(e.target.value)} value={query} ref="searchInput" - className="js-search input-large" + className="js-search input-medium" type="search" placeholder="Search" /> @@ -136,7 +136,7 @@ export default class Search extends React.PureComponent { {this.renderSearchBox()} -
  • +
  • {' '} diff --git a/server/sonar-web/src/main/js/apps/projects-admin/search.js b/server/sonar-web/src/main/js/apps/projects-admin/search.js index 65e6e0fb9d3..15340c64104 100644 --- a/server/sonar-web/src/main/js/apps/projects-admin/search.js +++ b/server/sonar-web/src/main/js/apps/projects-admin/search.js @@ -149,7 +149,7 @@ export default class Search extends React.PureComponent { onChange={this.search} value={this.props.query} ref="input" - className="search-box-input" + className="search-box-input input-medium" type="search" placeholder="Search" /> diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.js b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.js index ce2ff884636..ca9c1af2283 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.js +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.js @@ -227,7 +227,7 @@ export default class Condition extends Component { const { condition, edit, metric } = this.props; return ( - + {getLocalizedMetricName(metric)} {metric.hidden && 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 f00a77c24b1..9320f748773 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 @@ -21,7 +21,7 @@ .quality-profiles-table-projects, .quality-profiles-table-rules, .quality-profiles-table-date { - min-width: 90px; + min-width: 80px; } .quality-profiles-list-header { diff --git a/server/sonar-web/src/main/less/components/side-tabs.less b/server/sonar-web/src/main/less/components/side-tabs.less index b7cd0da337c..b92417e1ffa 100644 --- a/server/sonar-web/src/main/less/components/side-tabs.less +++ b/server/sonar-web/src/main/less/components/side-tabs.less @@ -39,6 +39,7 @@ border: 1px solid @barBorderColor; box-sizing: border-box; background-color: #fff; + overflow: auto; .modal & { border-top: none; diff --git a/server/sonar-web/src/main/less/init/forms.less b/server/sonar-web/src/main/less/init/forms.less index 1a0a37e5e32..a5ed2ce62d1 100644 --- a/server/sonar-web/src/main/less/init/forms.less +++ b/server/sonar-web/src/main/less/init/forms.less @@ -261,7 +261,9 @@ input[type="submit"].button-promote { color: #fff; transition: background-color 0.3s ease; - &:hover, &:focus, &.active { + &:hover, + &:focus, + &.active { background-color: darken(#5041d2, 10%); } } @@ -322,16 +324,16 @@ input[type="submit"].button-promote { } .input-tiny { - width: 60px; + width: 60px !important; } .input-small { - width: 100px; + width: 100px !important; } .input-medium { - width: 150px; + width: 150px !important; } .input-large { - width: 200px; + width: 200px !important; } .input-super-large { width: 100%; -- 2.39.5