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.

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

Stage #943

Merged
merged 27 commits into from
Nov 9, 2023
Merged

Stage #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
75bad73
Merge pull request #568 from equalizedigital/feature/local-dev-branch
tronsymphony Oct 25, 2023
e324127
Merge branch 'hotfix/block-screenshots' into stage
SteveJonesDev Oct 25, 2023
0b50113
Merge branch 'hotfix/block-screenshots' into stage
SteveJonesDev Oct 25, 2023
4f6fafb
Merge pull request #577 from equalizedigital/feature/local-dev-branch
tronsymphony Oct 25, 2023
2797412
Merge pull request #580 from equalizedigital/feature/local-dev-branch
tronsymphony Oct 25, 2023
f0b172e
Merge pull request #586 from equalizedigital/feature/local-dev-branch
tronsymphony Oct 25, 2023
75a68ec
Merge pull request #920 from equalizedigital/feature/local-dev-branch
tronsymphony Nov 7, 2023
7076179
quote
tronsymphony Nov 8, 2023
27172a9
table
tronsymphony Nov 8, 2023
4bbdbd2
toc
tronsymphony Nov 8, 2023
484383a
desc
tronsymphony Nov 8, 2023
ed85c85
100px padding
tronsymphony Nov 8, 2023
84023ce
border
tronsymphony Nov 8, 2023
b50537d
institute name
tronsymphony Nov 8, 2023
449258b
padding
tronsymphony Nov 9, 2023
9cf7319
min w
tronsymphony Nov 9, 2023
2ae048b
link
tronsymphony Nov 9, 2023
3cae25c
[Marker.io] hide linkedin button#668
tronsymphony Nov 9, 2023
e83b0ee
btn
tronsymphony Nov 9, 2023
598f184
padding
tronsymphony Nov 9, 2023
e15bb7a
Merge branch 'stage' into feature/local-dev-branch
tronsymphony Nov 9, 2023
144e87a
Merge pull request #940 from equalizedigital/feature/local-dev-branch
tronsymphony Nov 9, 2023
cf7ab11
class
tronsymphony Nov 9, 2023
92c7bff
Merge pull request #941 from equalizedigital/feature/local-dev-branch
tronsymphony Nov 9, 2023
4793133
0!important
tronsymphony Nov 9, 2023
e5d7e75
Merge pull request #942 from equalizedigital/feature/local-dev-branch
tronsymphony Nov 9, 2023
b5deba6
Merge branch 'master' into stage
tronsymphony Nov 9, 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 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: 2 additions & 0 deletions assets/scss/blocks/form-column.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
position: relative;
border-radius: 10px;
z-index: 12;
box-shadow: 0px 15px 27px rgba(161,165,165,0.25);

@include media(">tablet") {
padding: 70px 85px;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/blocks/tab-block.scss
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ button.tab-block-container__heading__button:hover {

.tab-block-container-tab-block_content_items_item_container:nth-last-child(1) {
//border: none;
padding-bottom: 0;
// padding-bottom: 0;
@include media(">tablet") {
padding-bottom: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/blocks/tabbed-content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
&__nav-item {
padding: 0;
display: flex;
min-width: 182px;
min-width: 120px;
@include media(">tablet") {
min-width: 137px;
}
Expand Down
18 changes: 7 additions & 11 deletions assets/scss/blocks/table-of-contents.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
.page {
.table-of-contents-block.post_format_style-standard {
.toc-nav-container {
display: block;
@include media(">tablet") {
display: block;
}
}

.table-of-contents-block-container-main {
Expand Down Expand Up @@ -153,18 +155,9 @@
/* These are technically the same, but use both */
overflow-wrap: break-word;
word-wrap: break-word;

-ms-word-break: break-all;
/* This is the dangerous one in WebKit, as it breaks things wherever */
word-break: break-all;
/* Instead use this non-standard one: */
word-break: break-word;
word-break: break-word;

/* Adds a hyphen where the word breaks, if supported (No Blink) */
-ms-hyphens: auto;
-moz-hyphens: auto;
-webkit-hyphens: auto;
hyphens: auto;
}
}

Expand Down Expand Up @@ -323,6 +316,9 @@
display: inline-flex;
justify-content: flex-end;
align-items: center;
.btn, .wp-block-button__link{
min-width: 48px;
}
}

.contents-nav-mobile-header-dropdown-select .text {
Expand Down
8 changes: 2 additions & 6 deletions assets/scss/blocks/team-hightlight.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
padding: 40px 0 20px;

@include media(">tablet") {
padding: 100px 0 150px;
padding: 100px 0 50px;
}

&-styling-1 {
Expand All @@ -18,7 +18,6 @@
.team-hightlight-block-container-team-hightlight-member__photo img{
@include media("<tablet") {
height: 33vw;
// border-radius: 10px!important;
}
}

Expand Down Expand Up @@ -72,12 +71,9 @@
width: 100%;
object-fit: cover;
object-position: center;
border-radius: 0px;

@include media(">tablet") {
height: 220px;
// border-radius: 10px;

}
}
}
Expand All @@ -86,7 +82,7 @@
&-container {
max-width: 1168px;
margin: 0 auto;
padding: 0 24px;
// padding: 0 24px;

&-header {
margin-bottom: 20px;
Expand Down
6 changes: 3 additions & 3 deletions assets/scss/blocks/vendor-information-block.scss
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
gap: 14px;
align-items: center;
justify-content: center;
margin-left: auto;

span {
display: inline-flex;
Expand Down Expand Up @@ -324,11 +325,10 @@
.subtext {
color: #000;
text-align: center;
font-size: 12px;
font-size: 16px;
font-style: normal;
font-weight: 300;
line-height: 13px;
//108.333%
line-height: 20px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/modules/_base-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
} @else if 2 == $size {
@include font-sizes( 25px, 25px, 35px );
} @else if 3 == $size {
@include font-sizes( 20px, 20px, 30px );
@include font-sizes( 20px, 20px, 20px );
} @else if 4 == $size {
@include font-sizes( 18px, 18px, 20px );
} @else if 5 == $size {
Expand Down
7 changes: 7 additions & 0 deletions assets/scss/partials/_archive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@
}
}
}

.press-archive-page{
.site-main-article-content {
padding-bottom: 0!important;
}
}

.archive {
.site-main-article-content {
max-width: 1168px;
Expand Down
50 changes: 37 additions & 13 deletions assets/scss/partials/_blocks-base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,35 @@ a {
font-weight: 400;
text-decoration: underline;
@extend %transition;

&:hover {
text-decoration: none;
color: brand-color('tertiary');
}

&:focus {
text-decoration: none;
}

svg {
@extend %transition;
}
}

// Global Focus
button:focus-within, button:focus,
.button:focus-within, .button:focus,
a:focus-within, a:focus,
a:focus-within, a:focus,
button:focus-within,
button:focus,
.button:focus-within,
.button:focus,
a:focus-within,
a:focus,
a:focus-within,
a:focus,
input:focus {
outline: 2px solid blue;
outline-offset: 2px;
text-decoration: none;
outline: 2px solid blue;
outline-offset: 2px;
text-decoration: none;

.is-style-white {
outline: 2px solid $white;
}
Expand Down Expand Up @@ -152,8 +160,9 @@ h2 {
color: brand-color('tertiary');
font-weight: 700;
line-height: 40px;

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

}
Expand Down Expand Up @@ -310,7 +319,7 @@ input {


.wp-block-table {
margin-bottom: 20px;
margin-bottom: 20px;

table {
thead {
Expand All @@ -335,9 +344,11 @@ margin-bottom: 20px;
font-style: normal;
font-weight: 700;
line-height: 18px;
/* 128.571% */
padding: 18px 20px;
padding: 5px;
text-align: left;
@include media(">tablet") {
padding: 18px 20px;
}
}

td {
Expand All @@ -346,7 +357,10 @@ margin-bottom: 20px;
font-style: normal;
font-weight: 400;
line-height: 18px;
padding: 10px 20px;
padding: 5px;
@include media(">tablet") {
padding: 10px 20px;
}
}
}

Expand All @@ -362,5 +376,15 @@ margin-bottom: 20px;
}

iframe {
max-width: 100%;
max-width: 100%;
}

.wptb-preview-table {
tr:nth-child(1) {
background-color: #625089 !important;
}
}

.di-calculator .di-table_results {
box-shadow: none !important;
}
16 changes: 16 additions & 0 deletions assets/scss/partials/_blocks-core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ img {
padding-left: 16px;
padding-right: 16px;
}

img{
margin-bottom: 20px;
}
}

.wp-block-gallery ul {
Expand Down Expand Up @@ -320,6 +324,18 @@ img {
background-color: $white;
}

.margin-0{
margin: 0;
}

.wptb-cell .wptb-ph-element a {
color: var(--WCAG-Green, #547C2D)!important;
}

.wp-block-embed-youtube {
margin-bottom: 24px;
}

/* Group
--------------------------------------------- */

Expand Down
Loading