From baa119d277e349100dfd7dfde3dd574a8df8b105 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 30 Jan 2014 12:50:35 +0600 Subject: [PATCH] New Issues Page: move "Issues Filter" icon to the first line --- .../webapp/javascripts/navigator/issues.js | 8 ++++++++ .../src/main/webapp/stylesheets/navigator.css | 18 ++++++++++-------- .../main/webapp/stylesheets/navigator/base.css | 15 ++++++++------- .../webapp/stylesheets/navigator/base.less | 6 ++++-- .../webapp/stylesheets/navigator/config.less | 2 +- .../webapp/stylesheets/navigator/filters.css | 3 ++- .../webapp/stylesheets/navigator/filters.less | 3 ++- 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues.js b/sonar-server/src/main/webapp/javascripts/navigator/issues.js index 106b28ec09f..adee9cdcc69 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/issues.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/issues.js @@ -352,6 +352,14 @@ jQuery(function() { }, + onAfterItemAdded: function(itemView) { + if (itemView.model.get('type') === window.SS.FavoriteFilterView || + itemView.model.get('type') === window.SS.IssuesFavoriteFilterView) { + jQuery('.navigator-header').addClass('navigator-header-favorite'); + } + }, + + search: function() { this.options.app.state.set({ query: this.options.app.getQuery(), diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.css b/sonar-server/src/main/webapp/stylesheets/navigator.css index 8f3974b6e99..b5f8c9bd1dc 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator.css +++ b/sonar-server/src/main/webapp/stylesheets/navigator.css @@ -18,14 +18,14 @@ top: 30px; left: 0; width: 100%; - height: 34px; + height: 37px; } .navigator-filters { position: fixed; z-index: 2; -moz-box-sizing: border-box; box-sizing: border-box; - top: 64px; + top: 67px; left: 0; width: 100%; height: 37px; @@ -35,7 +35,7 @@ z-index: 2; -moz-box-sizing: border-box; box-sizing: border-box; - top: 101px; + top: 104px; bottom: 30px; left: 0; width: 320px; @@ -45,7 +45,7 @@ z-index: 2; -moz-box-sizing: border-box; box-sizing: border-box; - top: 101px; + top: 104px; bottom: 0; left: 320px; right: 0; @@ -75,13 +75,14 @@ background-color: #efefef; font-size: 0; } +.navigator-header-favorite { + padding-left: 46px; +} .navigator-header-title { - position: relative; - top: -2px; display: inline-block; vertical-align: middle; font-size: 20px; - line-height: 34px; + line-height: 37px; } .navigator-header-description { display: inline-block; @@ -475,8 +476,9 @@ } .navigator-filter-favorite { position: absolute; - top: 0; + top: -100%; left: 0; + border-top: none; } .navigator-filter-favorite-toggle { width: 16px; diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.css b/sonar-server/src/main/webapp/stylesheets/navigator/base.css index 5831e63c51c..87f33b867fa 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator/base.css +++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.css @@ -18,14 +18,14 @@ top: 30px; left: 0; width: 100%; - height: 34px; + height: 37px; } .navigator-filters { position: fixed; z-index: 2; -moz-box-sizing: border-box; box-sizing: border-box; - top: 64px; + top: 67px; left: 0; width: 100%; height: 37px; @@ -35,7 +35,7 @@ z-index: 2; -moz-box-sizing: border-box; box-sizing: border-box; - top: 101px; + top: 104px; bottom: 30px; left: 0; width: 320px; @@ -45,7 +45,7 @@ z-index: 2; -moz-box-sizing: border-box; box-sizing: border-box; - top: 101px; + top: 104px; bottom: 0; left: 320px; right: 0; @@ -75,13 +75,14 @@ background-color: #efefef; font-size: 0; } +.navigator-header-favorite { + padding-left: 46px; +} .navigator-header-title { - position: relative; - top: -2px; display: inline-block; vertical-align: middle; font-size: 20px; - line-height: 34px; + line-height: 37px; } .navigator-header-description { display: inline-block; diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.less b/sonar-server/src/main/webapp/stylesheets/navigator/base.less index 3da5afed26c..a1b35b28e83 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator/base.less +++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.less @@ -74,9 +74,11 @@ font-size: 0; } +.navigator-header-favorite { + padding-left: 46px; +} + .navigator-header-title { - position: relative; - top: -2px; display: inline-block; vertical-align: middle; font-size: 20px; diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/config.less b/sonar-server/src/main/webapp/stylesheets/navigator/config.less index 656d3b06dfe..98d883de88e 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator/config.less +++ b/sonar-server/src/main/webapp/stylesheets/navigator/config.less @@ -3,7 +3,7 @@ // Layout @navigatorTopOffset: 30px; -@navigatorHeaderHeight: 34px; +@navigatorHeaderHeight: 37px; @navigatorFiltersHeight: 37px; @navigatorStatusHeight: 30px; diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/filters.css b/sonar-server/src/main/webapp/stylesheets/navigator/filters.css index d356410e195..940f9d56069 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator/filters.css +++ b/sonar-server/src/main/webapp/stylesheets/navigator/filters.css @@ -218,8 +218,9 @@ } .navigator-filter-favorite { position: absolute; - top: 0; + top: -100%; left: 0; + border-top: none; } .navigator-filter-favorite-toggle { width: 16px; diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/filters.less b/sonar-server/src/main/webapp/stylesheets/navigator/filters.less index 399e1cf6b4f..3f173867d8c 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator/filters.less +++ b/sonar-server/src/main/webapp/stylesheets/navigator/filters.less @@ -243,7 +243,8 @@ .navigator-filter-favorite { position: absolute; - top: 0; left: 0; + top: -100%; left: 0; + border-top: none; } .navigator-filter-favorite-toggle { -- 2.39.5