Skip to content

Commit 8c40244

Browse files
committed
feat(theme): add theme colors to paginaion with some cleanup
1 parent ef240cc commit 8c40244

File tree

7 files changed

+73
-19
lines changed

7 files changed

+73
-19
lines changed

src/components/dialogs/add-registry-url.riot

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,33 @@
1818
<material-popup opened="{ props.opened }" onClick="{ props.onClose }">
1919
<div class="material-popup-title">Add your Server ?</div>
2020
<div class="material-popup-content">
21-
<material-input onkeyup="{ onKeyUp }" label="Server URL" text-color="var(--primary-text)" label-color="var(--neutral-text)" color="var(--accent-text)" valid="{ registryUrlValidator }"></material-input>
21+
<material-input
22+
onkeyup="{ onKeyUp }"
23+
label="Server URL"
24+
text-color="var(--primary-text)"
25+
label-color="var(--neutral-text)"
26+
color="var(--accent-text)"
27+
valid="{ registryUrlValidator }"
28+
></material-input>
2229
<span>Write your URL without /v2</span>
2330
</div>
2431
<div class="material-popup-action">
25-
<material-button class="dialog-button" waves-color="var(--hover-background)" onClick="{ add }" color="inherit" text-color="var(--primary-text)">
32+
<material-button
33+
class="dialog-button"
34+
waves-color="var(--hover-background)"
35+
onClick="{ add }"
36+
color="inherit"
37+
text-color="var(--primary-text)"
38+
>
2639
Add
2740
</material-button>
28-
<material-button class="dialog-button" waves-color="var(--hover-background)" onClick="{ props.onClose }" color="inherit" text-color="var(--primary-text)">
41+
<material-button
42+
class="dialog-button"
43+
waves-color="var(--hover-background)"
44+
onClick="{ props.onClose }"
45+
color="inherit"
46+
text-color="var(--primary-text)"
47+
>
2948
Cancel
3049
</material-button>
3150
</div>
@@ -56,8 +75,8 @@
5675
setTimeout(() => router.updateUrlQueryParam(url), 100);
5776
},
5877
registryUrlValidator(input) {
59-
return /^https?:\/\//.test(input) && !/\/v2\/?$/.test(input)
60-
}
78+
return /^https?:\/\//.test(input) && !/\/v2\/?$/.test(input);
79+
},
6180
};
6281
</script>
6382
</add-registry-url>

src/components/dialogs/change-registry-url.riot

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,22 @@
2323
</select>
2424
</div>
2525
<div class="material-popup-action">
26-
<material-button class="dialog-button" waves-color="var(--hover-background)" onClick="{ change }" color="inherit" text-color="var(--primary-text)">
26+
<material-button
27+
class="dialog-button"
28+
waves-color="var(--hover-background)"
29+
onClick="{ change }"
30+
color="inherit"
31+
text-color="var(--primary-text)"
32+
>
2733
Change
2834
</material-button>
29-
<material-button class="dialog-button" waves-color="var(--hover-background)" onClick="{ props.onClose }" color="inherit" text-color="var(--primary-text)">
35+
<material-button
36+
class="dialog-button"
37+
waves-color="var(--hover-background)"
38+
onClick="{ props.onClose }"
39+
color="inherit"
40+
text-color="var(--primary-text)"
41+
>
3042
Cancel
3143
</material-button>
3244
</div>
@@ -65,7 +77,7 @@
6577
font-size: 1em;
6678
line-height: 24px;
6779
height: 24px;
68-
border-bottom: 1px solid #2f6975;
80+
border-bottom: 1px solid var(--accent-text);
6981
appearance: none;
7082
-moz-appearance: none;
7183
-webkit-appearance: none;

src/components/dialogs/confirm-delete-image.riot

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,22 @@
2323
</ul>
2424
</div>
2525
<div class="material-popup-action">
26-
<material-button class="dialog-button" waves-color="var(--hover-background)" onClick="{ deleteImages }" color="inherit" text-color="var(--primary-text)">
26+
<material-button
27+
class="dialog-button"
28+
waves-color="var(--hover-background)"
29+
onClick="{ deleteImages }"
30+
color="inherit"
31+
text-color="var(--primary-text)"
32+
>
2733
Delete
2834
</material-button>
29-
<material-button class="dialog-button" waves-color="var(--hover-background)" onClick="{ props.onClick }" color="inherit" text-color="var(--primary-text)">
35+
<material-button
36+
class="dialog-button"
37+
waves-color="var(--hover-background)"
38+
onClick="{ props.onClick }"
39+
color="inherit"
40+
text-color="var(--primary-text)"
41+
>
3042
Cancel
3143
</material-button>
3244
</div>

src/components/dialogs/remove-registry-url.riot

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3838
</ul>
3939
</div>
4040
<div class="material-popup-action">
41-
<material-button class="dialog-button" waves-color="rgba(158,158,158,.4)" onClick="{ props.onClose }" color="inherit" text-color="var(--primary-text)">
41+
<material-button
42+
class="dialog-button"
43+
waves-color="rgba(158,158,158,.4)"
44+
onClick="{ props.onClose }"
45+
color="inherit"
46+
text-color="var(--primary-text)"
47+
>
4248
Close
4349
</material-button>
4450
</div>
@@ -48,10 +54,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
4854
export default {
4955
remove(url) {
5056
return (event) => {
51-
console.log(url, event)
5257
removeRegistryServers(url);
5358
setTimeout(() => this.update(), 100);
54-
}
59+
};
5560
},
5661
getRegistryServers,
5762
};

src/components/search-bar.riot

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<search-bar>
2-
<material-input label="Search in page" text-color="var(--header-text)" label-color="var(--neutral-text)" color="var(--accent-text)"></material-input>
2+
<material-input
3+
label="Search in page"
4+
text-color="var(--header-text)"
5+
label-color="var(--neutral-text)"
6+
color="var(--accent-text)"
7+
></material-input>
38
<script>
49
import { router } from '@riotjs/route';
510

src/components/tag-list/pagination.riot

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
<div class="pagination-centered">
2020
<material-button
2121
aria-label="page-{ p.page }"
22-
color="rgba(0, 0, 0, { p.current ? 0.12 : 0 } )"
23-
text-color="#000"
22+
color="{ p.current ? 'var(--accent-text)' : 'rgba(0, 0, 0, 0 )' }"
23+
text-color="{ p.current ? 'var(--accent-text)' : 'var(--primary-text)' }"
2424
waves-color="rgba(158,158,158,.4)"
2525
each="{ (p, idx) in props.pages}"
2626
class="{ p.current ? 'current' : ''} { p['space-left'] ? 'space-left' : '' } { p['space-right'] ? 'space-right' : ''}"
@@ -45,6 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
4545
:host material-button > :first-child {
4646
padding: 0;
4747
min-width: 40px;
48+
min-height: 44px;
4849
}
4950
5051
:host material-button > :first-child .content {

src/components/tag-list/tag-table.riot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
6565
<material-button
6666
if="{ state.toDelete.size > 0 && !state.singleDeleteAction }"
6767
waves-center="true"
68-
color="#fff"
69-
text-color="#777"
70-
waves-color="#ddd"
68+
color="inherit"
69+
text-color="var(--neutral-background)"
70+
waves-color="var(--hover-background)"
7171
title="This will delete selected images."
7272
onClick="{ deleteImages }"
7373
icon

0 commit comments

Comments
 (0)