diff --git a/src/app/pages/auth/auth-page.component.html b/src/app/pages/auth/auth-page.component.html index 90c6b64..ba28123 100644 --- a/src/app/pages/auth/auth-page.component.html +++ b/src/app/pages/auth/auth-page.component.html @@ -1 +1,3 @@ - \ No newline at end of file +
+ +
\ No newline at end of file diff --git a/src/app/pages/auth/auth-page.component.scss b/src/app/pages/auth/auth-page.component.scss index e69de29..67774e7 100644 --- a/src/app/pages/auth/auth-page.component.scss +++ b/src/app/pages/auth/auth-page.component.scss @@ -0,0 +1,33 @@ +$image_path: "/assets/layout/images/" !default; + +.auth_background { + background-image:url($image_path + 'login11.jpg'); + margin: 0; + height: 100%; + background-repeat: no-repeat; + background-position: center; + background-size: cover; +} +.auth_card { + position: relative; + margin: auto auto; + width: 500px; +} + +$prefix: 'auth'; + +.#{$prefix} { + + &-container { + background-image:url($image_path + 'login11.jpg'); + min-height: 100%; + background-size: cover; + padding: 10px auto; + } + + &-main { + position: relative; + margin: auto auto; + width: 500px; + } +} \ No newline at end of file diff --git a/src/app/pages/auth/signin/signin-page.component.html b/src/app/pages/auth/signin/signin-page.component.html index 5824b4a..5fad28e 100644 --- a/src/app/pages/auth/signin/signin-page.component.html +++ b/src/app/pages/auth/signin/signin-page.component.html @@ -1,12 +1 @@ -
-
-
- -
-
-
+ \ No newline at end of file diff --git a/src/app/pages/auth/signup/signup-page.component.html b/src/app/pages/auth/signup/signup-page.component.html index b3e6843..cb93c70 100644 --- a/src/app/pages/auth/signup/signup-page.component.html +++ b/src/app/pages/auth/signup/signup-page.component.html @@ -1,13 +1 @@ -
-
-
- -
-
-
- + \ No newline at end of file diff --git a/src/assets/layout/images/login11.jpg b/src/assets/layout/images/login11.jpg new file mode 100644 index 0000000..3410407 Binary files /dev/null and b/src/assets/layout/images/login11.jpg differ diff --git a/src/assets/layout/images/overFlow_CI_blue_185.png b/src/assets/layout/images/overFlow_CI_blue_185.png new file mode 100644 index 0000000..b4ef8a2 Binary files /dev/null and b/src/assets/layout/images/overFlow_CI_blue_185.png differ diff --git a/src/packages/member/component/reset-password/reset-password.component.html b/src/packages/member/component/reset-password/reset-password.component.html index 3cd5b46..322f445 100644 --- a/src/packages/member/component/reset-password/reset-password.component.html +++ b/src/packages/member/component/reset-password/reset-password.component.html @@ -1 +1,29 @@ -
reset-password
\ No newline at end of file +
+
+
+
+ + +
+
+ + + +
+ {{ formErrors.email }} +
+
+ +
+ + + Sign In + | + Sign Up +
+
+
+
\ No newline at end of file diff --git a/src/packages/member/component/reset-password/reset-password.component.scss b/src/packages/member/component/reset-password/reset-password.component.scss index 35392cf..e69de29 100644 --- a/src/packages/member/component/reset-password/reset-password.component.scss +++ b/src/packages/member/component/reset-password/reset-password.component.scss @@ -1,40 +0,0 @@ -$gray-lighter: #eceeef !default; -$image_path: "/assets/images/" !default; - -$prefix: 'reset-password'; - -.#{$prefix} { - - &-conainer { - min-height: 100%; - background-size: cover; - padding: 100px; - } - - &-main { - position: relative; - margin: 0 auto; - width: 500px; - } -} - -.full-width { - width: 100%; -} - -.help { - -} - -.is-danger { - -} - -.button { - width:300px; -} -.redirect { - font-size: 14px; - margin-left: 10px; - color: #00AAAA; -} diff --git a/src/packages/member/component/signin/signin.component.html b/src/packages/member/component/signin/signin.component.html index 9fe1fb3..d0956d2 100644 --- a/src/packages/member/component/signin/signin.component.html +++ b/src/packages/member/component/signin/signin.component.html @@ -2,7 +2,7 @@
- +
@@ -19,16 +19,9 @@ Sign In - - - - + Forgot Password + | + Sign Up
diff --git a/src/packages/member/component/signup/signup.component.html b/src/packages/member/component/signup/signup.component.html index 9fff794..ec48f85 100644 --- a/src/packages/member/component/signup/signup.component.html +++ b/src/packages/member/component/signup/signup.component.html @@ -2,7 +2,7 @@
- +
@@ -63,6 +63,8 @@ Sign Up + + Sign In
diff --git a/src/packages/member/component/signup/signup.component.scss b/src/packages/member/component/signup/signup.component.scss index 070c040..e69de29 100644 --- a/src/packages/member/component/signup/signup.component.scss +++ b/src/packages/member/component/signup/signup.component.scss @@ -1,37 +0,0 @@ -$gray-lighter: #eceeef !default; -$image_path: "/assets/images/" !default; - -$prefix: 'signup'; - -.#{$prefix} { - - &-conainer { - min-height: 100%; - background-size: cover; - padding: 100px; - } - - &-main { - position: relative; - margin: 0 auto; - width: 500px; - } -} - -.full-width { - width: 100%; -} - -.help { - -} - -.is-danger { - -} - -.redirect { - font-size: 14px; - margin-left: 10px; - color: #00AAAA; -} diff --git a/src/styles.scss b/src/styles.scss index 90d4ee0..31d2cfd 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1 +1,15 @@ /* You can add global styles to this file, and also import other style files */ + +//auth style +.login-body { + //background: url("../images/login/login.png") top left no-repeat #f7f7f7; + background: url("/assets/layout/images/login11.jpg") top left no-repeat #f7f7f7 !important; + margin: -100px 0 0 0 !important; + padding: 100px 0 !important; +} +@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { + .login-body { + //background: url("../images/login/login2x.png") top left no-repeat #f7f7f7; + background: url("/assets/layout/images/login11.jpg") top left no-repeat #f7f7f7 !important; + } +} \ No newline at end of file