rcchung
/
Passion_Project
Watch 2
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

updated popover

Rachelle 6 years ago
parent
ecd8fa64dc
commit
7c08a72d57
13 changed files with 61 additions and 20 deletions
Split View Show Diff Stats
  1. BIN
      .DS_Store
  2. 13
    1
      .idea/workspace.xml
  3. 6
    0
      MyPassionProjectClient/src/app/app.scss
  4. BIN
      MyPassionProjectClient/src/assets/imgs/King.png
  5. BIN
      MyPassionProjectClient/src/assets/imgs/pawns.jpg
  6. 16
    12
      MyPassionProjectClient/src/components/popover/popover.html
  7. 0
    1
      MyPassionProjectClient/src/components/popover/popover.scss
  8. 1
    1
      MyPassionProjectClient/src/pages/friends/friends.html
  9. 1
    1
      MyPassionProjectClient/src/pages/signup/signup.html
  10. 3
    0
      MyPassionProjectClient/src/pages/summary/summary.scss
  11. 3
    3
      MyPassionProjectClient/src/pages/welcome/welcome.html
  12. 3
    1
      MyPassionProjectClient/src/pages/welcome/welcome.scss
  13. 15
    0
      MyPassionProjectClient/src/theme/variables.scss

BIN
.DS_Store View File


+ 13
- 1
.idea/workspace.xml View File 

@@ -1,7 +1,19 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 
-    <list default="true" id="e7490434-64fb-4385-9a0e-a04ccfae4c30" name="Default" comment="" />
4 
+    <list default="true" id="e7490434-64fb-4385-9a0e-a04ccfae4c30" name="Default" comment="">
5 
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/app/app.scss" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/app/app.scss" afterDir="false" />
7 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/components/popover/popover.html" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/components/popover/popover.html" afterDir="false" />
8 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/components/popover/popover.scss" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/components/popover/popover.scss" afterDir="false" />
9 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/friends/friends.html" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/friends/friends.html" afterDir="false" />
10 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/signup/signup.html" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/signup/signup.html" afterDir="false" />
11 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/signup/signup.scss" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/signup/signup.scss" afterDir="false" />
12 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/summary/summary.scss" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/summary/summary.scss" afterDir="false" />
13 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/welcome/welcome.html" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/welcome/welcome.html" afterDir="false" />
14 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/welcome/welcome.scss" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/pages/welcome/welcome.scss" afterDir="false" />
15 
+      <change beforePath="$PROJECT_DIR$/MyPassionProjectClient/src/theme/variables.scss" beforeDir="false" afterPath="$PROJECT_DIR$/MyPassionProjectClient/src/theme/variables.scss" afterDir="false" />
16 
+    </list>
5 17 
     <ignored path="$PROJECT_DIR$/target/" />
6 18 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7 19 
     <option name="TRACKING_ENABLED" value="true" />

+ 6
- 0
MyPassionProjectClient/src/app/app.scss View File 

@@ -14,3 +14,9 @@
14 14 
 // To declare rules for a specific mode, create a child rule
15 15 
 // for the .md, .ios, or .wp mode classes. The mode class is
16 16 
 // automatically applied to the <body> element in the app.
17 
+
18 
+.background{
19 
+    background-image: url('/assets/imgs/pawns.jpg');
20 
+    background-size: cover;
21 
+    background-position: center;
22 
+}

BIN
MyPassionProjectClient/src/assets/imgs/King.png View File


BIN
MyPassionProjectClient/src/assets/imgs/pawns.jpg View File


+ 16
- 12
MyPassionProjectClient/src/components/popover/popover.html View File 

@@ -1,12 +1,16 @@
1 
-<h2>
2 
-  <strong>{{game.name}}</strong>
3 
-</h2>
4 
-<img src={{game.thumbnail}}/>
5 
-<h6>
6 
-  <strong>Rating: </strong>{{game.averageRating}}<br/>
7 
-  <strong>Players: </strong>{{game.minPlayers}}-{{game.maxPlayers}}<br/>
8 
-  <strong>Mechanics: </strong> {{game.mechanics}}<br/>
9 
-</h6>
10 
-<p>
11 
-{{game.description}}
12 
-</p>
1 
+<ion-header>
2 
+  <ion-title> {{game.name}} </ion-title>
3 
+</ion-header>
4 
+
5 
+<ion-content padding>
6 
+  <div>
7 
+  <img src={{game.thumbnail}} align = center/>
8 
+  </div>
9 
+  <p>
10 
+    <strong>Rating: </strong>{{game.averageRating}}<br/>
11 
+    <strong>Players: </strong>{{game.minPlayers}}-{{game.maxPlayers}}<br/>
12 
+    {{game.mechanics}}<br/>
13 
+    {{game.description}}
14 
+  </p>
15 
+
16 
+</ion-content>

+ 0
- 1
MyPassionProjectClient/src/components/popover/popover.scss View File 

@@ -1,3 +1,2 @@
1 1 
 popover {
2 
-
3 2 
 }

+ 1
- 1
MyPassionProjectClient/src/pages/friends/friends.html View File 

@@ -18,7 +18,7 @@
18 18 
     <ion-item-sliding>
19 19 
       <ion-item>
20 20 
         <ion-thumbnail item-start>
21 
-          <img src="">
21 
+          <img src="/assets/imgs/King.png">
22 22 
         </ion-thumbnail>
23 23 
         <h2>SpiderMango</h2>
24 24 
         <p>Nafis has no Nafear</p>

+ 1
- 1
MyPassionProjectClient/src/pages/signup/signup.html View File 

@@ -7,7 +7,7 @@
7 7 
 </ion-header>
8 8
9 9
10 
-<ion-content>
10 
+<ion-content class = signup>
11 11 
   <form (submit)="createAccount()">
12 12 
     <ion-list>
13 13

+ 3
- 0
MyPassionProjectClient/src/pages/summary/summary.scss View File 

@@ -1,3 +1,6 @@
1 1 
 page-summary {
2 
+    $card-ios-header-color: #033b45;
3 
+    $card-wp-header-color: #033b45;
4 
+    $card-md-header-color: #033b45;
2 5
3 6 
 }

+ 3
- 3
MyPassionProjectClient/src/pages/welcome/welcome.html View File 

@@ -4,9 +4,9 @@
4 4 
   </ion-navbar>
5 5 
 </ion-header>
6 6
7 
-<ion-content padding>
8 
-  <button ion-button full (click)="doLogin()">Login</button>
9 
-  <button ion-button full (click)="doSignup()">Signup</button>
7 
+<ion-content padding class="background">
8 
+  <button ion-button block (click)="doLogin()">Login</button>
9 
+  <button ion-button block (click)="doSignup()">Signup</button>
10 10 
 </ion-content>
11 11
12 12 
 <!--<ion-content>-->

+ 3
- 1
MyPassionProjectClient/src/pages/welcome/welcome.scss View File 

@@ -1,3 +1,5 @@
1 1 
 page-welcome {
2 
-
2 
+    button{
3 
+        border-radius: 5px;
4 
+    }
3 5 
 }

+ 15
- 0
MyPassionProjectClient/src/theme/variables.scss View File 

@@ -86,3 +86,18 @@ $colors: (
86 86
87 87 
 @import "roboto";
88 88 
 @import "noto-sans";
89 
+
90 
+  $popover-md-width: 98%;
91 
+  $popover-ios-width: 98%;
92 
+  $popover-wp-width: 98%;
93 
+
94 
+  button {
95 
+    display: inline-block;
96 
+    padding: .938em 1.875em;
97 
+    border: .094em solid #743EA5;
98 
+    border-radius: .625em;
99 
+    color: #FFF;
100 
+    text-decoration: none;
101 
+    cursor:pointer;
102 
+    font: bold 1.8rem sans-serif;
103 
+  }