Skip to content
Snippets Groups Projects
Commit 5c6d77f5 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch '21-use-iconify-for-material-icons-instead-of-icon-font' into 'master'

Resolve "Use iconify for Material Icons instead of icon font"

Closes #21

See merge request AlekSIS/onboarding/AlekSIS-App-Matrix!6
parents 2059f990 c14eec09
No related branches found
No related tags found
1 merge request!6Resolve "Use iconify for Material Icons instead of icon font"
Pipeline #64062 failed
...@@ -5,7 +5,7 @@ MENUS = { ...@@ -5,7 +5,7 @@ MENUS = {
{ {
"name": _("Matrix"), "name": _("Matrix"),
"url": "#", "url": "#",
"icon": "chat", "svg_icon": "simple-icons:matrix",
"root": True, "root": True,
"validators": [ "validators": [
( (
...@@ -17,7 +17,7 @@ MENUS = { ...@@ -17,7 +17,7 @@ MENUS = {
{ {
"name": _("Groups and Rooms"), "name": _("Groups and Rooms"),
"url": "matrix_rooms", "url": "matrix_rooms",
"icon": "group_work", "svg_icon": "mdi:account-group-outline",
"validators": [ "validators": [
( (
"aleksis.core.util.predicates.permission_validator", "aleksis.core.util.predicates.permission_validator",
......
...@@ -16,13 +16,15 @@ ...@@ -16,13 +16,15 @@
<div class="card"> <div class="card">
<div class="card-content"> <div class="card-content">
<div class="card-title">{% trans "Filter groups" %}</div> <div class="card-title">
<i class="material-icons left small iconify" data-icon="mdi:filter-multiple-outline"></i>
{% trans "Filter groups" %}
</div>
<form method="get"> <form method="get">
{% form form=filter.form %}{% endform %} {% form form=filter.form %}{% endform %}
{% trans "Search" as caption %} {% include "core/partials/save_button.html" with caption=_("Filter") icon="mdi:filter-outline" %}
{% include "core/partials/save_button.html" with caption=caption icon="search" %}
<button type="reset" class="btn red waves-effect waves-light"> <button type="reset" class="btn red waves-effect waves-light">
<i class="material-icons left">clear</i> <i class="material-icons left iconify" data-icon="mdi:filter-remove-outline"></i>
{% trans "Clear" %} {% trans "Clear" %}
</button> </button>
</form> </form>
...@@ -36,7 +38,10 @@ ...@@ -36,7 +38,10 @@
{% csrf_token %} {% csrf_token %}
<div class="row"> <div class="row">
<div class="col s12 {% if action_form %}m4 l4 xl6{% endif %}"> <div class="col s12 {% if action_form %}m4 l4 xl6{% endif %}">
<div class="card-title">{% trans "Selected groups" %}</div> <div class="card-title">
<i class="material-icons left small iconify" data-icon="mdi:account-group-outline"></i>
{% trans "Selected groups" %}
</div>
</div> </div>
{% if action_form %} {% if action_form %}
<div class="col s12 m8 l8 xl6"> <div class="col s12 m8 l8 xl6">
...@@ -46,7 +51,7 @@ ...@@ -46,7 +51,7 @@
<div class="col s12 m4"> <div class="col s12 m4">
<button type="submit" class="btn waves-effect waves-primary"> <button type="submit" class="btn waves-effect waves-primary">
{% trans "Execute" %} {% trans "Execute" %}
<i class="material-icons right">send</i> <i class="material-icons right iconify" data-icon="mdi:send-outline"></i>
</button> </button>
</div> </div>
</div> </div>
......
...@@ -35,7 +35,7 @@ python = "^3.9" ...@@ -35,7 +35,7 @@ python = "^3.9"
aleksis-core = "^2.7" aleksis-core = "^2.7"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
aleksis-builddeps = "^6" aleksis-builddeps = "*"
matrix-synapse = "^1.49.2" matrix-synapse = "^1.49.2"
pytest-xprocess = "^0.18.1" pytest-xprocess = "^0.18.1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment