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.

Sign up for GitHub

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

Jump to bottom

Fix mixed declaration warnings in SCSS #8595

Merged
merged 6 commits into from
Oct 15, 2024
Merged

Fix mixed declaration warnings in SCSS #8595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42e6fe9
Fix mixed declaration warnings in SCSS
anselmbradford Sep 20, 2024
bbf6b03
Add TODO comment
anselmbradford Sep 26, 2024
4f0f592
Linter fixes
anselmbradford Sep 26, 2024
b6320cf
Merge branch 'main' into ans_fix_deprecated
anselmbradford Oct 10, 2024
7112466
Merge branch 'main' into ans_fix_deprecated
anselmbradford Oct 15, 2024
10ddd93
Merge branch 'main' into ans_fix_deprecated
anselmbradford Oct 15, 2024
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
4 changes: 4 additions & 0 deletions cfgov/unprocessed/apps/filing-instruction-guide/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,25 @@

h2 {
margin-top: 60px;

@include heading-1($has-margin-top: false);
}

h3 {
margin-top: 45px;

@include heading-2($has-margin-top: false);
}

&:not(.m-info-unit__heading-text) > h4 {
margin-top: 30px;

@include heading-3($has-margin-top: false);
}

h5 {
margin-top: 30px;

@include heading-4($has-margin-top: false);
}

Expand Down
3 changes: 1 addition & 2 deletions cfgov/unprocessed/apps/form-explainer/css/form-explainer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,12 @@ $colors: gold, red, blue, teal;

&.o-expandable__form-explainer-category-#{$index} {
background-color: $tint;
border-color: $light;

.o-expandable__header {
background-color: $light;
}

border-color: $light;

&.has-attention,
&:hover {
border-color: $med;
Expand Down
1 change: 1 addition & 0 deletions cfgov/unprocessed/apps/paying-for-college/css/cf-enhancements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@

&__text {
margin: 0;

@include heading-4($has-margin-bottom: false, $has-margin-top: false);
}
}
Expand Down
5 changes: 3 additions & 2 deletions cfgov/unprocessed/apps/paying-for-college/css/college-costs/financial-item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
.financial-item__label > :not(p),
.financial-item__value {
margin-bottom: 0;

@include heading-4($has-margin-bottom: false, $is-responsive: false);
}
}
Expand Down Expand Up @@ -163,11 +164,11 @@
}

.o-costs-group__content {
margin-bottom: math.div(15px, $base-font-size-px) + em;

.financial-item {
margin-top: math.div(15px, $base-font-size-px) + em;
}

margin-bottom: math.div(15px, $base-font-size-px) + em;
}

& [data-financial-item='gapLoan_gapLoan'] {
Expand Down
9 changes: 7 additions & 2 deletions cfgov/unprocessed/apps/paying-for-college/css/disclosures.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,20 @@ $bp-graph-cols-min: 740px;

&__prompt {
margin-bottom: math.div(30px, $size-ii) + em;

@include heading-2($has-margin-bottom: false, $is-responsive: false);
}

&__school,
&__location {
margin-bottom: math.div(15px, $size-iii) + em;

@include heading-3($has-margin-bottom: false, $is-responsive: false);

// Tablet and above.
@include respond-to-min($bp-sm-min) {
margin-bottom: math.div(5px, $size-iii) + em;
}
@include heading-3($has-margin-bottom: false, $is-responsive: false);
}
&__school {
margin-bottom: 0;
Expand All @@ -188,6 +191,7 @@ $bp-graph-cols-min: 740px;
&__heading,
&__label {
margin-bottom: 0;

@include heading-5($has-margin-bottom: false);
}

Expand Down Expand Up @@ -1029,9 +1033,10 @@ $bp-graph-cols-min: 740px;
}

&__projection-value {
text-align: right;

@include u-grid-column(5);
@include heading-4($is-responsive: false);
text-align: right;
}

&__explanation {
Expand Down
5 changes: 3 additions & 2 deletions cfgov/unprocessed/apps/prepaid-agreements/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
dt {
margin-bottom: math.div(math.div($grid-gutter-width, 6), $base-font-size-px) +
em;

@include heading-4($has-margin-bottom: false, $is-responsive: false);
}

Expand All @@ -33,12 +34,12 @@
}

.prepaid-agreements-search {
padding-top: 0 !important;

.o-multiselect__label {
word-break: break-word;
}

padding-top: 0 !important;

.filters {
&__applied {
padding: math.div(math.div($grid-gutter-width, 2), $base-font-size-px) +
Expand Down
9 changes: 6 additions & 3 deletions cfgov/unprocessed/apps/prepaid-agreements/css/search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@
}
}
.content__main {
&::after {
border: 0;
}
border: 0;
border-top: 1px solid var(--gray-40);
padding-top: 0;

&::after {
border: 0;
}
}
.results__count {
padding: (
Expand All @@ -73,6 +74,7 @@
border-right: 1px solid var(--gray-40);
border-bottom: 1px solid var(--gray-40);
background-color: var(--green-20);

&.no-results {
background-color: var(--red-20);
padding-bottom: 15px;
Expand All @@ -81,6 +83,7 @@
.results__list {
padding: (math.div($grid-gutter-width, $base-font-size-px) + em)
(math.div(math.div($grid-gutter-width, 2), $base-font-size-px) + em);

li {
list-style-type: none;
}
Expand Down
7 changes: 4 additions & 3 deletions cfgov/unprocessed/apps/regulations3k/css/reg-navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@
// Regs3K secondary nav sections
.o-regs3k-sections {
.o-expandable__header {
border: 0;

// Desktop and above.
@include respond-to-min($bp-med-min) {
padding: 0.9375em 0;
}
border: 0;
}

.o-expandable__content {
Expand Down Expand Up @@ -85,14 +86,14 @@

.o-regs3k-navigation__header {
display: none;
padding: (math.div(10px, $base-font-size-px) + em) 0
math.div(5px, $base-font-size-px) + em;

// Tablet and below.
@include respond-to-max($bp-sm-max) {
display: flex;
}

padding: (math.div(10px, $base-font-size-px) + em) 0
math.div(5px, $base-font-size-px) + em;
.o-expandable__label {
text-transform: uppercase;
}
Expand Down
10 changes: 7 additions & 3 deletions cfgov/unprocessed/apps/regulations3k/css/reg-search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
padding-bottom: 15px;
border-bottom: 1px solid var(--gray-40);
margin-bottom: 15px;

&:last-child {
border-bottom: none;
}
Expand All @@ -60,6 +61,7 @@
.o-expandable__header {
border: 0;
padding: 0;

&::before,
&::after {
border: 0;
Expand All @@ -68,19 +70,21 @@
}
}
.content__main {
&::after {
border: 0;
}
border: 0;
border-top: 1px solid var(--gray-40);
padding-top: 0;

&::after {
border: 0;
}
}
.results__count {
padding: math.div(math.div($grid-gutter-width, 2), $base-font-size-px) + em
math.div(math.div($grid-gutter-width, 2), $base-font-size-px) + em 0;
border-right: 1px solid var(--gray-40);
border-bottom: 1px solid var(--gray-40);
background-color: var(--green-20);

&.no-results {
background-color: var(--red-20);
padding-bottom: 15px;
Expand Down
1 change: 1 addition & 0 deletions cfgov/unprocessed/css/enhancements/typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dt {
display: inline-block;

margin-bottom: 0.5em;

@include heading-5($has-margin-bottom: false);

&:last-of-type {
Expand Down
2 changes: 1 addition & 1 deletion cfgov/unprocessed/css/molecules/related-posts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ $gap-half: math.div(15px, $base-font-size-px) + rem;
);

.m-list__link {
@include u-link-no-border;
@include u-link-colors(
var(--pacific),
var(--pacific),
var(--pacific-60),
var(--pacific),
var(--navy)
);
@include u-link-no-border;

&:hover {
border-bottom: 1px dotted;
Expand Down
3 changes: 2 additions & 1 deletion cfgov/unprocessed/css/molecules/social-media.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
font-size: math.div($grid-gutter-width, $base-font-size-px) + rem;
line-height: 1;

@include u-link-colors(var(--gray-dark), var(--pacific-80));
@include u-link-no-border;
@include u-link-colors(var(--gray-dark), var(--pacific-80));
}

// Only for elements in "share" (m-social-media--share) section.
&--share {
.m-social-media__heading {
margin: auto 0;

@include heading-5($has-margin-bottom: false, $has-margin-top: false);
}

Expand Down
9 changes: 6 additions & 3 deletions cfgov/unprocessed/css/organisms/info-unit-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@use '@cfpb/cfpb-design-system/src/abstracts' as *;

@mixin u-grid-column-top-divider() {
margin-top: math.div($grid-gutter-width * 2, $base-font-size-px) + em;
border-left-width: math.div($grid-gutter-width, 2);

&::before {
Expand Down Expand Up @@ -33,24 +32,28 @@

.content-l__top-divider {
.content-l__col-1 + .content-l__col-1 {
margin-top: math.div($grid-gutter-width * 2, $base-font-size-px) + em;

// Adds top divider between single-column info units
@include u-grid-column-top-divider;
}
}

.content-l__top-divider + .content-l__top-divider {
margin-top: math.div($grid-gutter-width, $base-font-size-px) + em;

// Adds top divider between multi-column info unit rows
@include u-grid-column-top-divider;
margin-top: math.div($grid-gutter-width, $base-font-size-px) + em;
}

// Mobile only.
@include respond-to-max($bp-xs-max) {
// Adds top divider between info unit cols on small screens
.content-l__top-divider {
.content-l__col + .content-l__col {
@include u-grid-column-top-divider;
margin-top: math.div($grid-gutter-width, $base-font-size-px) + em;

@include u-grid-column-top-divider;
}
}
}
Expand Down
Loading
Loading