Skip to content

Commit 1b9cf97

Browse files
cklei-carlycklei-carly
committed
Merge branch 'develop'
2 parents bd89d9e + 40fdc91 commit 1b9cf97

29 files changed

Lines changed: 385 additions & 318 deletions

‎resources/css/components/media-library.css‎

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
.media-library {
2-
@apply rounded-md;
3-
background-color: white;
2+
@apply rounded-md bg-white;
43
&:is(.dark *) {
54
background-color: rgba(var(--gray-900),1);
65
}
76
}
87

98
.media-library__header, .media-library__footer {
10-
@apply top-16 sticky z-10 h-14 px-4 py-2 backdrop-blur-sm ring-1 ring-slate-900/10;
9+
@apply h-14 px-4 py-2 backdrop-blur-sm ring-1 ring-slate-900/10;
1110
background-color: rgba(var(--gray-50),0.5);
1211
&:is(.dark *) {
1312
@apply ring-black/10;
1413
background-color: rgba(var(--gray-700),0.5);
1514
}
1615
}
1716
.media-library__header {
18-
@apply flex items-center justify-between;
17+
@apply top-16 sticky z-10 flex items-center justify-between;
1918
}
2019

2120
.media-library__content {
@@ -90,6 +89,10 @@
9089
@apply flex-auto p-4;
9190
max-width: 400px;
9291
border-left: 1px solid rgba(var(--gray-300), 1);
92+
93+
&:is(.dark *) {
94+
border-color: rgba(var(--gray-700), 1);
95+
}
9396
}
9497
}
9598

@@ -115,9 +118,13 @@
115118
}
116119

117120
.browser-item, .folder-item {
118-
@apply hover:ring-1 hover:ring-gray-300 rounded-lg;
121+
@apply rounded-lg;
122+
&:hover {
123+
@apply ring-1;
124+
--tw-ring-color: rgb(var(--gray-300));
125+
}
119126
&:is(.dark *) {
120-
@apply hover:ring-white/50;
127+
@apply hover:ring-white/20;
121128
}
122129
}
123130
.browser-item .title-ctn, .browser-item img, .folder-item .main, .browser-items-grid-ctn {
@@ -154,14 +161,47 @@
154161
}
155162

156163
input[type=checkbox] {
157-
@apply appearance-none rounded border border-gray-300 bg-white disabled:border-gray-300 disabled:bg-gray-100 disabled:checked:bg-gray-100 forced-colors:appearance-auto;
164+
165+
@apply appearance-none rounded border-none bg-white shadow-sm ring-1 transition duration-75;
166+
167+
--tw-ring-color: rgb(var(--gray-400));
168+
158169
&:checked, &:indeterminate, &:focus-visible {
159170
border-color: rgba(var(--primary-600), 1);
160171
background-color: rgba(var(--primary-600), 1);
161172
}
173+
174+
&:checked, &:indeterminate {
175+
@apply ring-0;
176+
}
162177
&:focus-visible, &:focus {
163-
@apply outline outline-2 outline-offset-2;
164-
outline-color: rgba(var(--primary-600), 1);
178+
@apply ring-2 ring-offset-0;
179+
}
180+
181+
&:disabled {
182+
183+
@apply pointer-events-none;
184+
185+
color: rgb(var(--gray-50));
186+
background-color: rgb(var(--gray-50));
187+
188+
&:checked, &:indeterminate {
189+
color: rgb(var(--gray-400));
190+
background-color: rgb(var(--gray-400));
191+
}
192+
}
193+
194+
&:is(.dark *) {
195+
@apply bg-white/5;
196+
197+
&:disabled {
198+
@apply bg-transparent;
199+
200+
&:checked, &:indeterminate {
201+
background-color: rgb(var(--gray-600));
202+
}
203+
}
204+
165205
}
166206
}
167207

‎resources/dist/components/media-library.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/lang/en/actions.php renamed to resources/lang/en/buttons.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,16 @@
33
return [
44

55
'clear' => [
6-
76
'label' => 'Clear',
8-
97
],
108

119
'select' => [
12-
1310
'label' => 'Select',
14-
15-
'modal' => [
16-
17-
'heading' => 'Select',
18-
19-
],
20-
11+
'heading' => 'Select',
2112
],
2213

2314
'cancel' => [
24-
2515
'label' => 'Cancel',
26-
2716
],
2817

2918
];

‎resources/lang/en/media-library.php‎

Lines changed: 77 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,21 @@
11
<?php
22

33
return [
4-
'media' => 'Media',
5-
'actions' => [
6-
'view' => [
7-
'label' => 'View',
8-
9-
'modal' => [
10-
11-
'heading' => 'View :name',
12-
13-
],
14-
],
15-
'delete' => [
16-
'label' => 'Delete',
17-
18-
'modal' => [
19-
20-
'heading' => 'Delete :name',
21-
22-
],
23-
24-
'notification' => [
25-
'deleted' => [
26-
'title' => 'File Deleted',
27-
],
28-
],
29-
30-
],
31-
'edit' => [
32-
'label' => 'Edit',
33-
34-
'modal' => [
35-
36-
'heading' => 'Edit :name',
37-
38-
],
39-
40-
'notification' => [
41-
'saved' => [
42-
'title' => 'Saved',
43-
],
44-
],
45-
],
46-
'create_folder' => [
47-
'label' => 'Create Folder',
48-
49-
'modal' => [
50-
51-
'heading' => 'Create Folder',
52-
53-
],
54-
55-
'notification' => [
56-
'created' => [
57-
'title' => 'Folder Created',
58-
],
59-
],
60-
],
61-
'upload' => [
62-
'label' => 'Upload',
63-
64-
'modal' => [
654

66-
'heading' => 'Upload Files',
67-
68-
'submit' => [
69-
'label' => 'Upload',
70-
],
71-
],
72-
73-
'notification' => [
74-
'uploaded' => [
75-
'title' => 'File Uploaded',
76-
],
77-
],
78-
],
79-
'clear' => [
80-
'label' => 'Clear',
81-
],
82-
'rename' => [
83-
'label' => 'Rename',
5+
'media' => [
6+
'singular' => 'Media',
7+
'plural' => 'Media',
8+
],
849

85-
'modal' => [
10+
'folder' => [
11+
'singular' => 'Folder',
12+
'plural' => 'Folders',
13+
],
8614

87-
'heading' => 'Rename :name',
15+
'detail_info' => [
8816

89-
],
17+
'heading' => 'Information',
9018

91-
'notification' => [
92-
'renamed' => [
93-
'title' => 'File Renamed',
94-
],
95-
],
96-
],
97-
],
98-
'detail_info' => [
9919
'file_name' => [
10020
'label' => 'File Name',
10121
],
@@ -143,6 +63,7 @@
14363
],
14464
],
14565
],
66+
14667
'filter' => [
14768
'title' => [
14869
'placeholder' => 'Search by title',
@@ -158,6 +79,7 @@
15879
],
15980
],
16081
],
82+
16183
'sort' => [
16284
'type' => [
16385
'placeholder' => 'Sort Type',
@@ -177,6 +99,7 @@
17799
],
178100
],
179101
],
102+
180103
'forms' => [
181104
'title' => [
182105
'label' => 'Title',
@@ -207,4 +130,68 @@
207130
'validation_attribute' => 'mime type',
208131
],
209132
],
133+
134+
'buttons' => [
135+
'view' => [
136+
'label' => 'View',
137+
'heading' => 'View :name',
138+
],
139+
'delete' => [
140+
'label' => 'Delete',
141+
'heading' => 'Delete :name',
142+
'messages' => [
143+
'success' => [
144+
'title' => 'File Deleted',
145+
],
146+
],
147+
148+
],
149+
'edit' => [
150+
'label' => 'Edit',
151+
'heading' => 'Edit :name',
152+
'messages' => [
153+
'success' => [
154+
'title' => 'Saved',
155+
],
156+
],
157+
],
158+
'open_folder' => [
159+
'label' => 'Open folder',
160+
],
161+
'create_folder' => [
162+
'label' => 'Create Folder',
163+
'messages' => [
164+
'success' => [
165+
'title' => 'Folder Created',
166+
],
167+
],
168+
],
169+
'upload' => [
170+
'label' => 'Upload',
171+
'heading' => 'Upload Files',
172+
'messages' => [
173+
'success' => [
174+
'title' => 'File Uploaded',
175+
],
176+
],
177+
],
178+
'clear' => [
179+
'label' => 'Clear',
180+
],
181+
'rename' => [
182+
'label' => 'Rename',
183+
'heading' => 'Rename :name',
184+
'messages' => [
185+
'success' => [
186+
'title' => 'File Renamed',
187+
],
188+
],
189+
],
190+
],
191+
192+
'messages' => [
193+
'item_moved' => 'Item moved successfully.',
194+
'xxx_items_selected' => ':count items selected.',
195+
'total_xxx_items' => ':count items',
196+
],
210197
];

‎resources/lang/en/tree-node.php‎

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,12 @@
11
<?php
22

3-
// translations for SolutionForest/InspireCms/Support
43
return [
5-
// General
6-
'select_file_to_view' => 'Select a file to view its content.',
7-
'loading_file_content' => 'Loading file content...',
8-
'unable_to_load_content' => 'Unable to load file content.',
9-
10-
// File Explorer
11-
'file_content' => 'File Content:',
12-
'no_files_or_directories' => 'No files or directories found.',
13-
'selected_item_is_directory' => 'The selected item is a directory.',
14-
15-
'no_models_found' => 'No models found.',
16-
'model_details' => 'Model Details',
17-
'select_model_to_view' => 'Select a model to view its details.',
18-
19-
// Exceptions
20-
'file_read_exception' => 'Failed to read file: :path. File does not exist or is not accessible.',
21-
22-
// Buttons/Actions
23-
'load_more' => 'Load More',
24-
'expand' => 'Expand',
25-
'collapse' => 'Collapse',
26-
'actions' => 'Actions',
27-
'more_actions' => 'More actions',
28-
29-
// File Types
30-
'directory' => 'Directory',
31-
'file' => 'File',
32-
33-
// Misc
34-
'empty_directory' => 'This directory is empty.',
35-
'loading' => 'Loading...',
36-
'error' => 'Error',
4+
'root' => 'Root',
5+
6+
'messages' => [
7+
'no_files_or_directories' => 'No files or directories found.',
8+
'selected_item_is_directory' => 'The selected item is a directory.',
9+
'select_model_to_view' => 'Select a model to view its details.',
10+
'select_file_to_view' => 'Select a file to view its content.',
11+
],
3712
];

0 commit comments

Comments
 (0)