Skip to content

Commit 5165745

Browse files
author
Fatih Alp
authored
Merge pull request #11 from openclassify/mostafa
filters form responsive issues were fixed
2 parents b40de95 + 475f54d commit 5165745

File tree

3 files changed

+27
-24
lines changed

3 files changed

+27
-24
lines changed

resources/config/settings/settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
'menu_link_color' => [
106106
'type' => 'anomaly.field_type.colorpicker',
107107
'config' => [
108-
'default_value' => '#ccc'
108+
'default_value' => '#ffffff'
109109
]
110110
],
111111
'links_color' => [

resources/css/theme.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ color: {{ setting_value('visiosoft.theme.defaultadmin::primary_color') }} !impor
8989
margin-left: 7px;
9090
}
9191
#menu > ul > li > a:hover {
92-
color: #eeeeee;
92+
color: #fff;
9393
}
9494
#menu > ul > li.active > a, #menu > ul > li.highlighted > a {
95-
color: #eeeeee;
95+
color: #fff;
9696
}
9797
#menu > ul > li.section-label span {
9898
font-size: 10px;
@@ -116,10 +116,10 @@ color: {{ setting_value('visiosoft.theme.defaultadmin::primary_color') }} !impor
116116
color: rgba(255, 255, 255, 0.3);
117117
}
118118
#menu > ul > li ul li a:hover {
119-
color: #eeeeee;
119+
color: #fff;
120120
}
121121
#menu > ul > li ul li.active > a {
122-
color: #eeeeee;
122+
color: #fff;
123123
}
124124

125125
@media (max-width: 991px) {
@@ -593,7 +593,7 @@ select + .select2 {
593593
}
594594

595595
.form-control {
596-
color: #999;
596+
color: {{ setting_value('visiosoft.theme.defaultadmin::input_placeholder_color')}} !important;
597597
}
598598

599599
.px-2p {
@@ -3188,7 +3188,7 @@ background-color: {{ setting_value('visiosoft.theme.defaultadmin::background_col
31883188
#menu > ul > li > a,#sidebar > ul > li > a > span, #sidebar > ul > li > a > i {
31893189
color: {{ setting_value('visiosoft.theme.defaultadmin::menu_link_color') }} !important;
31903190
transition: 0.5s;
3191-
opacity: 0.6;
3191+
opacity: 0.7;
31923192
}
31933193
#menu > ul > li > a:hover {
31943194
opacity: 1;

resources/views/table/partials/filters.twig

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,27 @@
88
{{ icon(table.options.filters.filter_icon ?: 'filter') }}
99
{{ trans(table.options.filters.filter_text ?: 'streams::button.filter') }}
1010
</div>
11-
<div class="collapse" id="t10">
12-
<div class="row px-1 relative">
13-
{% for filter in table.filters %}
14-
<div class="col-sm-12 col-md-6 col-lg-3 px-2p" id="form-input-{{ loop.index }}">
15-
<div class="form-group filter_inputs" data-id="{{ loop.index }}">
16-
{{ filter.input|raw }}
11+
<div id="t10">
12+
<div class="container-fluid">
13+
<div class="row">
14+
{% for filter in table.filters %}
15+
<div class="col-sm-12 col-md-6 col-lg-4 px-2p" id="form-input-{{ loop.index }}">
16+
<div class="form-group filter_inputs" data-id="{{ loop.index }}">
17+
{{ filter.input|raw }}
18+
</div>
1719
</div>
20+
{% endfor %}
21+
<div class="col-sm-12 col-md-6 col-lg-4 px-2p position-relative">
22+
<button type="submit" class="btn btn-success float-left">
23+
{{ icon(table.options.filters.filter_icon ?: 'filter') }}
24+
{{ trans(table.options.filters.filter_text ?: 'streams::button.filter') }}
25+
</button>
26+
<a href="{{ url_current() }}{{ request_has('view') ? '?view=' ~ request_get('view') }}"
27+
class="btn btn-inverse float-left">
28+
{{ icon(table.options.filters.clear_icon ? table.options.filters.clear_icon) }}
29+
{{ trans(table.options.filters.clear_text ?: 'streams::button.clear') }}
30+
</a>
1831
</div>
19-
{% endfor %}
20-
<div class="col-sm-12 col-md-6 col-lg-3 px-2p">
21-
<button type="submit" class="btn btn-success">
22-
{{ icon(table.options.filters.filter_icon ?: 'filter') }}
23-
{{ trans(table.options.filters.filter_text ?: 'streams::button.filter') }}
24-
</button>
25-
<a href="{{ url_current() }}{{ request_has('view') ? '?view=' ~ request_get('view') }}"
26-
class="btn btn-inverse">
27-
{{ icon(table.options.filters.clear_icon ? table.options.filters.clear_icon) }}
28-
{{ trans(table.options.filters.clear_text ?: 'streams::button.clear') }}
29-
</a>
3032
</div>
3133
</div>
3234
</div>
@@ -62,6 +64,7 @@
6264
6365
.px-2p {
6466
padding: 0 2px 0 2px;
67+
margin-bottom: 2px;
6568
}
6669
6770
.dont-collapse-sm {

0 commit comments

Comments
 (0)