Skip to content

Commit 40d00c2

Browse files
authored
Merge pull request #1719 from codidact/0valt/button-fixes
Minor fix for the users page search button alignment
2 parents 8105497 + 2899302 commit 40d00c2

2 files changed

Lines changed: 14 additions & 9 deletions

File tree

app/assets/stylesheets/audit_logs.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
@import 'variables';
22

33
.audit-log-filters {
4-
.select2-container {
4+
.form-group-horizontal .actions, .select2-container {
55
height: 37px;
66
margin: 4px 0px;
7+
}
78

9+
.select2-container {
810
.selection {
911
.select2-selection {
1012
border-color: $muted-graphic;
@@ -18,4 +20,13 @@
1820
}
1921
}
2022
}
23+
24+
.form-group-horizontal {
25+
.actions {
26+
.button {
27+
height: 100%;
28+
margin: 0;
29+
}
30+
}
31+
}
2132
}

app/assets/stylesheets/forms.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,17 @@ select.form-element {
2020
}
2121

2222
& > .form-group {
23-
margin: 0 0 1em 0;
23+
margin: 0.5em 0;
2424

2525
@media screen and (min-width: $screen-md) {
26-
margin: 0 1em 0 0;
26+
margin: 0 0.5em;
2727
flex: 1;
2828
}
2929
}
3030

3131
& > .actions {
3232
display: flex;
3333
align-items: flex-end;
34-
margin-bottom: 4px; // to match bottom margin on .form-element
35-
36-
button, input[type="submit"] {
37-
margin: unset;
38-
padding: 9.5px 12px; // because for some reason it has to be 9.5px to match .form-elements' height
39-
}
4034
}
4135
}
4236

0 commit comments

Comments
 (0)