Merge branch 'develop' of https://gitlab.2fellows.com/art/feelver into develop

lib/ui/login/login.dart

@@ -234,7 +234,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                     fontSize: SizeConfig.getFontSize(12),
                     fontFamily: "SF_Pro_Text",
                     fontWeight: FontWeight.w600,
-                    decoration: TextDecoration.underline,
+                   
                   ),
                   textAlign: TextAlign.right,
                 ),
@@ -340,18 +340,30 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
             SizedBox(
               height: SizeConfig.getHeight(24),
             ),
+        
                 Container(
-              alignment: Alignment.topRight,
-              padding: EdgeInsets.only(
-                right: SizeConfig.getPadding(30),
-              ),
+              padding: EdgeInsets.only(right: SizeConfig.getPadding(30)),
+              alignment: Alignment.centerRight,
+              child: GestureDetector(
+                onTap: () {
+
+              
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(builder: (context) => ForgetPassword()),
+                  );
+                },
                 child: Text(
                   'ลืมรหัสผ่าน',
                   style: TextStyle(
                      color: Color.fromRGBO(106, 179, 170, 1),
-                    fontSize: SizeConfig.getFontSize(13),
+                    fontSize: SizeConfig.getFontSize(12),
                     fontFamily: "SF_Pro_Text",
-                    fontWeight: FontWeight.w600),
+                    fontWeight: FontWeight.w600,
+                   
+                  ),
+                  textAlign: TextAlign.right,
+                ),
               ),
             ),
             _submitLoginButton(),