diff --git a/src/app/pages/familylogin/familylogin.page.html b/src/app/pages/familylogin/familylogin.page.html index dfac6a5..cd21bf1 100644 --- a/src/app/pages/familylogin/familylogin.page.html +++ b/src/app/pages/familylogin/familylogin.page.html @@ -7,7 +7,38 @@
- Family Login +
+ Family Login + + + + + + + + + + +
+ + Remember me +
+ + + Login + + + + + Or return to general accounts + +
+
+ Have an account? login +
+
+
+ @@ -23,28 +54,7 @@ - - - - - - - - - -
- - Remember me -
- - - Login - - - - - Or return to general accounts @@ -65,9 +75,5 @@ - -
- Have an account? login -
- + diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index 9a832fd..4e59123 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -22,11 +22,59 @@ Search --> +
+
+
+
+ + +
+
+ +
+ +
+ {{item.short_title}} + {{item.short_description}} + + + + +
+ + + + +
+
+
+ +
+ +
+ Recommended Blog + See all +
+
+
+ +
+ {{item.post_title}} +
+
+ +
+ + + + +
+ -
-
-
- - -
-
- -
- -
- {{item.short_title}} - {{item.short_description}} - -
- - - - -
-
-
- -
- -
- Recommended Blog - See all -
-
-
- -
- {{item.post_title}} -
-
- -
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 13439fa..099c127 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -8,70 +8,75 @@ - - - - - - - - +
+ + + + + + + + - - + + + Login to continue + + + + - Login to continue - - - - + + + + - - - - - -
- - Remember me -
- - - Login - - - Forgot your password ? - -
- Or Continue With -
- - - - - - - - - - - - - - - - - +
+ + Remember me
+ + + Login + + + Forgot your password ? + +
+ Or Continue With +
+ + + + + + + + + + + + + + + + + +
+
+
+
+ Don't have an account? Register +
-
- Don't have an account? Register -
-
+ + + + diff --git a/src/app/pages/tabs/tabs.page.html b/src/app/pages/tabs/tabs.page.html index de04f17..639f17d 100644 --- a/src/app/pages/tabs/tabs.page.html +++ b/src/app/pages/tabs/tabs.page.html @@ -1,5 +1,5 @@ - +
diff --git a/src/app/pages/tabs/tabs.page.scss b/src/app/pages/tabs/tabs.page.scss index 77ffbe0..dcde7f3 100644 --- a/src/app/pages/tabs/tabs.page.scss +++ b/src/app/pages/tabs/tabs.page.scss @@ -4,12 +4,19 @@ } .bottom_bardiv{ // background-color: red; - position:relative; + //position:relative; align-content: center; + // margin-left: auto; + // margin-right: auto; } .bottom_bar{ position: relative; //background-color: red; max-width: 600px; + margin-left: auto; + margin-right: auto; +} +.bottom_bar_tabs{ + background-color: lightgray; } \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index b6de494..df42ab7 100644 --- a/src/global.scss +++ b/src/global.scss @@ -91,3 +91,10 @@ ion-modal.custom_modal_bottom { --height: 300px; align-items: flex-end; } + +.boxed_contents{ + //background-color: red; + max-width: 550px; + margin-left: auto; + margin-right: auto; +} \ No newline at end of file