Skip to content

Commit

Permalink
Merge pull request #456 from equalizedigital/feature/local-dev-branch
Browse files Browse the repository at this point in the history
Feature/local dev branch
  • Loading branch information
tronsymphony authored Oct 20, 2023
2 parents 877c1cb + 2402fa0 commit 2573c2f
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 5 deletions.
2 changes: 1 addition & 1 deletion assets/css/editor-style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/main.css.map

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion assets/scss/blocks/team-hightlight.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@
text-align: left;
}

.team-hightlight-block-container-team-hightlight-member__photo img{
@include media("<tablet") {
height: 80vw;
border-radius: 10px 0 0 10px;

}
}

.team-hightlight-block-container-team-hightlight-member__button{
overflow: unset;
}

.team-hightlight-block-container-team-hightlight-member__content .job {
color: #000;
font-size: 14px;
Expand Down Expand Up @@ -112,7 +124,6 @@
border-radius: 10px;
border: 1px solid #D9D9D9;
padding: 0 !important;
overflow: hidden;

@include media("<tablet") {
opacity: 1;
Expand All @@ -137,6 +148,7 @@
flex-direction: column;
cursor: pointer;
padding: 0;
overflow: hidden;
}

&__content {
Expand Down Expand Up @@ -178,6 +190,7 @@
object-position: center;
width: 100%;
height: 100%;
border-radius: 10px 0 0 10px;
@include media(">tablet") {
height: 110px;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/partials/_blocks-core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
background-color: transparent;
}
&:focus{
color: black;
color: white;
outline: 2px solid white;
}
}
Expand Down
1 change: 1 addition & 0 deletions assets/scss/partials/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ header.site-header {
list-style: none;
display: grid;
grid-template-columns: 1fr;
padding: 0;

a {
color: black;
Expand Down

0 comments on commit 2573c2f

Please sign in to comment.