diff --git a/adhocracy-plus/assets/scss/_utility.scss b/adhocracy-plus/assets/scss/_utility.scss index e05813d5e..3239b15d5 100644 --- a/adhocracy-plus/assets/scss/_utility.scss +++ b/adhocracy-plus/assets/scss/_utility.scss @@ -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; diff --git a/adhocracy-plus/assets/scss/components/_accordion.scss b/adhocracy-plus/assets/scss/components/_accordion.scss index 9c8012719..17c4556c5 100644 --- a/adhocracy-plus/assets/scss/components/_accordion.scss +++ b/adhocracy-plus/assets/scss/components/_accordion.scss @@ -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; } diff --git a/adhocracy-plus/assets/scss/components/_button.scss b/adhocracy-plus/assets/scss/components/_button.scss index c976324b6..3282fe86f 100644 --- a/adhocracy-plus/assets/scss/components/_button.scss +++ b/adhocracy-plus/assets/scss/components/_button.scss @@ -43,7 +43,8 @@ margin-bottom: 0; } -.btn { +.btn, +.a4-btn { @extend %button-base; &:disabled, diff --git a/adhocracy-plus/assets/scss/components/_follow.scss b/adhocracy-plus/assets/scss/components/_follow.scss index a9d0e2ede..e0c86db8f 100644 --- a/adhocracy-plus/assets/scss/components/_follow.scss +++ b/adhocracy-plus/assets/scss/components/_follow.scss @@ -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; diff --git a/package.json b/package.json index 3d80582c5..493a0a22a 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/requirements/base.txt b/requirements/base.txt index 3a5c9af2f..fe84e441e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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