Skip to content

[#2874] sorting field position #2943

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

Open
arc64 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[#2874] sorting field position #2943

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
8e8e4f0
Increase margin on badges
arc64 Apr 7, 2025
618864d
Forced filter bar items to not wrap
arc64 Apr 8, 2025
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
3 changes: 2 additions & 1 deletion adhocracy-plus/assets/scss/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ div.cke_focus {
.filter-bar__spaced {
margin-bottom: 0.5 * $spacer;
display: flex;

flex-wrap: nowrap;

div,
.dropdown > button {
min-width: revert;
Expand Down
2 changes: 2 additions & 0 deletions adhocracy-plus/assets/scss/components/_badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@

.badge {
display: inline-block;
background-color: $text-color;
color: contrast-color($text-color);
font-size: $font-size-xs;
font-weight: normal;
border-radius: 0.4em;
margin-bottom: 0.2em;
padding: 0.2em 0.7em;
text-align: start;
white-space: normal;
Expand Down
9 changes: 5 additions & 4 deletions adhocracy-plus/assets/scss/components/_organisation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,19 @@
}

.organisation__social-link {
width: 2rem;
height: 2rem;
width: 4rem;
height: 4rem;
position: relative;
background-color: $brand-secondary;
border-radius: 8rem;
border-radius: 10rem;

i {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 50%;
color: $white;
font-size: 1.8rem;
color: $black;
}
}
24 changes: 23 additions & 1 deletion apps/contrib/templates/a4_candy_contrib/component_library.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{% extends 'base.html' %}

{% block title %}Component Library — {{ block.super }}{% endblock %}
{% block title %}Component Library — {{ block.super }}{% endblock title %}

{% block content %}
{# djlint:off #}
<div class="container">
<div class="row">
<div class="col-md-3">
Expand Down Expand Up @@ -1525,6 +1526,26 @@ <h1 class="item-detail__title">Item Detail Title</h1>

<div class="item-detail__labels">
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
<div class="badge badge--big">Label</div>
</div>

<div class="item-detail__content">
Expand Down Expand Up @@ -2425,4 +2446,5 @@ <h2 id="cl-upload">Upload</h2>
</div>
</div>
</div>
{# djlint:on #}
{% endblock content %}
1 change: 1 addition & 0 deletions changelog/2732.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- **Fixed**: Add space for multi-row badges
1 change: 1 addition & 0 deletions changelog/2874.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- **Fixed**: Overflow and wrap on Brainstorming module filters