Skip to content

Commit 9444c71

Browse files
committed
Update templates
1 parent 4898a09 commit 9444c71

20 files changed

Lines changed: 138 additions & 140 deletions

assets/css/src.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
.checkbox:checked {
2121
background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M5.707 7.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0-1.414-1.414L7 8.586 5.707 7.293z'/%3e%3c/svg%3e");
22-
background-color: currentColor;
23-
background-size: cover;
24-
background-position: center;
2522
background-repeat: no-repeat;
23+
background-position: center;
24+
background-size: cover;
25+
background-color: currentColor;
2626
}
2727

2828
#phpinfo .center {

assets/css/styles.css

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -633,8 +633,12 @@ svg {
633633
bottom: 0px;
634634
}
635635

636-
.right-0 {
637-
right: 0px;
636+
.top-5 {
637+
top: 1.25rem;
638+
}
639+
640+
.right-5 {
641+
right: 1.25rem;
638642
}
639643

640644
.left-1 {
@@ -649,10 +653,6 @@ svg {
649653
z-index: 50;
650654
}
651655

652-
.z-40 {
653-
z-index: 40;
654-
}
655-
656656
.m-1 {
657657
margin: 0.25rem;
658658
}
@@ -695,14 +695,14 @@ svg {
695695
margin-left: auto;
696696
}
697697

698-
.mb-4 {
699-
margin-bottom: 1rem;
700-
}
701-
702698
.ml-3 {
703699
margin-left: 0.75rem;
704700
}
705701

702+
.mr-3 {
703+
margin-right: 0.75rem;
704+
}
705+
706706
.mb-3 {
707707
margin-bottom: 0.75rem;
708708
}
@@ -731,10 +731,6 @@ svg {
731731
margin-left: 0.25rem;
732732
}
733733

734-
.mr-3 {
735-
margin-right: 0.75rem;
736-
}
737-
738734
.ml-64 {
739735
margin-left: 16rem;
740736
}
@@ -787,6 +783,10 @@ svg {
787783
width: 100%;
788784
}
789785

786+
.w-auto {
787+
width: auto;
788+
}
789+
790790
.w-16 {
791791
width: 4rem;
792792
}
@@ -1018,9 +1018,9 @@ svg {
10181018
background-color: rgb(226 232 240 / var(--tw-bg-opacity));
10191019
}
10201020

1021-
.bg-gray-300 {
1021+
.bg-gray-400 {
10221022
--tw-bg-opacity: 1;
1023-
background-color: rgb(209 213 219 / var(--tw-bg-opacity));
1023+
background-color: rgb(156 163 175 / var(--tw-bg-opacity));
10241024
}
10251025

10261026
.bg-sky-500 {
@@ -1122,10 +1122,6 @@ svg {
11221122
padding: 0.75rem;
11231123
}
11241124

1125-
.p-5 {
1126-
padding: 1.25rem;
1127-
}
1128-
11291125
.p-1\.5 {
11301126
padding: 0.375rem;
11311127
}
@@ -1134,6 +1130,10 @@ svg {
11341130
padding: 0.25rem;
11351131
}
11361132

1133+
.p-5 {
1134+
padding: 1.25rem;
1135+
}
1136+
11371137
.p-4 {
11381138
padding: 1rem;
11391139
}
@@ -1474,10 +1474,10 @@ svg {
14741474

14751475
.checkbox:checked {
14761476
background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M5.707 7.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0-1.414-1.414L7 8.586 5.707 7.293z'/%3e%3c/svg%3e");
1477-
background-color: currentColor;
1478-
background-size: cover;
1479-
background-position: center;
14801477
background-repeat: no-repeat;
1478+
background-position: center;
1479+
background-size: cover;
1480+
background-color: currentColor;
14811481
}
14821482

14831483
#phpinfo .center {
@@ -1863,14 +1863,6 @@ svg {
18631863
display: none;
18641864
}
18651865

1866-
.md\:w-1\/2 {
1867-
width: 50%;
1868-
}
1869-
1870-
.md\:w-96 {
1871-
width: 24rem;
1872-
}
1873-
18741866
.md\:w-24 {
18751867
width: 6rem;
18761868
}

templates/components/alert.twig

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
<div class="alert ml-auto flex items-center py-3 px-4 mb-4 {{ alert_color ? alert_color : 'bg-blue-500' }} rounded shadow-lg">
2-
<div class="ml-3 text-sm font-medium text-white flex items-center gap-1">{{ message|raw }}</div>
3-
{% if not hide_close %}
4-
<button type="button" class="close text-white hover:opacity-75 ml-auto -mx-1.5 -my-1.5 p-1.5 inline-flex" onclick="this.parentElement.remove();">
5-
{{ svg('x') }}
6-
</button>
7-
{% endif %}
1+
<div class="ml-auto py-3 px-4 flex items-center rounded {{ alert_color ? alert_color : 'bg-blue-500' }} shadow-lg fixed top-5 right-5 z-50 w-auto">
2+
<div class="ml-3 mr-3 flex items-center gap-1 text-sm font-medium text-white">{{ message|raw }}</div>
3+
<button type="button" class="close -mx-1.5 -my-1.5 ml-auto p-1.5 inline-flex text-white hover:opacity-75" onclick="this.parentElement.remove();">
4+
{{ svg('x') }}
5+
</button>
86
</div>

templates/components/badge.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
<span class="{{ text_sm ? 'text-sm' : 'text-xs' }} {{ txt ? txt : 'text-white' }} {{ bg ? bg : 'bg-gray-800' }} {{ pill ? 'rounded-full' : 'rounded' }} py-1 px-3 inline-block {{ class }}">
1+
<span class="inline-block py-1 px-3 {{ pill ? 'rounded-full' : 'rounded' }} {{ bg ? bg : 'bg-gray-800' }}
2+
{{ text_sm ? 'text-sm' : 'text-xs' }} {{ txt ? txt : 'text-white' }}{{ class|space }}">
23
{{- text|raw -}}
34
</span>

templates/components/button.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
{% endif %}
1212

1313
{% if link %}
14-
<a href="{{ link }}" class="text-sm py-1.5 px-3 shadow text-white focus:ring-4 font-semibold rounded {{ btn_color }}{{ icon_css }}{{ class ? ' ' ~ class : '' }}">
14+
<a href="{{ link }}" class="rounded py-1.5 px-3 text-sm font-semibold text-white shadow focus:ring-4 {{ btn_color }}{{ icon_css }}{{ class|space }}">
1515
{% if icon %}
1616
{{ svg(icon) }}
1717
{% endif %}
1818
{{ text }}
1919
</a>
2020
{% else %}
2121
<button type="{{ submit ? 'submit' : 'button' }}" id="{{ id }}" name="{{ id }}"
22-
class="text-sm py-1.5 px-3 shadow text-white focus:ring-4 font-semibold rounded {{ btn_color }}{{ icon_css }}{{ class ? ' ' ~ class : '' }}">
22+
class="rounded py-1.5 px-3 text-sm font-semibold text-white shadow focus:ring-4 {{ btn_color }}{{ icon_css }}{{ class|space }}">
2323
{% if icon %}
2424
{{ svg(icon) }}
2525
{% endif %}

templates/components/input.twig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<div class="mb-3"{{ extra_attr|raw }}>
2-
<label for="{{ id }}" class="block text-sm font-semibold mb-2">{{ label }}</label>
2+
<label for="{{ id }}" class="mb-2 block text-sm font-semibold">{{ label }}</label>
33
<input id="{{ id }}" name="{{ id }}" type="{{ type ? type : 'text' }}" value="{{ value }}"
4-
class="appearance-none leading-normal text-sm border bg-white placeholder-gray-400 text-gray-600 border-gray-300 focus:outline-none focus:ring w-full rounded py-1.5 px-3 focus:ring-{{ color }}-100 focus:border-{{ color }}-300"{{ required ? ' required' : '' }}{{ attr|raw }}>
4+
class="w-full rounded border border-gray-300 bg-white py-1.5 px-3 text-sm leading-normal text-gray-600 placeholder-gray-400
5+
focus:outline-none focus:ring focus:ring-{{ color }}-100 focus:border-{{ color }}-300"{{ required ? ' required' : '' }}{{ attr|raw }}>
56
{% if help %}
67
<small class="text-xs text-gray-400">{{ help }}</small>
78
{% endif %}

templates/components/paginator.twig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<div class="md:grid md:grid-cols-3 mt-5">
1+
<div class="mt-5 md:grid md:grid-cols-3">
22
<div class="flex items-center">
33
<span class="font-semibold">
44
Showing {{ first_on_page }} to {{ last_on_page }} of {{ total }} items
55
</span>
66
</div>
77

8-
<div class="flex items-center md:justify-center gap-2 mb-3 md:mb-0">
8+
<div class="mb-3 flex items-center gap-2 md:mb-0 md:justify-center">
99
{{ include('components/select.twig', {id: 'per_page', options: select, selected: per_page, class: 'w-16'}) }}
10-
<label class="font-semibold -mt-1.5" for="per_page">per page</label>
10+
<label class="-mt-1.5 font-semibold" for="per_page">per page</label>
1111
</div>
1212

1313
<div class="flex items-center md:justify-end">
1414
{% if pages and pages|length > 1 %}
1515
<ul class="inline-flex">
1616
{% for page in pages %}
1717
{% if page == current_page %}
18-
{% set class = 'text-white bg-' ~ color ~ '-500 border-' ~ color ~ '-300 hover:bg-' ~ color ~ '-600' %}
18+
{% set class = 'border-' ~ color ~ '-300 bg-' ~ color ~ '-500 text-white hover:bg-' ~ color ~ '-600' %}
1919
{% else %}
20-
{% set class = 'text-gray-500 bg-white border-gray-300 hover:bg-gray-100 hover:text-gray-700' %}
20+
{% set class = 'border-gray-300 bg-white text-gray-500 hover:bg-gray-100 hover:text-gray-700' %}
2121
{% endif %}
2222

2323
{% set first_item = loop.first ? ' rounded-l' : '' %}

templates/components/select.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<select id="{{ id }}" name="{{ id }}"
2-
class="select appearance-none leading-normal text-sm border bg-white placeholder-gray-400 text-gray-600 border-gray-300 focus:outline-none focus:ring rounded w-full py-1.5 px-3 focus:ring-{{ color }}-100 focus:border-{{ color }}-300 {{ class }}" aria-label="">
2+
class="select w-full appearance-none rounded border border-gray-300 bg-white py-1.5 px-3 text-sm leading-normal text-gray-600 placeholder-gray-400
3+
focus:outline-none focus:ring focus:ring-{{ color }}-100 focus:border-{{ color }}-300{{ class|space }}" aria-label="">
34
{% for value, name in options %}
45
<option value="{{ value }}"{{ value == selected ? ' selected' : '' }}>{{ name }}</option>
56
{% endfor %}

templates/dashboards/memcached/form.twig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
{% if encoders %}
2121
<div class="mb-3">
22-
<label for="encoder" class="block text-sm font-semibold mb-2">Encode function</label>
22+
<label for="encoder" class="mb-2 block text-sm font-semibold">Encode function</label>
2323
{{ include('components/select.twig', {
2424
id: 'encoder',
2525
options: encoders,
@@ -30,8 +30,10 @@
3030
{% endif %}
3131

3232
<div class="mb-3">
33-
<label for="value" class="block text-sm font-semibold mb-2">Value</label>
34-
<textarea id="value" name="value" class="appearance-none leading-normal text-sm border bg-white placeholder-gray-400 text-gray-600 border-gray-300 focus:outline-none focus:ring w-full rounded py-1.5 px-3 focus:ring-{{ color }}-100 focus:border-{{ color }}-300" rows="10" required>{{ value }}</textarea>
33+
<label for="value" class="mb-2 block text-sm font-semibold">Value</label>
34+
<textarea id="value" name="value"
35+
class="w-full rounded border border-gray-300 bg-white py-1.5 px-3 text-sm leading-normal text-gray-600 placeholder-gray-400
36+
focus:outline-none focus:ring focus:ring-{{ color }}-100 focus:border-{{ color }}-300" rows="10" required>{{ value }}</textarea>
3537
</div>
3638

3739
{{ include('components/button.twig', {

templates/dashboards/memcached/memcached.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="flex md:justify-end gap-1 mb-5">
1+
<div class="mb-5 flex gap-1 md:justify-end">
22
{{ include('partials/keys_buttons.twig') }}
33
</div>
44

0 commit comments

Comments
 (0)