Skip to content

Commit d4e74c3

Browse files
committed
add colors for badge, styles for badge, task-detail type filled & empty
1 parent ce82961 commit d4e74c3

4 files changed

Lines changed: 30 additions & 30 deletions

File tree

projects/social_platform/src/app/office/projects/detail/kanban-board/kanban-board.component.scss

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@
134134
}
135135

136136
&-add-responsible {
137-
cursor: pointer;
138137
padding: 8px;
139-
border-radius: var(--rounded-xxl);
138+
cursor: pointer;
140139
border: 0.5px dashed var(--accent);
140+
border-radius: var(--rounded-xxl);
141141
}
142142

143143
&-performers {
@@ -152,13 +152,13 @@
152152
}
153153

154154
&-add-object {
155-
cursor: pointer;
156155
display: flex;
157156
align-items: center;
158-
justify-content: center;
159157
align-self: center;
158+
justify-content: center;
160159
width: 100%;
161160
padding: 2px 48px;
161+
cursor: pointer;
162162
border: 0.5px solid var(--accent);
163163
border-radius: var(--rounded-xl);
164164
}
@@ -167,16 +167,16 @@
167167
::ng-deep {
168168
app-textarea {
169169
.field__input {
170+
min-height: 45px;
171+
padding: 12px 12px 0;
172+
margin-left: -10px;
170173
background-color: transparent;
171174
border: none;
172175
border-radius: 0;
173-
margin-left: -10px;
174-
min-height: 45px;
175-
padding: 12px 12px 0px 12px;
176176

177177
&:focus {
178-
box-shadow: none;
179178
border-color: none;
179+
box-shadow: none;
180180
}
181181
}
182182
}
@@ -185,8 +185,8 @@
185185

186186
&-files {
187187
display: flex;
188-
align-items: center;
189188
gap: 10px;
189+
align-items: center;
190190
margin-bottom: 40px;
191191
}
192192

@@ -195,8 +195,8 @@
195195

196196
&--empty {
197197
display: flex;
198-
align-items: center;
199198
gap: 5px;
199+
align-items: center;
200200
}
201201
}
202202

@@ -206,8 +206,8 @@
206206
}
207207

208208
&__divider {
209-
margin-top: 5px;
210209
width: 100%;
210+
margin-top: 5px;
211211
}
212212
}
213213

@@ -262,17 +262,17 @@
262262
}
263263

264264
.form {
265-
padding: 10px 24px;
266-
height: 28px;
265+
display: flex;
266+
align-items: center;
267+
justify-content: space-between;
267268
width: 422px;
269+
height: 28px;
270+
padding: 10px 24px;
268271
margin-bottom: -25px;
269272
margin-left: -25px;
270273
background-color: var(--light-white);
271274
border: 0.5px solid var(--medium-grey-for-outline);
272275
border-radius: var(--rounded-lg);
273-
display: flex;
274-
align-items: center;
275-
justify-content: space-between;
276276

277277
&__row {
278278
display: flex;
@@ -281,15 +281,15 @@
281281

282282
::ng-deep {
283283
app-input {
284-
.field__input {
285-
width: 100%;
286-
background-color: transparent;
287-
color: var(--grey-for-text) !important;
284+
.field__input {
285+
width: 100%;
286+
color: var(--grey-for-text) !important;
287+
background-color: transparent;
288288

289-
@include typography.body-10;
289+
@include typography.body-10;
290+
}
290291
}
291292
}
292-
}
293293
}
294294

295295
&__files {
@@ -304,8 +304,8 @@
304304

305305
&__actions {
306306
display: flex;
307-
align-items: center;
308307
gap: 5px;
308+
align-items: center;
309309

310310
i {
311311
color: var(--light-white);
@@ -323,13 +323,13 @@
323323
}
324324

325325
&__send {
326-
background-color: var(--accent);
327326
width: 15px;
328327
height: 15px;
329-
border-radius: 3px;
330328
padding: 4px;
331329
color: var(--accent);
332330
cursor: pointer;
331+
background-color: var(--accent);
332+
border-radius: 3px;
333333
}
334334

335335
&__input {

projects/social_platform/src/app/ui/components/badge/badge.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
.badge {
22
padding: 4px;
3-
border-width: 0.5px;
43
border-style: solid;
4+
border-width: 0.5px;
55
border-radius: var(--rounded-xl);
66

77
&--green {
88
color: var(--green);
9-
border-color: var(--green);
109
background-color: var(--green-light);
10+
border-color: var(--green);
1111
}
1212

1313
&--red {

projects/social_platform/src/app/ui/components/tag/tag.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
align-items: center;
66
align-self: center;
77
justify-content: center;
8-
text-align: center;
98
max-width: 300px;
109
padding: 2px 20px;
1110
overflow: hidden;
1211
color: var(--accent);
12+
text-align: center;
1313
text-overflow: ellipsis;
1414
white-space: nowrap;
1515
border-radius: var(--rounded-xxl);

projects/social_platform/src/styles/_colors.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// GOLD
1616
--gold: #e5b25d;
17-
--gold-light: #FDF8F0;
17+
--gold-light: #fdf8f0;
1818
--gold-dark: #c69849;
1919

2020
// GRAY
@@ -33,7 +33,7 @@
3333
--green-light: #e3f0e8;
3434
--green-dark: #297373;
3535
--red: #d48a9e;
36-
--red-light: #F4E2E7;
36+
--red-light: #f4e2e7;
3737
--red-dark: #{color.adjust(#d48a9e, $blackness: 10%)};
3838
--blue-dark: #2f36aa;
3939
--purple: #9a80e6;

0 commit comments

Comments
 (0)