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

assets/follow: update classes to match refactor, add a4 prefix, corre… #2535

Merged
merged 2 commits into from
Feb 5, 2024
Merged

assets/follow: update classes to match refactor, add a4 prefix, corre… #2535

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
8d53723
assets/follow: update classes to match refactor, add a4 prefix, corre…
philli-m Oct 23, 2023
a284714
deps: update a4 hash for follow changes
philli-m Oct 24, 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
4 changes: 4 additions & 0 deletions adhocracy-plus/assets/scss/_utility.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@
color: $text-muted;
}

.a4-sr-only {
@extend .visually-hidden;
}

// FIXME BS5.1 changed text- and bg- classes are created requires additional SASS map
.text-info {
color: $brand-info;
Expand Down
2 changes: 1 addition & 1 deletion adhocracy-plus/assets/scss/components/_accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

a[href^="/documents"]:before {
content: "\f016"; // file-o
font-family: "FontAwesome", sans-serif;
font-family: "Font Awesome 5 Free", sans-serif;
font-weight: 900;
margin-right: 0.3em;
}
Expand Down
3 changes: 2 additions & 1 deletion adhocracy-plus/assets/scss/components/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
margin-bottom: 0;
}

.btn {
.btn,
.a4-btn {
@extend %button-base;

&:disabled,
Expand Down
25 changes: 19 additions & 6 deletions adhocracy-plus/assets/scss/components/_follow.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
.follow__notification {
.a4-follow__notification {
.alert {
margin-top: $r-spacer;
}
}

// nasty overwrite, needs to be changed in a4
.a4-btn--follow:before,
.a4-btn--following:before {
font-family: "Font Awesome\ 5 Free", sans-serif;
font-weight: 900;
margin-right: 0.3em;
}

.a4-btn--follow:before {
content: "\f067"; // plus
}

.a4-btn--following:before {
content: "\f00c"; // check
}

.follow > .btn--light,
.follow > .btn--primary {
.a4-btn--follow,
.a4-btn--following {
background-color: transparent;
border: none;
}

.project-header--image {
.follow > .btn--light,
.follow > .btn--primary {
.a4-btn--follow,
.a4-btn--following {
color: $white;
background-color: transparent;
border: none;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"@fortawesome/fontawesome-free": "5.15.4",
"@maplibre/maplibre-gl-leaflet": "0.0.19",
"adhocracy4": "git+https://github.com/liqd/adhocracy4#db03f3478931a39013fa50de183d5042a6cc284b",
"adhocracy4": "git+https://github.com/liqd/adhocracy4#7378cb6f161a79e5dd9b1d685b62502614fcd35f",
"autoprefixer": "10.4.14",
"bootstrap": "5.2.3",
"css-loader": "6.8.1",
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# A4
git+https://github.com/liqd/adhocracy4.git@db03f3478931a39013fa50de183d5042a6cc284b#egg=adhocracy4
git+https://github.com/liqd/adhocracy4.git@7378cb6f161a79e5dd9b1d685b62502614fcd35f#egg=adhocracy4

# Additional requirements
brotli==1.0.9
Expand Down