replaced 'application name' with 'controlcloud'

joeblas · Nov 17, 2017 · 65b8bf9 · 65b8bf9
1 parent dbb1fea
commit 65b8bf9
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 6,535 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/main.html b/client/main.html
@@ -2,10 +2,12 @@
   <meta charset="utf-8">
   <title>ControlCloud</title>
   <meta name="description" content="A description for the application.">
-  <meta name="viewport" content="initial-scale=1, minimal-ui, maximum-scale=1, minimum-scale=1" />
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.6.1/css/bulma.css" /> -->
   <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
   <link rel="shortcut icon" type="image/png" href="/favicon.png" sizes="16x16 32x32 64x64">
   <link rel="apple-touch-icon" sizes="120x120" href="/favicon.png">
+
 </head>
 
 <body>

diff --git a/imports/.DS_Store b/imports/.DS_Store
diff --git a/imports/api/Users/server/send-welcome-email.js b/imports/api/Users/server/send-welcome-email.js
@@ -4,13 +4,13 @@ import getOAuthProfile from '../../../modules/get-oauth-profile';
 export default (options, user) => {
   const OAuthProfile = getOAuthProfile(options, user);
 
-  const applicationName = 'Application Name';
+  const applicationName = 'CloudControl';
   const firstName = OAuthProfile ? OAuthProfile.name.first : options.profile.name.first;
   const emailAddress = OAuthProfile ? OAuthProfile.email : options.email;
 
   return sendEmail({
     to: emailAddress,
-    from: `${applicationName} <support@application.com>`,
+    from: `${applicationName} <support@cloudcontrol.com>`,
     subject: `[${applicationName}] Welcome, ${firstName}!`,
     template: 'welcome',
     templateVars: {

diff --git a/imports/startup/server/accounts/email-templates.js b/imports/startup/server/accounts/email-templates.js
@@ -4,8 +4,8 @@ import getPrivateFile from '../../../modules/server/get-private-file';
 import templateToHTML from '../../../modules/server/handlebars-email-to-html';
 import templateToText from '../../../modules/server/handlebars-email-to-text';
 
-const name = 'Application Name';
-const email = '<support@application.com>';
+const name = 'ControlCloud';
+const email = '<support@controlcloud.com>';
 const from = `${name} ${email}`;
 const emailTemplates = Accounts.emailTemplates;
 

diff --git a/imports/ui/.DS_Store b/imports/ui/.DS_Store
diff --git a/imports/ui/components/Navigation/Navigation.scss b/imports/ui/components/Navigation/Navigation.scss
@@ -1,6 +1,10 @@
+@import '../../stylesheets/mixins';
+@import '../../stylesheets/colors';
+
 .navbar {
   border-radius: 0;
   border-left: none;
   border-right: none;
   border-top: none;
+  color: $primary;
 }
diff --git a/imports/ui/components/PageHeader/PageHeader.scss b/imports/ui/components/PageHeader/PageHeader.scss
@@ -2,7 +2,7 @@
 @import '../../stylesheets/colors';
 
 .PageHeader {
-  border-bottom: 1px solid $gray-lighter;
+  border-bottom: 1px solid $primary;
   padding: 0px 0 20px;
   margin-bottom: 20px;
 
@@ -16,7 +16,7 @@
     font-size: 14px;
     margin-top: 10px;
     margin-bottom: 0;
-    color: $gray-light;
+    color: white;
   }
 }
 

diff --git a/imports/ui/pages/.DS_Store b/imports/ui/pages/.DS_Store
diff --git a/imports/ui/pages/Index/Index.js b/imports/ui/pages/Index/Index.js
@@ -5,10 +5,7 @@ import './Index.scss';
 
 const Index = () => (
   <div className="Index">
-    <img
-      src="https://s3-us-west-2.amazonaws.com/cleverbeagle-assets/graphics/email-icon.png"
-      alt="Clever Beagle"
-    />
+    <img src="./mainLogoLarge.jpg"/>
     <h1>CloudControl</h1>
     <p>Simple Cloud Based Invoicing.</p>
 

diff --git a/imports/ui/pages/Index/Index.scss b/imports/ui/pages/Index/Index.scss
@@ -3,7 +3,7 @@
 
 .Index {
   padding: 20px;
-  background: $cb-blue;
+
   text-align: center;
   border-radius: 3px;
   color: #fff;
@@ -15,11 +15,12 @@
 
   h1 {
     font-size: 28px;
+    color: #028ECC;
   }
 
   p {
     font-size: 18px;
-    color: lighten($cb-blue, 25%);
+    color: #028ECC;
   }
 
   > div {
@@ -43,12 +44,12 @@
     p {
       font-size: 14px;
       line-height: 22px;
-      color: lighten($cb-blue, 35%);
+      color: white;
       margin: 0;
     }
 
     p a {
-      color: lighten($cb-blue, 35%);
+      color: white;
       text-decoration: underline;
     }
   }

diff --git a/imports/ui/pages/Index/mainLogoLarge.jpg b/imports/ui/pages/Index/mainLogoLarge.jpg
diff --git a/imports/ui/stylesheets/colors.scss b/imports/ui/stylesheets/colors.scss
@@ -1,4 +1,4 @@
-$primary: #337ab7;
+$primary: #028ECC;
 $success: #5cb85c;
 $info:    #5bc0de;
 $warning: #f0ad4e;