sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflit

Browse Source
This commit is contained in:
Thinzar Win
2020-11-19 14:27:29 +06:30
parent 29f3461174
commit 15f2b79ee0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/helpers/theme.dart
View File

@@ -11,10 +11,10 @@ const buttonBkColor = const Color(0xFF268944);
const labelColor = const Color(0xFF757575); const labelColor = const Color(0xFF757575);
const TextStyle labelStyle = const TextStyle labelStyle =
TextStyle(fontSize: 20, color: primaryColor, fontWeight: FontWeight.w500); TextStyle(fontSize: 20, color: labelColor, fontWeight: FontWeight.w500);
const TextStyle labelStyleMM = TextStyle( const TextStyle labelStyleMM = TextStyle(
fontSize: 20, fontSize: 20,
color: primaryColor, color: labelColor,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
height: 1, height: 1,
fontFamily: "Myanmar3"); fontFamily: "Myanmar3");

3
lib/pages/main/home_page.dart
View File

@@ -496,7 +496,8 @@ class _HomePageState extends State<HomePage> {
SizedBox(height: 50), SizedBox(height: 50),
BottomWidgets(), BottomWidgets(),
], ],
))), ))
),
), ),
), ),
); );