fixed the theme look & feel

smukov · Oct 1, 2016 · dbc12a2 · dbc12a2
1 parent 4edd124
commit dbc12a2
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 174 deletions.
diff --git a/Ionic2/src/components/profileHeader.ts b/Ionic2/src/components/profileHeader.ts
@@ -7,7 +7,7 @@ import {Component} from '@angular/core';
   `
   <div class="content-center-left">
     <img src="{{profileImage}}" style="border-radius: 50%; width: 60px; height: 60px;">
-    <span class="profile-header">{{fullName}}</span>
+    <span class="profile-header-name">{{fullName}}</span>
   </div>
   `
 })

diff --git a/Ionic2/src/pages/about/about.html b/Ionic2/src/pages/about/about.html
diff --git a/Ionic2/src/pages/about/about.scss b/Ionic2/src/pages/about/about.scss
diff --git a/Ionic2/src/pages/about/about.ts b/Ionic2/src/pages/about/about.ts
diff --git a/Ionic2/src/pages/contact/contact.html b/Ionic2/src/pages/contact/contact.html
diff --git a/Ionic2/src/pages/contact/contact.scss b/Ionic2/src/pages/contact/contact.scss
diff --git a/Ionic2/src/pages/contact/contact.ts b/Ionic2/src/pages/contact/contact.ts
diff --git a/Ionic2/src/pages/contactPage/contactPage.ts b/Ionic2/src/pages/contactPage/contactPage.ts
@@ -24,7 +24,7 @@ export class ContactPage {
   }
 
   public ionViewWillEnter(){
-    this.header.setFullName("Dr. Gregory House");
+    //this.header.setFullName("Dr. Gregory House");
   }
 
   public openChat(){

diff --git a/Ionic2/src/pages/home/home.html b/Ionic2/src/pages/home/home.html
diff --git a/Ionic2/src/pages/home/home.scss b/Ionic2/src/pages/home/home.scss
diff --git a/Ionic2/src/pages/home/home.ts b/Ionic2/src/pages/home/home.ts
diff --git a/Ionic2/src/pages/profilePage/profilePage.scss b/Ionic2/src/pages/profilePage/profilePage.scss
@@ -16,4 +16,9 @@ page-profile {
     border-bottom-color: #dedede !important;
     box-shadow: none !important;
   }
+
+  .item-md.item-input.ng-invalid.ng-touched:not(.input-has-focus) .item-inner {
+    border-bottom-color: #dedede !important;
+    box-shadow: none !important;
+  }
 }
diff --git a/Ionic2/src/pages/tabs/tabs.html b/Ionic2/src/pages/tabs/tabs.html
diff --git a/Ionic2/src/pages/tabs/tabs.ts b/Ionic2/src/pages/tabs/tabs.ts
diff --git a/Ionic2/src/theme/global.scss b/Ionic2/src/theme/global.scss
@@ -10,51 +10,3 @@
 // automatically applied to the <body> element in the app.
 //
 // App Shared Sass variables belong in app.variables.scss.
-
-.profile-header {
-  font-size: $header-font-size;
-  font-weight: $header-font-weight;
-  margin-left: 10px;
-  line-height: 100%;
-}
-
-.content-center-center {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.content-center-left {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;;
-}
-
-.content-center-right {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-
-ion-item{
-  .text-input {
-    font-size: large;
-  }
-}
-
-//makes the paragraph properly wrap the text inside it in multiple lines
-p {
-  word-wrap: break-word;
-  white-space: normal;
-}
-
-ion-menu{
-  ion-content{
-    ion-list{
-      ion-icon{
-        margin-right: 20px;
-        color: #595959;
-      }
-    }
-  }
-}
diff --git a/Ionic2/src/theme/variables.scss b/Ionic2/src/theme/variables.scss
@@ -76,6 +76,54 @@ $text-input-wp-highlight-color: map-get($colors, secondary);
 
 @import "ionic.theme.default";
 
+.profile-header-name {
+  font-size: $header-font-size;
+  font-weight: $header-font-weight;
+  margin-left: 10px;
+  line-height: 100%;
+}
+
+.content-center-center {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.content-center-left {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;;
+}
+
+.content-center-right {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+ion-item{
+  .text-input {
+    font-size: large;
+  }
+}
+
+//makes the paragraph properly wrap the text inside it in multiple lines
+p {
+  word-wrap: break-word;
+  white-space: normal;
+}
+
+ion-menu{
+  ion-content{
+    ion-list{
+      ion-icon{
+        margin-right: 20px;
+        color: #595959;
+      }
+    }
+  }
+}
+
 
 // Ionicons
 // --------------------------------------------------