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

a4-comments: adapt scss to a4 changes after mB redesign #2747

Merged
merged 1 commit into from
Aug 28, 2024
Merged

a4-comments: adapt scss to a4 changes after mB redesign #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions adhocracy-plus/assets/scss/components/_a4-comments.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,12 @@
}

.a4-comments__action-bar-container {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
align-items: center;
@media screen and (min-width: $breakpoint) {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
align-items: center;
}
}

.a4-comments__action-bar {
Expand All @@ -152,6 +154,10 @@
&:first-child {
margin-left: 0 !important;
}

i {
margin-right: 0.4em;
}
}

.a4-comments__border--highlighted {
Expand Down
25 changes: 16 additions & 9 deletions adhocracy-plus/assets/scss/components/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
// icon in module categories dropdown
.dropdown-item__icon {
max-width: 2 * $spacer;
}

.dropdown-toggle > .dropdown-item__icon {
display: none;
}

// bootstrap overwrites
.dropdown-menu {
position: relative;
Expand Down Expand Up @@ -55,3 +46,19 @@
display: none;
}
}

// icon in module categories dropdown
.dropdown-item__icon {
max-width: 2 * $spacer;
}

.dropdown-toggle > .dropdown-item__icon {
display: none;
}

// comments customization
.a4-comments__dropdown {
.dropdown-item {
padding: 0;
}
}
7 changes: 7 additions & 0 deletions adhocracy-plus/assets/scss/components/_rating.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
}
}

.rating__label {
position: absolute;
visibility: hidden;
height: 0;
width: 0;
}

.rating-button {
font-weight: normal;
padding: 0 0.4em;
Expand Down
2 changes: 2 additions & 0 deletions changelog/7864.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
### Changed
- small css overwrites to adapt to a4 changes
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 @@ -18,7 +18,7 @@
"@fortawesome/fontawesome-free": "5.15.4",
"@maplibre/maplibre-gl-leaflet": "0.0.20",
"@react-leaflet/core": "^2.1.0",
"adhocracy4": "git+https://github.com/liqd/adhocracy4#main",
"adhocracy4": "git+https://github.com/liqd/adhocracy4#e10457d42e72d39d305c2579c5de5ce98f65be9c",
"autoprefixer": "10.4.19",
"bootstrap": "5.2.3",
"css-loader": "7.1.2",
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@main#egg=adhocracy4
git+https://github.com/liqd/adhocracy4.git@e10457d42e72d39d305c2579c5de5ce98f65be9c#egg=adhocracy4

# Additional requirements
brotli==1.1.0
Expand Down