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

Clean up CSS styling #164

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Clean up CSS styling #164

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
5 changes: 1 addition & 4 deletions integreat_compass/cms/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ <h2 class="text-gray-700 text-2xl font-semibold">{% translate "Filter" %}</h2>
type="checkbox"
{% if tag.id|stringformat:"i" in filtered_tags %}checked{% endif %}
value="{{ tag.id }}">
<label for="{{ tag.id }}"
class="px-2 py-1 mt-2 text-lg font-normal bg-tertiary rounded-full text-center hover:shadow-lg peer-checked:bg-primary peer-checked:border-none duration-200">
{{ tag }}
</label>
<label for="{{ tag.id }}" class="px-2 py-1 mt-2 gray-tag">{{ tag }}</label>
</div>
{% endfor %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion integreat_compass/cms/templates/interactions/report_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="flex justify-between">
<p class="text-gray-700">{% translate "Created at:" %} {{ report.offer_version.created_at|date:"d. M Y" }}</p>
<button id="offer-{{ report.id }}"
class="open-details btn btn-outline !font-normal py-3 px-4 border-2 !border-gray-600 !text-gray-600 bg-white hover:!bg-gray-600 hover:!text-white"
class="open-details btn btn-outline"
type="button">
<i class="mr-2" icon-name="link"></i>{% translate "Details" %}
</button>
Expand Down
2 changes: 1 addition & 1 deletion integreat_compass/cms/templates/interactions/vote_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<p class="text-gray-700">{% translate "Created at:" %} {{ offer_version.created_at|date:"d. M Y" }}</p>
<button id="offer-{{ offer_version.id }}"
type="button"
class="open-details btn btn-outline !font-normal py-3 px-4 border-2 !border-gray-600 !text-gray-600 bg-white hover:!bg-gray-600 hover:!text-white">
class="open-details btn btn-outline">
<i icon-name="link"></i>
{% translate "Details" %}
</button>
Expand Down
2 changes: 1 addition & 1 deletion integreat_compass/cms/templates/offers/my_offers_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h1 class="text-gray-700">{% translate "My offers" %}</h1>
</div>
{% endif %}
<div class="flex justify-end">
<button class="btn btn-outline !text-gray-600 bg-white mr-4 confirm-delete py-3 px-4 !border-gray-600 border-2 hover:!bg-gray-600 hover:!text-white"
<button class="btn btn-outline mr-4 confirm-delete"
type="submit"
data-confirm='{% translate "Are you sure you want to delete this offer?" %}'>
{% translate "Delete offer" %}
Expand Down
5 changes: 1 addition & 4 deletions integreat_compass/cms/templates/offers/offer_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,7 @@ <h2>{% translate "Offer details" %}</h2>
{% for choice in offer_form.tags %}
<div>
{{ choice.tag }}
<label for="{{ choice.id_for_label }}"
class="px-4 py-2 text-lg bg-tertiary font-normal rounded-full text-center hover:shadow-lg peer-checked:bg-primary peer-checked:text-gray-700 peer-checked:border-none duration-200">
{{ choice.choice_label }}
</label>
<label for="{{ choice.id_for_label }}" class="px-4 py-2 gray-tag">{{ choice.choice_label }}</label>
</div>
{% endfor %}
</div>
Expand Down
4 changes: 1 addition & 3 deletions integreat_compass/cms/templates/overlay/offer_application_overlay.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
<input type="hidden" name="offer_version_id" value="{{ offer_version.id }}">
<button type="button"
id="application-modal-{% if declined %}decline{% else %}accept{% endif %}-cancel-{{ offer_version.id }}"
class="btn btn-outline !bg-gray-600 !border-gray-600 hover:!bg-white hover:!text-gray-600 !text-white mr-4">
{% translate "Cancel" %}
</button>
class="btn btn-outline !font-bold mr-4">{% translate "Cancel" %}</button>
<button id="application-modal-confirm"
class="btn bg-primary"
type="submit"
Expand Down
16 changes: 14 additions & 2 deletions integreat_compass/static/src/css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ input[type="submit"] {
@apply pr-1;
}
&.btn-outline {
@apply border-2 border-primary text-primary bg-white;
@apply border-2 border-primary text-primary bg-white font-normal border-gray-600 text-gray-600;
&:hover {
@apply bg-primary text-white;
@apply bg-gray-600 text-white;
}
}
// Pseudo-classes
Expand Down Expand Up @@ -228,3 +228,15 @@ input[type="submit"] {
@apply w-5 h-5 absolute top-3 right-3 cursor-pointer;
}
}

/*******
* TAGS *
*******/

.gray-tag {
@apply text-lg bg-tertiary font-normal rounded-full text-center duration-200 peer-checked:bg-primary peer-checked:text-gray-700 peer-checked:border-none;

&:hover {
@apply shadow-lg;
}
}