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

6527 Clean up _forms.scss #7167

Merged
merged 2 commits into from
Aug 4, 2021
Merged

6527 Clean up _forms.scss #7167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fd62ec
6527 Clean up _forms.scss
fessehaye Aug 3, 2021
b72315d
Merge branch 'master' into 6527-forms
fessehaye Aug 4, 2021
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
10 changes: 10 additions & 0 deletions source/js/components/join/join.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,19 @@
.form-control {
padding-right: map-get($glyph-container, "margin-x") * 2 +
map-get($glyph-container, "width");
border: 1px solid $danger;

@at-root .dark-theme & {
border-width: 2px;
border-color: $dark-theme-danger;
}
}

.form-control-feedback {
color: $danger;

@at-root .dark-theme & {
color: $dark-theme-danger;
}
}

Expand Down
26 changes: 26 additions & 0 deletions source/js/components/petition/petition.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,29 @@
}
}
}

.petition-form {
.form-check {
.form-control-feedback {
margin-left: -$form-check-input-gutter;
}
}

.has-danger {
.form-control-feedback {
color: $danger;

@at-root .dark-theme & {
color: $dark-theme-danger;
}
}

.form-control {
border: 1px solid $danger;

@at-root .dark-theme & {
border-color: $dark-theme-danger;
}
}
}
}
4 changes: 0 additions & 4 deletions source/sass/mofo-bootstrap/mofo-bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,3 @@

// Utility classes
@import "../../../node_modules/bootstrap/scss/utilities";

// Bootstrap overrides

@import "./overrides/forms";
29 changes: 0 additions & 29 deletions source/sass/mofo-bootstrap/overrides/_forms.scss
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions source/sass/views/style-guide.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@
.color-code {
color: $gray-60;
}

.form-control-lg {
height: auto;
}