Skip to content

Commit

Permalink
Merge pull request #453 from equalizedigital/feature/local-dev-branch
Browse files Browse the repository at this point in the history
team padding
  • Loading branch information
tronsymphony authored Oct 20, 2023
2 parents 4b37a4f + 00db78c commit 2b0e1c4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 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.

2 changes: 1 addition & 1 deletion assets/scss/blocks/team-hightlight.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.team-hightlight-block {
padding: 100px 0 50px;
padding: 40px 0 20px;

@include media(">tablet") {
padding: 100px 0 150px;
Expand Down
4 changes: 4 additions & 0 deletions assets/scss/blocks/vendor-repeater.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
.vendor_repeater_block {
&_container_items {
overflow: scroll;
display: flex;
align-items: center;
justify-content: center;
}
&_container_items_table {
border: 1px solid #D9D9D9;
display: table;


@include media("<tablet") {
display: none;
Expand Down
10 changes: 5 additions & 5 deletions assets/scss/modules/_base-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
@if 1 == $size {
@include font-sizes( 44px, 46px, 70px );
} @else if 2 == $size {
@include font-sizes( 34px, 36px, 45px );
@include font-sizes( 25px, 25px, 35px );
} @else if 3 == $size {
@include font-sizes( 27px, 28px, 35px );
@include font-sizes( 20px, 20px, 30px );
} @else if 4 == $size {
@include font-sizes( 24px, 25px, 25px );
@include font-sizes( 18px, 18px, 20px );
} @else if 5 == $size {
@include font-sizes( 22px, 23px, 20px );
@include font-sizes( 18px, 18px, 18px );
} @else if 6 == $size {
@include font-sizes( 20px, 21px, 16px );
@include font-sizes( 18px, 18px, 18px );
}

} @else if 'subtitle' == $type {
Expand Down
3 changes: 0 additions & 3 deletions assets/scss/partials/_blocks-base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,9 @@ h1 {

h2 {
@include style('title', 2);

color: brand-color('tertiary');
font-size: 35px;
font-weight: 700;
line-height: 40px;

&.wp-block-heading {
margin-top: 59px
}
Expand Down

0 comments on commit 2b0e1c4

Please sign in to comment.