Skip to content

Commit

Permalink
Merge branch 'fix/zakra' into staging
Browse files Browse the repository at this point in the history
# Conflicts:
#	assets/css/main.min.css
#	assets/css/main.src.css
#	assets/css/main.src.css.map
#	assets/css/src/parts/terraso.scss
  • Loading branch information
paulschreiber committed Aug 3, 2023
2 parents e70813a + a8c8fbb commit d324094
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion assets/css/main.min.css

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion assets/css/main.src.css
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,12 @@ header .uag-toc__heading-anchor + .zak-page-header__title {
.zak-footer .zak-footer-col {
gap: 0;
}
.zak-footer .zak-footer-col h3 {
border-bottom: none;
}
.zak-footer .zak-footer-col h3::before {
display: none;
}
.zak-footer section.widget_media_image {
display: inline-block;
}
Expand All @@ -256,7 +262,6 @@ header .uag-toc__heading-anchor + .zak-page-header__title {
text-transform: uppercase;
font-size: 1.4rem;
font-weight: bold;
border-bottom: none;
}
@media screen and (max-width: 768px) {
.zak-footer h3 {
Expand Down
2 changes: 1 addition & 1 deletion assets/css/main.src.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion assets/css/src/parts/terraso.scss
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,14 @@ header {

.zak-footer-col {
gap: 0;

h3 {
border-bottom: none;

&::before {
display: none; // hide bottom bar
}
}
}

// social media icons
Expand Down Expand Up @@ -201,7 +209,6 @@ header {
text-transform: uppercase;
font-size: 1.4rem;
font-weight: bold;
border-bottom: none;

@media screen and (max-width: 768px) {
margin-bottom: 0.5rem;
Expand Down

0 comments on commit d324094

Please sign in to comment.