diff --git a/src/app/components/register/register.component.sass b/src/app/components/register/register.component.sass
index 56a5862..2daa683 100644
--- a/src/app/components/register/register.component.sass
+++ b/src/app/components/register/register.component.sass
@@ -2,20 +2,36 @@
@import '../../../styles/vars.sass'
#register
- background-color: $cSecondaryBackground
- grid-template: 8% 77% 15% / 15% 70% 15%
- display: grid
- min-height: 90vh
- max-height: 90vh
-
-#registercontainer
- @include gridPosition(2, 2,2,2)
- grid-template: 15% 15% 15% 15% 15% 15% / 100%
- background-color: $cPrimaryBackground
- padding: 1em
- overflow: auto
-input
- margin: 0.25em
-
-a
- color: $cHeadPrimaryBackground
\ No newline at end of file
+ padding: 2em
+ max-width: 35em
+ margin: 0 auto
+
+.example-container
+ display: flex
+ flex-direction: column
+
+.example-container > *
+ width: 100%
+
+.example-right-align
+ text-align: right
+
+input.example-right-align::-webkit-outer-spin-button,
+input.example-right-align::-webkit-inner-spin-button
+ display: none
+
+input.example-right-align
+ -moz-appearance: textfield
+
+.mat-error
+ margin-bottom: 0.25em
+
+.mat-raised-button
+ margin: 0.25em
+ width: 100%
+
+.mat-button
+ margin: 0.25em
+
+.mat-stroked-button
+ width: 100%
\ No newline at end of file
diff --git a/src/app/components/register/register.component.ts b/src/app/components/register/register.component.ts
index 90c6945..e34a505 100644
--- a/src/app/components/register/register.component.ts
+++ b/src/app/components/register/register.component.ts
@@ -15,6 +15,8 @@ export class RegisterComponent implements OnInit {
registration: Registration
errorOccurred: boolean = false;
errorMessage: string;
+ hide1 = true;
+ hide2 = true;
constructor(private registerService: RegisterService) {
this.registration = {username: null, passwordHash: null, email: null};
diff --git a/src/index.html b/src/index.html
index 116c097..108d36c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,6 +7,8 @@
+
+
diff --git a/src/main.ts b/src/main.ts
index 64b81cd..a4a1bf9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,3 +1,4 @@
+import 'hammerjs';
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
diff --git a/src/styles.sass b/src/styles.sass
index e0fdf79..8cad88e 100644
--- a/src/styles.sass
+++ b/src/styles.sass
@@ -2,9 +2,8 @@
@import 'styles/vars.sass'
body
- font-family: Arial, serif
+ font-family: Arial, sans-serif
margin: 0
padding: 0
- min-height: 100vh
- max-height: 100vh
+ height: 100%
\ No newline at end of file
diff --git a/src/styles/greenvironment-material-theme.scss b/src/styles/greenvironment-material-theme.scss
new file mode 100644
index 0000000..dcf65d2
--- /dev/null
+++ b/src/styles/greenvironment-material-theme.scss
@@ -0,0 +1,27 @@
+@import '~@angular/material/theming';
+// Plus imports for other components in your app.
+
+// Include the common styles for Angular Material. We include this here so that you only
+// have to load a single css file for Angular Material in your app.
+// Be sure that you only ever include this mixin once!
+@include mat-core();
+
+// Define the palettes for your theme using the Material Design palettes available in palette.scss
+// (imported above). For each palette, you can optionally specify a default, lighter, and darker
+// hue. Available color palettes: https://material.io/design/color/
+$theme-primary: mat-palette($mat-green);
+$theme-accent: mat-palette($mat-pink, A200, A100, A400);
+
+// The warn palette is optional (defaults to red).
+$theme-warn: mat-palette($mat-red);
+
+// Create the theme object (a Sass map containing all of the palettes).
+$my-theme: mat-light-theme($theme-primary, $theme-accent, $theme-warn);
+
+
+
+
+// Include theme styles for core and each component used in your app.
+// Alternatively, you can import and @include the theme mixins for each component
+// that you are using.
+@include angular-material-theme($my-theme);
\ No newline at end of file
diff --git a/src/styles/vars.sass b/src/styles/vars.sass
index 5d17deb..2341683 100644
--- a/src/styles/vars.sass
+++ b/src/styles/vars.sass
@@ -18,9 +18,9 @@ $cFeedUpVote: #2cb149
$cFeedDownVote: #ff5f5f
//Home -- Chat, Friends, Groups
-$cFontWhite: #adffc1ee
+$cFontWhite: #fff//#adffc1ee //this is also the background color lol
$cBoxHeaderBackground: #259145
-$cBoxBodyBackground: #3deb71
+$cBoxBodyBackground: #fff//#3deb71
$cMessageOwn: #cfe4c9
$cMessageForeign: #baca5d