Skip to content

Commit 43ae87c

Browse files
authored
Merge pull request #515 from Poly-Pixel/various-fixes
Fix various small issues
2 parents 7ff841c + bfa3eb9 commit 43ae87c

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AddButton extends StatelessWidget {
2828
onSelected: onSelected,
2929
).show(context);
3030
},
31-
icon: svgWidget("home/add").padding(horizontal: 3, vertical: 3),
31+
icon: svgWidget("home/add", color: theme.iconColor).padding(horizontal: 3, vertical: 3),
3232
);
3333
}
3434
}

frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/toolbar_icon_button.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class ToolbarIconButton extends StatelessWidget {
2929
iconPadding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
3030
onPressed: onPressed,
3131
width: width,
32-
icon: isToggled == true ? svgWidget(iconName, color: Colors.white) : svgWidget(iconName),
32+
icon: isToggled == true ? svgWidget(iconName, color: Colors.white) : svgWidget(iconName, color: theme.iconColor),
3333
fillColor: isToggled == true ? theme.main1 : theme.shader6,
34-
hoverColor: isToggled == true ? theme.main1 : theme.shader5,
34+
hoverColor: isToggled == true ? theme.main1 : theme.hover,
3535
tooltipText: tooltipText,
3636
);
3737
}

frontend/app_flowy/packages/flowy_infra/lib/text_style.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class TextStyles {
7171
static TextStyle get CalloutFocus => Callout.bold;
7272

7373
// ignore: non_constant_identifier_names
74-
static TextStyle get Btn => quicksand.bold.size(FontSizes.s14).letterSpace(1.75);
74+
static TextStyle get Btn => quicksand.bold.size(FontSizes.s16).letterSpace(1.75);
7575

7676
// ignore: non_constant_identifier_names
7777
static TextStyle get BtnSelected => quicksand.size(FontSizes.s14).letterSpace(1.75);

frontend/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/primary_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class PrimaryTextButton extends StatelessWidget {
1515

1616
@override
1717
Widget build(BuildContext context) {
18-
TextStyle txtStyle = TextStyles.Footnote.textColor(Colors.white);
18+
TextStyle txtStyle = TextStyles.Btn.textColor(Colors.white);
1919
return PrimaryButton(bigMode: bigMode, onPressed: onPressed, child: Text(label, style: txtStyle));
2020
}
2121
}

frontend/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/secondary_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class SecondaryTextButton extends StatelessWidget {
1717
@override
1818
Widget build(BuildContext context) {
1919
final theme = context.watch<AppTheme>();
20-
TextStyle txtStyle = TextStyles.Footnote.textColor(theme.main1);
20+
TextStyle txtStyle = TextStyles.Btn.textColor(theme.main1);
2121
return SecondaryButton(bigMode: bigMode, onPressed: onPressed, child: Text(label, style: txtStyle));
2222
}
2323
}

0 commit comments

Comments
 (0)