Skip to content

Commit ff49d5e

Browse files
authored
Fix buttons changing size and make text in search maller (#22)
1 parent 87ec980 commit ff49d5e

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

projects/angular-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@frankframework/angular-components",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"description": "A collection of reusable components designed for use in Frank!Framework projects",
55
"main": "",
66
"author": "Vivy Booman",

projects/angular-components/src/lib/button/button.component.scss

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,14 @@ button {
22
display: inline-flex;
33
border-radius: 50px;
44
padding: 10px 16px;
5-
border: initial;
5+
border: 2px solid transparent;
66
justify-content: center;
77
align-items: center;
88
gap: 8px;
99
font-size: 16px;
1010
font-weight: 600;
1111
text-transform: capitalize;
1212

13-
&:active:not(:disabled) {
14-
padding: 7px 13px;
15-
}
16-
17-
&.active {
18-
padding: 9px 15px;
19-
}
20-
2113
&:disabled {
2214
cursor: not-allowed;
2315
}

projects/angular-components/src/lib/search/search.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ label {
99
border-radius: 50px;
1010
align-items: center;
1111
gap: 8px;
12-
font-family: Inter;
13-
font-size: 24px;
12+
font-family: Inter, serif;
13+
font-size: 1.25em;
1414
font-weight: 500;
1515

1616
&.slim {

projects/angular-components/src/styles/_dark_theme.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ ff-button > button {
44
&:disabled {
55
color: variables.$ff-color-gray;
66
background-color: variables.$ff-bgcolor-dark-gray;
7+
border-color: variables.$ff-bgcolor-dark-gray;
78
}
89

910
&.active {
1011
color: variables.$ff-color-light;
11-
background-color: variables.$ff-bgcolor-dark-gray;
12+
border-color: variables.$ff-bgcolor-dark-gray;
1213

1314
&:hover {
1415
color: variables.$ff-color-dark;
15-
background-color: variables.$ff-bgcolor-yellow;
16+
border-color: variables.$ff-bgcolor-yellow;
1617
}
1718
}
1819
}

projects/angular-components/src/styles/_light_theme.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ff-datatable * {
1212
ff-button > button {
1313
color: variables.$ff-color-light;
1414
background-color: variables.$ff-bgcolor-dark-gray;
15+
border-color: variables.$ff-bgcolor-dark-gray;
1516

1617
&:hover {
1718
color: variables.$ff-color-dark;
@@ -21,23 +22,25 @@ ff-button > button {
2122
&:active:not(:disabled) {
2223
color: variables.$ff-color-dark;
2324
background-color: variables.$ff-bgcolor-yellow;
24-
border: 3px solid variables.$ff-border-yellow;
25+
border: 2px solid variables.$ff-border-yellow;
2526
}
2627

2728
&:disabled {
2829
color: variables.$ff-color-gray;
2930
background-color: variables.$ff-bgcolor-gray;
31+
border-color: variables.$ff-bgcolor-gray;
3032
}
3133

3234
&.active {
3335
color: variables.$ff-color-dark;
3436
background-color: variables.$ff-color-light;
35-
border: 1px dashed variables.$ff-border-gray;
37+
border: 2px dashed variables.$ff-border-gray;
3638
gap: 8px;
3739

3840
&:hover {
3941
color: variables.$ff-color-dark;
4042
background-color: variables.$ff-bgcolor-yellow;
43+
border-color: variables.$ff-bgcolor-yellow;
4144
}
4245
}
4346
}

0 commit comments

Comments
 (0)