Merge pull request #2 from brianokinyi/master

Brian Okinyi · web-flow · commit b9e5b05a6c90 · 2018-05-16T13:26:01.000+03:00
Various changes
diff --git a/app/client/assets/images/logo-color.svg b/app/client/assets/images/logo-color.svg
@@ -4,15 +4,15 @@
 	 viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
 <g>
 	<g>
-		<polygon fill="#473899" points="332.6,124.5 332.6,240.7 303.5,240.7 303.5,124.5 143.7,124.5 143.7,473.3 303.5,473.3 303.5,357
+		<polygon fill="#7dc349" points="332.6,124.5 332.6,240.7 303.5,240.7 303.5,124.5 143.7,124.5 143.7,473.3 303.5,473.3 303.5,357
 			332.6,357 332.6,473.3 492.4,473.3 492.4,124.5 		"/>
-		<polygon fill="#473899" points="521.5,473.3 695.9,124.5 870.3,473.3 		"/>
+		<polygon fill="#7dc349" points="521.5,473.3 695.9,124.5 870.3,473.3 		"/>
 		<g>
-			<polygon fill="#473899" points="521.2,876.3 521.2,527.6 870,527.6 768.3,701.9 870,876.3 			"/>
-			<path fill="#473899" d="M419.5,701.9l68.2-107.4c-34.1-49.3-91-81.5-155.4-81.5c-104.3,0-188.9,84.6-188.9,188.9
+			<polygon fill="#7dc349" points="521.2,876.3 521.2,527.6 870,527.6 768.3,701.9 870,876.3 			"/>
+			<path fill="#7dc349" d="M419.5,701.9l68.2-107.4c-34.1-49.3-91-81.5-155.4-81.5c-104.3,0-188.9,84.6-188.9,188.9
 				c0,104.3,84.6,188.9,188.9,188.9c64.4,0,121.3-32.3,155.4-81.5L419.5,701.9z"/>
 		</g>
 	</g>
-	<path fill="#473899" d="M993,1000H6V0h987V1000z M45,967h908V33H45V967z"/>
+	<path fill="#7dc349" d="M993,1000H6V0h987V1000z M45,967h908V33H45V967z"/>
 </g>
 </svg>
diff --git a/app/client/index.html b/app/client/index.html
@@ -35,6 +35,12 @@
     <link href='//fonts.googleapis.com/css?family=Montserrat:700' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
 
+    <style>
+      .purple{
+        background-color: #7dc349 !important; 
+      }
+    </style>
+
       <!-- iOS Web Clip -->
     <link rel="apple-touch-icon" href="assets/images/favicon.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/app/client/stylesheets/_branding.scss b/app/client/stylesheets/_branding.scss
@@ -6,10 +6,12 @@
 
 $primary: #FF585D ;
 $secondary: #7dc349;
-$tertiary: #dabb0e;
+$tertiary: #7dc349;
+
+// $tertiary: #dabb0e;
 
 /** ASSET URLS
  * login-bg: image for login splash page 
  */
 
-$login-bg: url('https://scontent.fmba1-1.fna.fbcdn.net/v/t31.0-8/13483278_630624373754224_3282533544753907817_o.jpg?_nc_cat=0&oh=5def066abb7fbbc10979af65e59c216c&oe=5B8BD3BA');
+$login-bg: url('https://scontent-lht6-1.xx.fbcdn.net/v/t31.0-8/13483278_630624373754224_3282533544753907817_o.jpg?_nc_cat=0&oh=5def066abb7fbbc10979af65e59c216c&oe=5B8BD3BA');
diff --git a/app/client/stylesheets/_custom.scss b/app/client/stylesheets/_custom.scss
@@ -1,3 +1,6 @@
 // Branding overrides
 //
 // Copy variables from `_branding.scss` to this file to override default values.
+$primary: #FF585D ;
+$secondary: #7dc349;
+$tertiary: #7dc349;
diff --git a/app/client/views/login/login.html b/app/client/views/login/login.html
@@ -21,7 +21,7 @@
                 <label> Email</label>
                 <input type="email"
                        id='email'
-                       placeholder="foo@bar.edu"
+                       placeholder="someone@domain.com"
                        ng-model="email">
               </div>
               <div class="field">
diff --git a/docs/images/screenshots/login.png b/docs/images/screenshots/login.png
