Skip to content

Commit d23bf2d

Browse files
committed
Merge branch 'develop' into releases/2.1.0
2 parents 50d5df6 + 003a440 commit d23bf2d

File tree

158 files changed

+1142
-2508
lines changed

Some content is hidden

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

158 files changed

+1142
-2508
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* coding=utf-8
3+
* Copyright 2021-present, the Recognai S.L. team.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/* eslint-disable */
19+
var icon = require('vue-svgicon')
20+
icon.register({
21+
'dark-theme': {
22+
width: 18,
23+
height: 18,
24+
viewBox: '0 0 18 18',
25+
data: '<path pid="0" fill-rule="evenodd" clip-rule="evenodd" d="M9.203.002a9 9 0 108.49 6.664c-.509.488-1.036.919-1.568 1.292-1.217.854-2.46 1.407-3.588 1.657C10.822 9.996 9.644 9.644 9 9c-.644-.644-.996-1.822-.615-3.537.25-1.127.803-2.371 1.657-3.588.373-.532.804-1.059 1.292-1.569a9.032 9.032 0 00-2.13-.304zm4.888 14.09a7.169 7.169 0 002.025-3.995c-3.191 1.84-6.542 2.023-8.389.176-1.847-1.847-1.665-5.198.176-8.39a7.2 7.2 0 106.188 12.208z" _fill="#000"/>'
26+
}
27+
})

argilla-frontend/assets/icons/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ require('./close')
1313
require('./code')
1414
require('./copy')
1515
require('./danger')
16+
require('./dark-theme')
1617
require('./discard')
1718
require('./draggable')
1819
require('./expand-arrows')
@@ -24,6 +25,7 @@ require('./focus-mode')
2425
require('./hand-labeling')
2526
require('./info')
2627
require('./kebab')
28+
require('./light-theme')
2729
require('./link')
2830
require('./log-out')
2931
require('./matching')
@@ -45,6 +47,7 @@ require('./sort')
4547
require('./stats')
4648
require('./suggestion')
4749
require('./support')
50+
require('./system-theme')
4851
require('./time')
4952
require('./trash-empty')
5053
require('./unavailable')
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* coding=utf-8
3+
* Copyright 2021-present, the Recognai S.L. team.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/* eslint-disable */
19+
var icon = require('vue-svgicon')
20+
icon.register({
21+
'light-theme': {
22+
width: 18,
23+
height: 18,
24+
viewBox: '0 0 18 18',
25+
data: '<path pid="0" fill-rule="evenodd" clip-rule="evenodd" d="M9 12a3 3 0 100-6 3 3 0 000 6zm0 1.5a4.5 4.5 0 100-9 4.5 4.5 0 000 9zM8.25 0h1.5v3.046a6.059 6.059 0 00-1.5 0V0zM5.32 4.26L3.167 2.106l-1.06 1.06L4.26 5.321a6.035 6.035 0 011.06-1.06zM3.047 8.25H0v1.5h3.046a6.059 6.059 0 010-1.5zm1.214 4.43l-2.154 2.154 1.06 1.06 2.155-2.154a6.036 6.036 0 01-1.06-1.06zm3.99 2.274V18h1.5v-3.046a6.067 6.067 0 01-1.5 0zm4.43-1.214l2.154 2.154 1.06-1.06-2.154-2.155a6.036 6.036 0 01-1.06 1.06zm2.274-3.99H18v-1.5h-3.046a6.067 6.067 0 010 1.5zM13.74 5.32l2.154-2.154-1.06-1.06-2.155 2.154c.396.308.753.665 1.06 1.06z" _fill="#000"/>'
26+
}
27+
})
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* coding=utf-8
3+
* Copyright 2021-present, the Recognai S.L. team.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/* eslint-disable */
19+
var icon = require('vue-svgicon')
20+
icon.register({
21+
'system-theme': {
22+
width: 18,
23+
height: 18,
24+
viewBox: '0 0 18 18',
25+
data: '<path pid="0" d="M9 12.6a3.6 3.6 0 000-7.2v7.2z" _fill="#000"/><path pid="1" fill-rule="evenodd" clip-rule="evenodd" d="M9 0a9 9 0 100 18A9 9 0 009 0zm0 1.8v3.6a3.6 3.6 0 100 7.2v3.6A7.2 7.2 0 009 1.8z" _fill="#000"/>'
26+
}
27+
})

argilla-frontend/assets/scss/abstract.scss

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
*/
1717

1818
// abstract
19-
@import 'abstract/fonts/fonts';
20-
@import 'abstract/functions/functions';
21-
@import 'abstract/variables/variables';
22-
@import 'abstract/mixins/mixins';
23-
@import 'abstract/mixins/media-queries';
24-
@import 'abstract/mixins/grid-mixins';
25-
@import 'abstract/placeholders/placeholders';
26-
@import 'abstract/placeholders/tooltip';
19+
@import "abstract/fonts/fonts";
20+
@import "abstract/functions/functions";
21+
@import "abstract/variables/variables";
22+
@import "abstract/variables/themes";
23+
@import "abstract/mixins/mixins";
24+
@import "abstract/mixins/media-queries";
25+
@import "abstract/mixins/grid-mixins";
26+
@import "abstract/placeholders/placeholders";
27+
@import "abstract/placeholders/tooltip";
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
@font-face {
2-
font-family: 'raptor_v2_premiumbold';
3-
src: url('@/assets/fonts/raptorv2premium-bold-webfont.woff2') format('woff2'),
4-
url('@/assets/fonts/raptorv2premium-bold-webfont.woff') format('woff');
5-
font-weight: normal;
6-
font-style: normal;
7-
8-
}
2+
font-family: "raptor_v2_premiumbold";
3+
src: url("@/assets/fonts/raptorv2premium-bold-webfont.woff2") format("woff2"),
4+
url("@/assets/fonts/raptorv2premium-bold-webfont.woff") format("woff");
5+
font-weight: normal;
6+
font-style: normal;
7+
}

argilla-frontend/assets/scss/abstract/functions/_functions.scss

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,6 @@
2929
// }
3030

3131
@function calculateRem($size) {
32-
$remSize: calc($size / 16px);
33-
@return $remSize * 1rem;
34-
}
35-
36-
// get KEY from MAP - COLOUR PALETTES
37-
// http://erskinedesign.com/blog/friendlier-colour-names-sass-maps/
38-
39-
@function palette($palette, $tone: 'base') {
40-
@if map-has-key($palettes, $palette) {
41-
@return map-get(map-get($palettes, $palette), $tone);
42-
}
43-
44-
@warn "Unknown `#{$palette}` in $palettes.";
45-
@return null;
32+
$remSize: calc($size / 16px);
33+
@return $remSize * 1rem;
4634
}

argilla-frontend/assets/scss/abstract/placeholders/_placeholders.scss

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -27,49 +27,6 @@
2727
position: absolute;
2828
}
2929

30-
// Linear gradient using $primary-color
31-
%primary-color-gradient {
32-
background: $primary-color;
33-
background: -moz-linear-gradient(
34-
top,
35-
$primary-color 0%,
36-
$primary-lighten-color 100%
37-
);
38-
background: -webkit-linear-gradient(
39-
top,
40-
$primary-color 0%,
41-
$primary-lighten-color 100%
42-
);
43-
background: linear-gradient(
44-
to bottom,
45-
$primary-color 0%,
46-
$primary-lighten-color 100%
47-
);
48-
}
49-
50-
// Linear gradient using palette(blue, 300)
51-
%secondary-color-gradient {
52-
background: palette(blue, 300);
53-
background: -moz-linear-gradient(
54-
top,
55-
palette(blue, 300) 0%,
56-
$secondary-darken-color 55%,
57-
palette(blue, 300) 100%
58-
);
59-
background: -webkit-linear-gradient(
60-
top,
61-
palette(blue, 300) 0%,
62-
$secondary-darken-color 55%,
63-
palette(blue, 300) 100%
64-
);
65-
background: linear-gradient(
66-
to bottom,
67-
palette(blue, 300) 0%,
68-
$secondary-darken-color 55%,
69-
palette(blue, 300) 100%
70-
);
71-
}
72-
7330
// Align center block element
7431
%center {
7532
display: block;

argilla-frontend/assets/scss/abstract/placeholders/_tooltip.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// tooltip
2-
$tooltip-bg: palette(grey, 100);
3-
$tooltip-mini-bg: palette(grey, 150);
4-
$tooltip-color: palette(white);
2+
$tooltip-bg: var(--bg-tooltip);
3+
$tooltip-mini-bg: var(--bg-tooltip);
4+
$tooltip-color: var(--color-white);
55
$tooltip-title-font-size: 11px;
66
$tooltip-font-size: 13px;
77
$tooltip-triangle-size: 7px;
Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
:root {
2+
--color-black: hsla(0, 0%, 0%, 0.87);
3+
--color-white: hsl(0, 0%, 100%);
4+
--color-dark-grey: hsl(207, 9%, 19%);
5+
--color-brand: hsl(3, 100%, 69%);
6+
--color-brand-secondary: hsl(19, 85%, 81%);
7+
--color-danger: var(--color-brand);
8+
--color-warning: hsl(18, 98%, 68%);
9+
--color-success: hsl(88, 74%, 36%);
10+
--color-info: hsl(0, 0%, 90%);
11+
--bg-action: hsl(227, 56%, 52%);
12+
--bg-action-accent: hsl(227, 50%, 46%);
13+
--bg-black: hsla(0, 0%, 0%, 0.87);
14+
--bg-solid-grey-1: hsl(0, 0%, 98%);
15+
--bg-solid-grey-2: hsl(0, 0%, 96%);
16+
--bg-solid-grey-3: hsl(0, 0%, 90%);
17+
--bg-accent-grey-1: hsl(0, 0%, 100%);
18+
--bg-accent-grey-2: hsl(0, 0%, 100%);
19+
--bg-accent-grey-3: hsl(0, 0%, 98%);
20+
--bg-accent-grey-4: hsl(0, 0%, 98%);
21+
--bg-opacity-1: hsla(0, 0%, 0%, 0.01);
22+
--bg-opacity-2: hsla(0, 0%, 0%, 0.02);
23+
--bg-opacity-3: hsla(0, 0%, 0%, 0.03);
24+
--bg-opacity-4: hsla(0, 0%, 0%, 0.04);
25+
--bg-opacity-6: hsla(0, 0%, 0%, 0.06);
26+
--bg-opacity-10: hsla(0, 0%, 0%, 0.1);
27+
--bg-opacity-20: hsla(0, 0%, 0%, 0.2);
28+
--bg-opacity-37: hsla(0, 0%, 0%, 0.37);
29+
--bg-opacity-54: hsla(0, 0%, 0%, 0.54);
30+
--bg-opacity-87: hsla(0, 0%, 0%, 0.87);
31+
--fg-lighter: hsl(0, 0%, 100%);
32+
--fg-primary: hsla(0, 0%, 0%, 0.87);
33+
--fg-secondary: hsla(0, 0%, 0%, 0.54);
34+
--fg-tertiary: hsla(0, 0%, 0%, 0.37);
35+
--fg-cuaternary: hsl(227, 56%, 52%);
36+
--fg-status-pending: hsl(35, 90%, 39%);
37+
--fg-status-draft: hsl(188, 92%, 39%);
38+
--bg-status-draft: hsl(188, 64%, 82%);
39+
--bg-status-draft-accent: hsl(188, 64%, 84%);
40+
--fg-status-discarded: hsla(0, 0%, 56%);
41+
--bg-status-discarded: hsla(0, 5%, 87%);
42+
--bg-status-discarded-accent: hsla(0, 5%, 83%);
43+
--fg-status-submitted: hsl(227, 56%, 52%);
44+
--bg-status-submitted: hsl(227, 100%, 85%);
45+
--bg-status-submitted-accent: hsl(227, 100%, 82%);
46+
--fg-filter-badge: hsl(239, 36%, 47%);
47+
--fg-filter-badge-accent: hsl(238, 100%, 86%);
48+
--bg-filter-badge: hsl(240, 100%, 92%);
49+
--bg-filter-badge-accent: hsl(240, 100%, 90%);
50+
--fg-label: hsl(239, 36%, 47%);
51+
--fg-label-2: hsl(239, 37%, 40%);
52+
--bg-label: hsl(239, 36%, 47%);
53+
--bg-label-unselected: hsl(0, 0%, 96%);
54+
--bg-label-unselected-hover: hsla(0, 0%, 0%, 0.06);
55+
--bg-field: linear-gradient(45deg, var(--bg-opacity-2), var(--bg-opacity-1));
56+
--bg-form: hsl(0, 0%, 100%);
57+
--bg-form-button-area: hsl(228, 50%, 96%);
58+
--fg-shortcut-key: hsla(0, 0%, 0%, 0.2);
59+
--bg-similarity: hsl(2, 100%, 94%);
60+
--fg-similarity: hsl(3, 100%, 69%);
61+
--fg-highlight: hsl(3, 100%, 69%);
62+
--bg-auth: hsl(18, 57%, 91%);
63+
--bg-auth-gradient: linear-gradient(
64+
178.31deg,
65+
#ffe5d9 1.36%,
66+
#ffd1bc 109.14%
67+
);
68+
--bg-banner-info: hsl(0, 0%, 90%);
69+
--bg-banner-warning: hsl(47, 83%, 91%);
70+
--bg-banner-error: hsl(3, 100%, 92%);
71+
--bg-tooltip: var(--color-dark-grey);
72+
}
73+
74+
[data-theme="dark"] {
75+
--bg-black: hsl(0, 0%, 0%);
76+
--bg-action: hsl(227, 56%, 52%);
77+
--bg-action-accent: hsl(227, 50%, 55%);
78+
--bg-solid-grey-1: hsl(214, 12%, 10%);
79+
--bg-solid-grey-2: hsl(214, 12%, 14%);
80+
--bg-solid-grey-3: hsl(214, 12%, 16%);
81+
--bg-accent-grey-1: hsl(214, 12%, 12%);
82+
--bg-accent-grey-2: hsl(214, 12%, 16%);
83+
--bg-accent-grey-3: hsl(214, 12%, 14%);
84+
--bg-accent-grey-4: hsl(214, 12%, 16%);
85+
--bg-opacity-1: hsla(0, 0%, 100%, 0.01);
86+
--bg-opacity-2: hsla(0, 0%, 100%, 0.02);
87+
--bg-opacity-3: hsla(0, 0%, 100%, 0.03);
88+
--bg-opacity-4: hsla(0, 0%, 100%, 0.04);
89+
--bg-opacity-6: hsla(0, 0%, 100%, 0.06);
90+
--bg-opacity-10: hsla(0, 0%, 100%, 0.1);
91+
--bg-opacity-20: hsla(0, 0%, 100%, 0.2);
92+
--bg-opacity-37: hsla(0, 0%, 100%, 0.37);
93+
--bg-opacity-54: hsla(0, 0%, 100%, 0.54);
94+
--bg-opacity-87: hsla(0, 0%, 100%, 0.87);
95+
--fg-lighter: hsl(0, 0%, 87%);
96+
--fg-primary: hsla(0, 0%, 100%, 0.87);
97+
--fg-secondary: hsla(0, 0%, 100%, 0.7);
98+
--fg-tertiary: hsla(0, 0%, 100%, 0.5);
99+
--fg-cuaternary: hsl(227, 100%, 70%);
100+
--fg-status-pending: hsl(35, 62%, 60%);
101+
--fg-status-draft: hsl(188, 92%, 39%);
102+
--bg-status-draft: hsl(188, 40%, 40%);
103+
--bg-status-draft-accent: hsl(188, 40%, 44%);
104+
--fg-status-discarded: hsl(0, 0%, 46%);
105+
--bg-status-discarded: hsl(0, 0%, 40%);
106+
--bg-status-discarded-accent: hsl(0, 0%, 48%);
107+
--fg-status-submitted: hsl(227, 70%, 64%);
108+
--bg-status-submitted: hsl(227, 70%, 56%);
109+
--bg-status-submitted-accent: hsl(227, 70%, 60%);
110+
--fg-filter-badge: hsla(0, 0%, 100%, 0.87);
111+
--fg-filter-badge-accent: hsl(239, 53%, 54%);
112+
--bg-filter-badge: hsl(239, 53%, 56%);
113+
--bg-filter-badge-accent: hsl(239, 53%, 54%);
114+
--fg-label: hsl(239, 36%, 75%);
115+
--fg-label-2: hsl(0, 0%, 100%);
116+
--bg-label: hsl(239, 37%, 50%);
117+
--bg-label-unselected: hsl(214, 12%, 18%);
118+
--bg-label-unselected-hover: hsl(214, 12%, 20%);
119+
--bg-field: linear-gradient(45deg, var(--bg-opacity-4), var(--bg-opacity-2));
120+
--bg-form: hsl(216 12% 14%);
121+
--bg-form-button-area: hsla(228, 40.18%, 59.31%, 0.2);
122+
--fg-shortcut-key: hsla(0, 0%, 100%, 0.4);
123+
--bg-similarity: hsla(2, 100%, 94%, 4%);
124+
--fg-similarity: hsla(3, 100%, 74%, 90%);
125+
--fg-highlight: hsl(3, 100%, 69%);
126+
--bg-banner-info: hsl(0, 0%, 20%);
127+
--bg-banner-warning: hsl(47, 83%, 16%);
128+
--bg-banner-error: hsl(3, 100%, 20%);
129+
--bg-tooltip: hsl(207, 9%, 32%);
130+
}
131+
132+
[data-theme="light"] {
133+
color-scheme: light;
134+
}
135+
136+
[data-theme="dark"] {
137+
color-scheme: dark;
138+
}

0 commit comments

Comments
 (0)