fix home

Pages/HomePage.xaml

@@ -16,15 +16,15 @@
                 Margin="20,35,20,20"
                 >
                 
-
                 <Border 
                     Style="{StaticResource SecondaryBorder}"
                     BackgroundColor="{StaticResource BackgroundSecondary}" 
                     StrokeShape="RoundRectangle 1500"
                     >
-                    <ImageButton Source="default_profile_picture.png" 
-                             WidthRequest="65" 
-                             HeightRequest="65"/>
+                    <ImageButton 
+                        Source="default_profile_picture.png" 
+                        WidthRequest="65" 
+                        HeightRequest="65"/>
                 </Border>              
             </FlexLayout>
             <Grid 
@@ -56,26 +56,18 @@
             <VerticalStackLayout
                 Grid.Row="2">
                 <FlexLayout
-                        
                     JustifyContent="SpaceBetween"
                     AlignItems="Center"
-                    AlignContent="Stretch"
                     Margin="20"
-                    >
-                    <Label Text="Popular recipe" 
-                           HeightRequest="30"
-                           FontSize="Title"
-                           FontAttributes="Bold"
-                           Margin="5,0,0,0"
-                           >
-                            
-                    </Label>
-                    <Label Text="Show All"
-                           Margin="0,5,5,0"
-                           HeightRequest="25"
-                           TextColor="Grey"
-                           >
-                    </Label>
+                    HeightRequest="30">
+                    <Label 
+                        Text="Popular recipe" 
+                        Style="{StaticResource h2}"/>
+
+                    <Label 
+                        Text="Show All"
+                        TextColor="{StaticResource TextColorSecondary}"/>
+
                 </FlexLayout>
 
                 <ScrollView
@@ -95,38 +87,36 @@
             <VerticalStackLayout
                 Grid.Row="3">
                 <FlexLayout
-                        
                     JustifyContent="SpaceBetween"
                     AlignItems="Center"
-                    AlignContent="Stretch"
                     Margin="20,0,20,20"
+                    HeightRequest="30"
                     >
-                    <Label Text="Recommended for you" 
+                    <Label 
+                        Text="Recommended for you" 
                         Style="{StaticResource h2}"/>
 
-                    <Label Text="Show All"
-                           Margin="0,5,5,0"
-                           HeightRequest="25"
-                           TextColor="Grey"
-                           >
-                    </Label>
+                    <Label 
+                        Text="Show All"
+                        TextColor="{StaticResource TextColorSecondary}"/>
+
                 </FlexLayout>
                 <ScrollView>
-                        <FlexLayout
-                            JustifyContent="Center"
-                            AlignItems="Start"
-                            AlignContent="Start"
-                            Direction="Row"
-                            Wrap="Wrap">
-                        <views:RecipeView Margin="2.5"/>
-                        <views:RecipeView Margin="2.5"/>
-                        <views:RecipeView Margin="2.5"/>
-                        <views:RecipeView Margin="2.5"/>
-                        <views:RecipeView Margin="2.5"/>
-                        <views:RecipeView Margin="2.5"/>
-                        <views:RecipeView Margin="2.5"/>
-                        </FlexLayout>
-                    </ScrollView>
+                    <FlexLayout
+                        JustifyContent="Center"
+                        AlignItems="Start"
+                        AlignContent="Start"
+                        Direction="Row"
+                        Wrap="Wrap">
+                    <views:RecipeView Margin="2.5"/>
+                    <views:RecipeView Margin="2.5"/>
+                    <views:RecipeView Margin="2.5"/>
+                    <views:RecipeView Margin="2.5"/>
+                    <views:RecipeView Margin="2.5"/>
+                    <views:RecipeView Margin="2.5"/>
+                    <views:RecipeView Margin="2.5"/>
+                    </FlexLayout>
+                </ScrollView>
             </VerticalStackLayout>
 
         </Grid>