Skip to content

Commit 7195b40

Browse files
author
OpenShift Bot
authored
Merge pull request #1216 from sg00dwin/default-filter-width
Merged by openshift-bot
2 parents 3af61e9 + bcfdce1 commit 7195b40

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

app/styles/_data-toolbar.less

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
/* Data toolbar
22
- Includes customizations for label filter input and active filter
33
---------------------------------------------------------------------------- */
4+
// @screen-md-min - (sidebar-left + left + right margin); 992 - (145 + 30 + 30) = 787
5+
@data-toolbar-filter-max-width: (@screen-md-min - (@sidebar-left-width-md + @middle-content-container-padding-lg + @middle-content-container-padding-lg));
6+
@label-filter-input-width-lg: 730px; // max width available for input at > 992
7+
@label-filter-input-width-md: 540px; // max width available for input at > 768
8+
@label-filter-input-width-sm: 400px; // max width available for input at > 480
9+
@label-filter-input-width-xs: 240px; // 320 - (40 + 40); container - ((left + right margin) + button)
10+
411

512
.data-toolbar {
613
padding: 5px 0;
@@ -26,13 +33,20 @@
2633
.flex(@columns: 1 1 0%);
2734
}
2835
@media (min-width: @screen-md-min) {
29-
max-width: 600px;
36+
max-width: @data-toolbar-filter-max-width;
3037
}
3138
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input {
3239
&, & input {
3340
font-size: @font-size-base;
3441
}
3542
}
43+
.label-filter-key .selectize-input.not-full {
44+
// Increase default input click target
45+
width: @label-filter-input-width-xs;
46+
@media (min-width: @screen-xs-min) { width: @label-filter-input-width-sm;}
47+
@media (min-width: @screen-sm-min) { width: @label-filter-input-width-md;}
48+
@media (min-width: @screen-md-min) { width: @label-filter-input-width-lg;}
49+
}
3650
.form-group {
3751
margin-bottom: 0;
3852
}

dist/styles/main.css

+8-2
Original file line numberDiff line numberDiff line change
@@ -4137,9 +4137,16 @@ copy-to-clipboard .input-group.limit-width{max-width:300px}
41374137
.data-toolbar{padding:5px 0}
41384138
.data-toolbar.other-resources-toolbar .data-toolbar-dropdown{min-width:210px}
41394139
.data-toolbar .checkbox{margin-bottom:0;margin-top:10px}
4140+
.data-toolbar .data-toolbar-filter .label-filter-key .selectize-input.not-full{width:240px}
4141+
@media (min-width:480px){.data-toolbar .data-toolbar-filter .label-filter-key .selectize-input.not-full{width:400px}
4142+
}
41404143
@media (min-width:768px){.data-toolbar{display:-webkit-flex;display:-moz-flex;display:-ms-flexbox;display:-ms-flex;display:flex}
41414144
.data-toolbar .checkbox{-webkit-flex:1 1 0%;-moz-flex:1 1 0%;-ms-flex:1 1 0%;flex:1 1 0%;margin-left:20px;margin-top:3px;text-align:right}
41424145
.data-toolbar .data-toolbar-filter{-webkit-flex:1 1 0%;-moz-flex:1 1 0%;-ms-flex:1 1 0%;flex:1 1 0%}
4146+
.data-toolbar .data-toolbar-filter .label-filter-key .selectize-input.not-full{width:540px}
4147+
}
4148+
@media (min-width:992px){.data-toolbar .data-toolbar-filter{max-width:787px}
4149+
.data-toolbar .data-toolbar-filter .label-filter-key .selectize-input.not-full{width:730px}
41434150
}
41444151
.data-toolbar .data-toolbar-filter .form-group{margin-bottom:0}
41454152
.data-toolbar .data-toolbar-views{-webkit-flex:0 1 auto;-moz-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;text-align:right}
@@ -4193,8 +4200,7 @@ h2+.list-view-pf{margin-top:20px}
41934200
.list-view-pf-additional-info-item{display:inline-block;text-align:left}
41944201
.list-view-pf-description{-ms-flex:1 0 55%;flex:1 0 55%}
41954202
.list-view-pf-main-info{padding-bottom:10px;padding-top:10px}
4196-
@media (min-width:992px){.data-toolbar .data-toolbar-filter{max-width:600px}
4197-
.list-view-pf .list-group-item-heading,.list-view-pf .list-group-item-text{-ms-flex:1 0 auto;flex:1 0 auto;margin:0;padding:0 20px 0 0;width:50%}
4203+
@media (min-width:992px){.list-view-pf .list-group-item-heading,.list-view-pf .list-group-item-text{-ms-flex:1 0 auto;flex:1 0 auto;margin:0;padding:0 20px 0 0;width:50%}
41984204
.list-view-pf-additional-info{width:40%}
41994205
.list-view-pf-description{width:60%}
42004206
}

0 commit comments

Comments
 (0)