Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: combined filter dropdown padding and colors. #3113

Merged
merged 11 commits into from
Oct 3, 2023
Merged

fix: combined filter dropdown padding and colors. #3113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c2b3186
fix: combined filter dropdown padding and colors.
crhallberg Sep 21, 2023
7dc973c
fix: button styles and indenting.
crhallberg Sep 27, 2023
617239f
Merge remote-tracking branch 'origin/dev' into fix-collaped-filters
crhallberg Sep 27, 2023
fc3e970
Merge remote-tracking branch 'origin/dev' into fix-collaped-filters
crhallberg Sep 28, 2023
bfa0a78
fix: add spacing between title pairs.
crhallberg Sep 28, 2023
b805f3f
Merge branch 'dev' into fix-collaped-filters
demiankatz Sep 29, 2023
c99c1b3
One more pixel of vertical padding.
demiankatz Sep 29, 2023
ca2b9e3
Merge branch 'dev' into fix-collaped-filters
demiankatz Oct 3, 2023
3b64e41
Merge branch 'dev' into fix-collaped-filters
demiankatz Oct 3, 2023
1c04a5d
Another pixel of margin.
demiankatz Oct 3, 2023
41eb34a
More margin fixes.
demiankatz Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion themes/bootprint3/css/compiled.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions themes/bootprint3/less/bootprint.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ header .navbar {
.navbar-nav > li .dropdown-toggle {
position: relative;
padding: 12px 6px;
color: @link-color;

&:hover,
&:focus {
Expand Down
3 changes: 1 addition & 2 deletions themes/bootprint3/less/common.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
a,
.btn-link,
button.dropdown-toggle {
.btn-link {
color: #06C;
&:hover { color: #09F; }
&:active { color: #000; }
Expand Down
1 change: 1 addition & 0 deletions themes/bootprint3/scss/bootprint.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ header .navbar {
.navbar-nav > li .dropdown-toggle {
position: relative;
padding: 12px 6px;
color: $link-color;

&:hover,
&:focus {
Expand Down
3 changes: 1 addition & 2 deletions themes/bootprint3/scss/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
a,
.btn-link,
button.dropdown-toggle {
.btn-link {
color: #06C;
&:hover { color: #09F; }
&:active { color: #000; }
Expand Down
2 changes: 1 addition & 1 deletion themes/bootstrap3/css/compiled.css
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions themes/bootstrap3/less/bootstrap.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ label { cursor: pointer; }
}
}
}
.navbar-nav button.dropdown-toggle {
.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
appearance: none;
padding: 15px;
border: 0;
color: inherit;
background-color: transparent;
}

// Normalize highlighting
.highlight,
Expand Down Expand Up @@ -150,14 +158,6 @@ h3 { font-size: 16px; }
#modal .form-control { max-width: none; }
}

button.dropdown-toggle {
.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
appearance: none;
padding: 15px;
border: 0;
color: @brand-primary;
}

/* ------ Layout ------ */
footer {
&:extend(.container);
Expand Down
9 changes: 6 additions & 3 deletions themes/bootstrap3/less/components/search.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ body.rtl {
padding: 0 .5rem;
white-space: nowrap;
}
}
}
}
}

Expand Down Expand Up @@ -518,7 +518,7 @@ body.rtl {
display: flex;
gap: 1rem;
align-items: start;
margin-block: 0.5rem;
margin-block-start: 0.5rem;

.retain-filters {
float: right;
Expand All @@ -544,6 +544,7 @@ body.rtl {
}
.filters {
flex: 10 1 auto;
margin-block-start: 0.25rem;

.collapse {
display: none;
Expand All @@ -565,7 +566,7 @@ body.rtl {
}
.filter-value {
display: inline-block;
margin: 5px;
margin-block: 5px;
padding: 2px 8px;
font-weight: 600;
color: #fff;
Expand All @@ -587,6 +588,7 @@ body.rtl {
}
.title-value-pair {
display: inline-block;
margin-inline-end: 0.5rem;
}
}
}
Expand All @@ -599,6 +601,7 @@ body.rtl {
gap: 0.25rem;

margin-bottom: 4px;
margin-top: 4px;
padding: .5rem 1rem;
border: 0;
color: #555;
Expand Down
16 changes: 8 additions & 8 deletions themes/bootstrap3/scss/bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ label { cursor: pointer; }
}
}
}
.navbar-nav button.dropdown-toggle {
@include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
appearance: none;
padding: 15px;
border: 0;
color: inherit;
background-color: transparent;
}

// Normalize highlighting
.highlight,
Expand Down Expand Up @@ -150,14 +158,6 @@ h3 { font-size: 16px; }
#modal .form-control { max-width: none; }
}

button.dropdown-toggle {
@include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
appearance: none;
padding: 15px;
border: 0;
color: $brand-primary;
}

/* ------ Layout ------ */
footer {
@extend .container;
Expand Down
9 changes: 6 additions & 3 deletions themes/bootstrap3/scss/components/search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ body.rtl {
padding: 0 .5rem;
white-space: nowrap;
}
}
}
}
}

Expand Down Expand Up @@ -518,7 +518,7 @@ body.rtl {
display: flex;
gap: 1rem;
align-items: start;
margin-block: 0.5rem;
margin-block-start: 0.5rem;

.retain-filters {
float: right;
Expand All @@ -544,6 +544,7 @@ body.rtl {
}
.filters {
flex: 10 1 auto;
margin-block-start: 0.25rem;

.collapse {
display: none;
Expand All @@ -565,7 +566,7 @@ body.rtl {
}
.filter-value {
display: inline-block;
margin: 5px;
margin-block: 5px;
padding: 2px 8px;
font-weight: 600;
color: #fff;
Expand All @@ -587,6 +588,7 @@ body.rtl {
}
.title-value-pair {
display: inline-block;
margin-inline-end: 0.5rem;
}
}
}
Expand All @@ -599,6 +601,7 @@ body.rtl {
gap: 0.25rem;

margin-bottom: 4px;
margin-top: 4px;
padding: .5rem 1rem;
border: 0;
color: #555;
Expand Down
2 changes: 1 addition & 1 deletion themes/local_theme_example/css/compiled.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion themes/sandal/css/compiled.css
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions themes/sandal/less/sandal.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ header {
button.dropdown-toggle {
color: @white;
background-color: transparent;
&:hover { color: @header-light; }
}
.btn-primary {
color: @black;
Expand All @@ -71,7 +70,7 @@ header {
border-color: @black;
}
.nav > li > a,
button.dropdown-toggle {
.navbar-nav button.dropdown-toggle {
&:hover,
&:focus {
color: @black;
Expand Down
24 changes: 10 additions & 14 deletions themes/sandal/less/search.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,15 @@
}
}

.reset-filters-btn {
.active-filters .reset-filters-btn {
font-weight: bold;
color: #fff;
background-color: rgba(255,255,255,.1);
background-color: rgba(255,255,255,0.2);
border-radius: 4px;
}
.active-filters .reset-filters-btn:hover {
color: #fff;
background-color: rgba(255,255,255,.2);

&:hover {
background-color: rgba(255,255,255,0.3);
}
}
.active-filters .filters .filter-value,
.search-filter-dropdown .btn,
Expand All @@ -302,14 +302,10 @@
.active-filters .search-filter-remove {
color: @mid-gray;
}
.search-filter-dropdown .btn {
box-shadow: 0 3px 3px rgba(0,0,0,.3);

&::after {
display: inline-block;
width: 1rem;
margin-right: -0.5rem;
}
.search-filter-dropdown .btn::after {
display: inline-block;
width: 1rem;
margin-right: -0.5rem;
}
.search-filter-dropdown .btn:active {
box-shadow: none;
Expand Down
3 changes: 1 addition & 2 deletions themes/sandal/scss/sandal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ header {
button.dropdown-toggle {
color: $white;
background-color: transparent;
&:hover { color: $header-light; }
}
.btn-primary {
color: $black;
Expand All @@ -71,7 +70,7 @@ header {
border-color: $black;
}
.nav > li > a,
button.dropdown-toggle {
.navbar-nav button.dropdown-toggle {
&:hover,
&:focus {
color: $black;
Expand Down
24 changes: 10 additions & 14 deletions themes/sandal/scss/search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,15 @@
}
}

.reset-filters-btn {
.active-filters .reset-filters-btn {
font-weight: bold;
color: #fff;
background-color: rgba(255,255,255,.1);
background-color: rgba(255,255,255,0.2);
border-radius: 4px;
}
.active-filters .reset-filters-btn:hover {
color: #fff;
background-color: rgba(255,255,255,.2);

&:hover {
background-color: rgba(255,255,255,0.3);
}
}
.active-filters .filters .filter-value,
.search-filter-dropdown .btn,
Expand All @@ -302,14 +302,10 @@
.active-filters .search-filter-remove {
color: $mid-gray;
}
.search-filter-dropdown .btn {
box-shadow: 0 3px 3px rgba(0,0,0,.3);

&::after {
display: inline-block;
width: 1rem;
margin-right: -0.5rem;
}
.search-filter-dropdown .btn::after {
display: inline-block;
width: 1rem;
margin-right: -0.5rem;
}
.search-filter-dropdown .btn:active {
box-shadow: none;
Expand Down