Skip to content

Commit fd3a2c2

Browse files
committed
fix styles depends on button
1 parent b69dbc0 commit fd3a2c2

6 files changed

Lines changed: 27 additions & 28 deletions

File tree

projects/skills/src/app/skills/shared/skill-card/skill-card.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
display: flex;
55
flex-direction: column;
66
gap: 16px;
7+
height: 220px;
78
padding: 20px;
89
margin-bottom: 20px;
9-
height: 220px;
1010
cursor: pointer;
1111
border: 1px solid var(--grey-button);
1212
border-radius: 15px;

projects/skills/src/styles/_colors.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
:root {
66
// ACCENT
7-
--gradient: linear-gradient(90deg, #242424 0%, #8A63E6 50%);
8-
--gradient-mild: linear-gradient(90deg, #501d53 0.3%, #3b1f72 22%, #8A63E6 100%);
9-
--accent: #8A63E6;
10-
--accent-dark: #{color.adjust(#8A63E6, $blackness: 20%)};
7+
--gradient: linear-gradient(90deg, #242424 0%, #8a63e6 50%);
8+
--gradient-mild: linear-gradient(90deg, #501d53 0.3%, #3b1f72 22%, #8a63e6 100%);
9+
--accent: #8a63e6;
10+
--accent-dark: #{color.adjust(#8a63e6, $blackness: 20%)};
1111
--accent-mild: #{color.adjust(#6c27ff, $alpha: -0.4)};
12-
--accent-light: #9A80E6;
12+
--accent-light: #9a80e6;
1313

1414
// GOLD
1515
--gold: #f6ff8b;
1616
--gold-dark: #f7cf4d;
1717

1818
// GRAY
19-
--white: #FAFAFA;
20-
--black: #333333;
21-
--dark-grey: #E7E7E7;
19+
--white: #fafafa;
20+
--black: #333;
21+
--dark-grey: #e7e7e7;
2222
--gray: #d3d3d3;
2323
--light-gray: #f9f9f9;
2424
--grey-button: #e5e5e5e5;
@@ -27,9 +27,9 @@
2727
--grey-for-text: #a59fb9;
2828

2929
// FUNCTIONAL
30-
--green: #88C9A1;
30+
--green: #88c9a1;
3131
--light-green: #97ecb8;
32-
--red: #D48A9E;
33-
--red-dark: #{color.adjust(#D48A9E, $blackness: 10%)};
32+
--red: #d48a9e;
33+
--red-dark: #{color.adjust(#d48a9e, $blackness: 10%)};
3434
--light-red: #e8a5b7;
3535
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
&:hover {
2020
background-color: var(--accent-light);
21-
box-shadow: -2px 3px 3px rgba(51, 51, 51, 0.2);
21+
box-shadow: -2px 3px 3px rgb(51 51 51 / 20%);
2222
}
2323

2424
::ng-deep *:not(.dot-wave) {
@@ -74,8 +74,8 @@
7474
}
7575

7676
&.button--big {
77-
padding: 12px 24px;
7877
width: 100%;
78+
padding: 12px 24px;
7979
}
8080

8181
&.button--no-border {
@@ -120,8 +120,8 @@
120120
}
121121

122122
&.button--big {
123-
padding: 12px 24px;
124123
width: 100%;
124+
padding: 12px 24px;
125125
}
126126

127127
&.button--no-border {

projects/social_platform/src/styles/_colors.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44

55
:root {
66
// ACCENT
7-
--gradient: linear-gradient(90deg, #242424 0%, #8A63E6 50%);
8-
--gradient-mild: linear-gradient(90deg, #501d53 0.3%, #3b1f72 22%, #8A63E6 100%);
9-
--accent: #8A63E6;
10-
--accent-dark: #{color.adjust(#8A63E6, $blackness: 20%)};
7+
--gradient: linear-gradient(90deg, #242424 0%, #8a63e6 50%);
8+
--gradient-mild: linear-gradient(90deg, #501d53 0.3%, #3b1f72 22%, #8a63e6 100%);
9+
--accent: #8a63e6;
10+
--accent-dark: #{color.adjust(#8a63e6, $blackness: 20%)};
1111
--accent-mild: #{color.adjust(#6c27ff, $alpha: -0.4)};
12-
--accent-light: #9A80E6;
12+
--accent-light: #9a80e6;
1313

1414
// GOLD
1515
--gold: #f6ff8b;
1616
--gold-dark: #f7cf4d;
1717

1818
// GRAY
19-
--white: #FAFAFA;
20-
--black: #333333;
21-
--dark-grey: #E7E7E7;
19+
--white: #fafafa;
20+
--black: #333;
21+
--dark-grey: #e7e7e7;
2222
--gray: #d3d3d3;
2323
--light-gray: #f9f9f9;
2424
--grey-button: #e5e5e5e5;
2525
--medium-grey-for-outline: #eee;
2626
--grey-for-text: #a59fb9;
2727

2828
// FUNCTIONAL
29-
--green: #88C9A1;
30-
--red: #D48A9E;
31-
--red-dark: #{color.adjust(#D48A9E, $blackness: 10%)};
29+
--green: #88c9a1;
30+
--red: #d48a9e;
31+
--red-dark: #{color.adjust(#d48a9e, $blackness: 10%)};
3232
}

projects/social_platform/src/styles/pages/_project-detail.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
}
1818

1919
app-button ::ng-deep .button--inline {
20-
2120
@include responsive.apply-desktop {
2221
min-height: 52px;
2322
}

projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
&__actions {
4444
display: flex;
45-
margin-top: 16px;
4645
gap: 12px;
46+
margin-top: 16px;
4747
}
4848
}

0 commit comments

Comments
 (0)