Skip to content

Commit

Permalink
Fix sidebar margins and padding on narrow screens (vufind-org#4130)
Browse files Browse the repository at this point in the history
Fixes margin between search tools and sidebar and the bottom padding of sidebar in sandal and sandal5.
  • Loading branch information
EreMaijala authored Dec 3, 2024
1 parent 58fa0c6 commit 7da2951
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 24 deletions.
2 changes: 1 addition & 1 deletion themes/bootprint3/css/compiled.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion themes/bootstrap3/css/compiled.css

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions themes/bootstrap3/less/components/search.less
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@ body.rtl {
}

.searchtools {
margin-bottom: 0.5rem;

h2 {
display: inline-block;
margin: 0;
Expand Down
5 changes: 4 additions & 1 deletion themes/bootstrap3/less/components/sidebar.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
.facet-group {
display: block;
margin-bottom: 1rem;
padding-left: 0;

&:not(:last-child) {
margin-bottom: 1rem;
}

[data-toggle="collapse"] {
cursor: pointer;
}
Expand Down
2 changes: 2 additions & 0 deletions themes/bootstrap3/scss/components/search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@ body.rtl {
}

.searchtools {
margin-bottom: 0.5rem;

h2 {
display: inline-block;
margin: 0;
Expand Down
5 changes: 4 additions & 1 deletion themes/bootstrap3/scss/components/sidebar.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
.facet-group {
display: block;
margin-bottom: 1rem;
padding-left: 0;

&:not(:last-child) {
margin-bottom: 1rem;
}

[data-toggle="collapse"] {
cursor: pointer;
}
Expand Down
2 changes: 1 addition & 1 deletion themes/bootstrap5/css/compiled.css

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions themes/bootstrap5/scss/components/search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@ body.rtl {
}

.searchtools {
margin-bottom: 0.5rem;

h2 {
display: inline-block;
margin: 0;
Expand Down
5 changes: 4 additions & 1 deletion themes/bootstrap5/scss/components/sidebar.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
.facet-group {
display: block;
margin-bottom: 1rem;
padding-left: 0;

&:not(:last-child) {
margin-bottom: 1rem;
}

[data-toggle="collapse"] {
cursor: pointer;
}
Expand Down
2 changes: 1 addition & 1 deletion themes/local_theme_example/css/compiled.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion themes/sandal/css/compiled.css

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions themes/sandal/less/sandal.less
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,7 @@ a:hover .login-dropdown-caret {

/* --- Sidebar --- */
.sidebar {
padding-top: 1rem;
padding-left: 1rem;
padding-right: 1rem;
padding: 1rem;
font-size: @reduced-font-size;
background-color: @light-gray;

Expand Down Expand Up @@ -270,7 +268,6 @@ a:hover .login-dropdown-caret {

@media (max-width: 1399px) {
.sidebar {
padding-left: 0.5rem;
padding-right: 0.5rem;
padding: 1rem 0.5rem 0.5rem 0.5rem;
}
}
7 changes: 2 additions & 5 deletions themes/sandal/scss/sandal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,7 @@ a:hover .login-dropdown-caret {

/* --- Sidebar --- */
.sidebar {
padding-top: 1rem;
padding-left: 1rem;
padding-right: 1rem;
padding: 1rem;
font-size: $reduced-font-size;
background-color: $light-gray;

Expand Down Expand Up @@ -270,7 +268,6 @@ a:hover .login-dropdown-caret {

@media (max-width: 1399px) {
.sidebar {
padding-left: 0.5rem;
padding-right: 0.5rem;
padding: 1rem 0.5rem 0.5rem 0.5rem;
}
}
2 changes: 1 addition & 1 deletion themes/sandal5/css/compiled.css

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions themes/sandal5/scss/sandal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,7 @@ a:hover .login-dropdown-caret {

/* --- Sidebar --- */
.sidebar {
padding-top: 1rem;
padding-left: 1rem;
padding-right: 1rem;
padding: 1rem;
font-size: $reduced-font-size;
background-color: $light-gray;

Expand Down Expand Up @@ -269,7 +267,6 @@ a:hover .login-dropdown-caret {

@media (max-width: 1399px) {
.sidebar {
padding-left: 0.5rem;
padding-right: 0.5rem;
padding: 1rem 0.5rem 0.5rem 0.5rem;
}
}

0 comments on commit 7da2951

Please sign in to comment.