From 2239816344f01a59aca66bccb326dd7775f3b1b1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 7 Nov 2015 14:22:15 +0000 Subject: [PATCH] Extract the "Add filter" drop-down from the table (#19097). git-svn-id: http://svn.redmine.org/redmine/trunk@14831 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/queries/_filters.html.erb | 12 ++++-------- public/stylesheets/application.css | 4 +++- public/stylesheets/responsive.css | 3 +++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/views/queries/_filters.html.erb b/app/views/queries/_filters.html.erb index ba5d2dbae..13dcc704d 100644 --- a/app/views/queries/_filters.html.erb +++ b/app/views/queries/_filters.html.erb @@ -12,17 +12,13 @@ $(document).ready(function(){ }); <% end %> - - - - - -
-
+ +
<%= label_tag('add_filter_select', l(:label_filter_add)) %> <%= select_tag 'add_filter_select', filters_options_for_select(query), :name => nil %> -
+ + <%= hidden_field_tag 'f[]', '' %> <% include_calendar_headers_tags %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 6a367bb9b..9af8d244c 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -378,7 +378,9 @@ fieldset#filters td.operator select {max-width:170px;} fieldset#filters td.values { white-space:nowrap; } fieldset#filters td.values select {min-width:130px;} fieldset#filters td.values input {height:1em;} -fieldset#filters td.add-filter { text-align: right; vertical-align: top; } + +#filters-table {width:60%; float:left;} +.add-filter {width:35%; float:right; text-align: right; vertical-align: top;} #issue_is_private_wrap {float:right; margin-right:1em;} .toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;} diff --git a/public/stylesheets/responsive.css b/public/stylesheets/responsive.css index 6664827df..26f125047 100644 --- a/public/stylesheets/responsive.css +++ b/public/stylesheets/responsive.css @@ -716,6 +716,9 @@ padding-right: 0; } + #filters-table {width:100%; float:none;} + .add-filter {width:100%; float:none; text-align: left; margin-top: 8px;} + /*----------------------------------------*\ F) PAGE SPECIFIC STYLES \*----------------------------------------*/