Merge branch 'main' of gitlab.com:famedly/fluffychat into main
This commit is contained in:
commit
5904b150c6
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -12,7 +12,7 @@ abstract class FluffyThemes {
|
||||||
MediaQuery.of(context).size.width > columnWidth * 2;
|
MediaQuery.of(context).size.width > columnWidth * 2;
|
||||||
|
|
||||||
static const fallbackTextStyle =
|
static const fallbackTextStyle =
|
||||||
TextStyle(fontFamily: 'NotoSans', fontFamilyFallback: ['NotoEmoji']);
|
TextStyle(fontFamily: 'Roboto', fontFamilyFallback: ['NotoEmoji']);
|
||||||
|
|
||||||
static var fallback_text_theme = PlatformInfos.isDesktop
|
static var fallback_text_theme = PlatformInfos.isDesktop
|
||||||
? TextTheme(
|
? TextTheme(
|
||||||
|
|
17
pubspec.yaml
17
pubspec.yaml
|
@ -95,19 +95,16 @@ flutter:
|
||||||
- assets/js/package/
|
- assets/js/package/
|
||||||
|
|
||||||
fonts:
|
fonts:
|
||||||
|
- family: Roboto
|
||||||
|
fonts:
|
||||||
|
- asset: fonts/Roboto/Roboto-Regular.ttf
|
||||||
|
- asset: fonts/Roboto/Roboto-Italic.ttf
|
||||||
|
style: italic
|
||||||
|
- asset: fonts/Roboto/Roboto-Bold.ttf
|
||||||
|
weight: 700
|
||||||
- family: NotoEmoji
|
- family: NotoEmoji
|
||||||
fonts:
|
fonts:
|
||||||
- asset: fonts/NotoEmoji/NotoColorEmoji.ttf
|
- asset: fonts/NotoEmoji/NotoColorEmoji.ttf
|
||||||
- family: NotoSans
|
|
||||||
fonts:
|
|
||||||
- asset: fonts/NotoSans/NotoSans-Regular.ttf
|
|
||||||
- asset: fonts/NotoSans/NotoSans-Italic.ttf
|
|
||||||
style: italic
|
|
||||||
- asset: fonts/NotoSans/NotoSans-Bold.ttf
|
|
||||||
weight: 700
|
|
||||||
- asset: fonts/NotoSans/NotoSans-BoldItalic.ttf
|
|
||||||
weight: 700
|
|
||||||
style: italic
|
|
||||||
|
|
||||||
dependency_overrides:
|
dependency_overrides:
|
||||||
geolocator_android:
|
geolocator_android:
|
||||||
|
|
Loading…
Reference in New Issue