Skip to content

Commit 3223042

Browse files
authored
Merge pull request #8 from dl-tokene/feature/redesign
Feature/redesign
2 parents eb721e9 + f7d998c commit 3223042

50 files changed

Lines changed: 2749 additions & 1074 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [0.0.0-rc.5] - 2023-05-11
8+
### Added
9+
- `vue-web3-provider` - `TokenE' Provider proxy constructor
10+
11+
### Changed
12+
- `ui-kit` - app button and fields design, icons
13+
- `toolkit` - universal storage composable, utils opts
14+
- `styles` - color variables
15+
- `toasts` - design
16+
- `root` - distributed-lab packages versions
17+
18+
### Fixed
19+
- `ui-kit` - ErrorMessage and NoDataMessage components images loading
20+
21+
### Removed
22+
- `styles` - unnecessary mixins and global styles
23+
724
## [0.0.0-rc.4] - 2023-05-07
825
### Added
926
- `toolkit` - increase gas estimates
@@ -49,7 +66,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4966
- Initial release
5067
- `root` - `toolkit` package
5168

52-
[Unreleased]: https://github.com/dl-tokene/webkit/compare/0.0.0-rc.4...HEAD
69+
[Unreleased]: https://github.com/dl-tokene/webkit/compare/0.0.0-rc.5...HEAD
70+
[0.0.0-rc.5]: https://github.com/dl-tokene/webkit/compare/0.0.0-rc.4...0.0.0-rc.5
5371
[0.0.0-rc.4]: https://github.com/dl-tokene/webkit/compare/0.0.0-rc.3...0.0.0-rc.4
5472
[0.0.0-rc.3]: https://github.com/dl-tokene/webkit/compare/0.0.0-rc.2...0.0.0-rc.3
5573
[0.0.0-rc.2]: https://github.com/dl-tokene/webkit/compare/0.0.0-rc.1...0.0.0-rc.2

packages/styles/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tokene/styles",
3-
"version": "0.0.0-rc.4",
3+
"version": "0.0.0-rc.5",
44
"description": "Default styles for every single frontend module of TokenE",
55
"repository": {
66
"type": "git",

packages/styles/src/app-colors.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ $background-secondary-dark: #cad4f5;
1313

1414
/* status colors */
1515

16-
$success-light: #effff2;
16+
$success-light: #edfff2;
1717
$success-main: #5cc56e;
1818
$success-dark: #278337;
1919

20-
$error-light: #fff3f3;
20+
$error-light: #fff2f2;
2121
$error-main: #e46962;
2222
$error-dark: #b3261e;
2323

2424
$warning-light: #fff9e9;
2525
$warning-main: #f6851b;
2626
$warning-dark: #e6661f;
2727

28-
$info-light: #82f7ff;
28+
$info-light: #eff2ff;
2929
$info-main: #40c4ff;
3030
$info-dark: #0094cc;
3131

packages/styles/src/global.scss

Lines changed: 0 additions & 215 deletions
Original file line numberDiff line numberDiff line change
@@ -148,218 +148,3 @@ a {
148148
opacity: 1;
149149
}
150150
}
151-
152-
.app__page-error-message {
153-
margin: 0 auto;
154-
max-width: toRem(450);
155-
padding: toRem(24);
156-
}
157-
158-
.app__page-no-data-message {
159-
margin: 0 auto;
160-
max-width: toRem(450);
161-
padding: toRem(24);
162-
}
163-
164-
.app__page-loader {
165-
margin: 0 auto;
166-
max-width: toRem(450);
167-
padding: toRem(24);
168-
}
169-
170-
.app__pools-page-filters {
171-
display: flex;
172-
justify-content: space-between;
173-
align-items: center;
174-
gap: toRem(24);
175-
margin-bottom: toRem(24);
176-
177-
.app__pools-page-filters-input {
178-
max-width: toRem(486);
179-
180-
@include respond-to(xsmall) {
181-
max-width: toRem(200);
182-
}
183-
}
184-
185-
.app__pools-page-filters-input-icon {
186-
width: clamp(#{toRem(20)}, #{toRem(20)}, #{toRem(20)});
187-
height: clamp(#{toRem(20)}, #{toRem(20)}, #{toRem(20)});
188-
color: var(--text-primary-light);
189-
}
190-
191-
.app__pools-page-filters-select {
192-
max-width: toRem(210);
193-
}
194-
195-
@include respond-to(small) {
196-
flex-direction: column;
197-
align-items: stretch;
198-
}
199-
}
200-
201-
.app__pool-card {
202-
position: relative;
203-
display: flex;
204-
flex-direction: column;
205-
206-
@include card('border');
207-
208-
padding: 0;
209-
210-
.app__pool-card-head {
211-
display: flex;
212-
justify-content: space-between;
213-
align-items: center;
214-
padding: toRem(18);
215-
border-bottom: toRem(1) solid var(--primary-light);
216-
}
217-
218-
.app__pool-card-appearance {
219-
display: flex;
220-
align-items: center;
221-
gap: toRem(12);
222-
}
223-
224-
.app__pool-card-appearance-img {
225-
width: clamp(#{toRem(62)}, #{toRem(62)}, #{toRem(62)});
226-
height: clamp(#{toRem(62)}, #{toRem(62)}, #{toRem(62)});
227-
228-
@include respond-to(xsmall) {
229-
width: clamp(#{toRem(28)}, #{toRem(28)}, #{toRem(28)});
230-
height: clamp(#{toRem(28)}, #{toRem(28)}, #{toRem(28)});
231-
}
232-
}
233-
234-
.app__pool-card-appearance-details {
235-
display: flex;
236-
flex-direction: column;
237-
gap: toRem(2);
238-
font-size: toRem(16);
239-
line-height: 1.5;
240-
font-weight: 500;
241-
letter-spacing: toRem(0.15);
242-
}
243-
244-
.app__pool-card-appearance-name {
245-
font: inherit;
246-
color: var(--text-primary-main);
247-
248-
@include respond-to(xsmall) {
249-
font-size: toRem(12);
250-
}
251-
}
252-
253-
.app__pool-card-appearance-symbol {
254-
font: inherit;
255-
color: var(--text-secondary-main);
256-
}
257-
258-
.app__pool-card-head-subtotal {
259-
display: flex;
260-
flex-direction: column;
261-
text-align: right;
262-
}
263-
264-
.app__pool-card-head-subtotal-value-wrp {
265-
display: flex;
266-
justify-content: flex-end;
267-
align-items: center;
268-
gap: toRem(4);
269-
}
270-
271-
.app__pool-card-head-subtotal-value-text {
272-
text-align: right;
273-
font-weight: 500;
274-
font-size: toRem(16);
275-
line-height: 1.5;
276-
letter-spacing: toRem(0.15);
277-
color: var(--text-primary-main);
278-
}
279-
280-
.app__pool-card-head-subtotal-label-wrp {
281-
display: flex;
282-
align-items: center;
283-
gap: toRem(4);
284-
}
285-
286-
.app__pool-card-head-subtotal-label-text {
287-
font-size: toRem(14);
288-
line-height: 1.43;
289-
letter-spacing: toRem(0.25);
290-
color: var(--secondary-main);
291-
}
292-
293-
.app__pool-card-body {
294-
padding: toRem(18);
295-
}
296-
297-
.app__pool-card-metadata {
298-
display: flex;
299-
flex-direction: column;
300-
gap: toRem(20);
301-
}
302-
303-
.app__pool-card-metadata-row {
304-
display: flex;
305-
justify-content: space-between;
306-
}
307-
308-
.app__pool-card-metadata-lbl-wrp {
309-
display: flex;
310-
align-items: center;
311-
gap: toRem(6);
312-
}
313-
314-
.app__pool-card-metadata-lbl-text {
315-
font-size: toRem(14);
316-
line-height: 1.43;
317-
letter-spacing: toRem(0.25);
318-
color: var(--text-secondary-main);
319-
}
320-
321-
.app__pool-card-metadata-value-wrp {
322-
display: flex;
323-
align-items: center;
324-
gap: toRem(6);
325-
326-
&--error {
327-
color: var(--error-main);
328-
}
329-
330-
&--success {
331-
color: var(--success-main);
332-
}
333-
}
334-
335-
.app__pool-card-metadata-value-text {
336-
font-size: toRem(14);
337-
line-height: 1.43;
338-
text-align: right;
339-
letter-spacing: toRem(0.25);
340-
color: var(--text-secondary-dark);
341-
}
342-
343-
.app__pool-card-metadata-value-icon {
344-
width: clamp(#{toRem(20)}, #{toRem(20)}, #{toRem(20)});
345-
height: clamp(#{toRem(20)}, #{toRem(20)}, #{toRem(20)});
346-
}
347-
348-
.app__pool-card-link {
349-
position: absolute;
350-
top: 0;
351-
right: 0;
352-
bottom: 0;
353-
left: 0;
354-
}
355-
}
356-
357-
.app__marketplace-list {
358-
display: grid;
359-
grid-template-columns: repeat(3, 1fr);
360-
grid-gap: toRem(21);
361-
362-
@include respond-to(xmedium) {
363-
grid-template-columns: 1fr;
364-
}
365-
}

packages/styles/src/mixins.scss

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ $media-breakpoints: (
4747
font-size: var(--field-label-font-size);
4848
line-height: var(--field-label-line-height);
4949
color: var(--field-label);
50-
transition: color var(--field-transition-duration) ease;
50+
transition: var(--field-transition-duration) ease;
5151
margin-bottom: toRem(8);
5252
}
5353

5454
@mixin field-border {
5555
border: toRem(1) solid var(--field-border);
56-
border-radius: toRem(4);
56+
border-radius: toRem(14);
5757
}
5858

5959
@mixin field-placeholder {
@@ -69,11 +69,13 @@ $media-breakpoints: (
6969
@mixin field-error {
7070
overflow: hidden;
7171
color: var(--field-error);
72-
font-size: toRem(10);
73-
line-height: 1.4;
72+
font-size: toRem(12);
73+
letter-spacing: toRem(0.4);
74+
line-height: 1.3;
7475
transition: var(--field-transition-duration) ease;
7576
transition-property: opacity, color, font-size, transform;
7677
margin-top: toRem(4);
78+
padding-left: var(--field-padding-left);
7779
}
7880

7981
@mixin scrollbar {
@@ -98,20 +100,3 @@ $media-breakpoints: (
98100
width: 100%;
99101
margin: auto;
100102
}
101-
102-
@mixin card ($type: 'default') {
103-
@if $type == 'default' {
104-
background: var(--background-primary-main);
105-
border-radius: toRem(8);
106-
filter: drop-shadow(0 0 toRem(12) rgba(161, 172, 211, 0.25));
107-
padding: toRem(18) toRem(20);
108-
}
109-
110-
@else if $type == 'border' {
111-
background: var(--background-primary-main);
112-
border: toRem(1) solid var(--background-secondary-dark);
113-
border-radius: toRem(8);
114-
filter: drop-shadow(0 0 toRem(12) rgba(161, 172, 211, 0.25));
115-
padding: toRem(18) toRem(20);
116-
}
117-
}

packages/styles/src/variables.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@
9898
--field-bg-secondary: var(--background-secondary-light);
9999

100100
/* label */
101-
--field-label: var(--text-primary-main);
102-
--field-label-hover: var(--text-primary-main);
103-
--field-label-focus: var(--text-primary-main);
101+
--field-label: var(--text-primary-light);
102+
--field-label-hover: var(--text-primary-light);
103+
--field-label-focus: var(--primary-main);
104104
--field-label-font-size: #{toRem(16)};
105105
--field-label-line-height: 1.5;
106106

107107
/* text */
108-
--field-text: var(--text-primary-main);
108+
--field-text: var(--text-primary-light);
109109
--field-text-font-size: #{toRem(16)};
110110
--field-text-line-height: 1.5;
111111
--field-placeholder: #{rgba($text-primary-main, 0.35)};

packages/toasts/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tokene/toasts",
3-
"version": "0.0.0-rc.4",
3+
"version": "0.0.0-rc.5",
44
"description": "Vue based toasts",
55
"repository": {
66
"type": "git",
@@ -53,7 +53,7 @@
5353
"access": "public"
5454
},
5555
"dependencies": {
56-
"@distributedlab/w3p": "0.2.0-rc.6",
56+
"@distributedlab/w3p": "0.2.0-rc.10",
5757
"@tokene/styles": "workspace:^",
5858
"@tokene/toolkit": "workspace:^",
5959
"@tokene/ui-kit": "workspace:^",

0 commit comments

Comments
 (0)