rcchung
/
Passion_Project
Прати 2
Волим 0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

updated styling

Rachelle пре 6 година
родитељ
7c08a72d57
комит
a25e43a6f9
9 измењених фајлова са 45 додато и 27 уклоњено
Подељен поглед Покажи статистику Diff
  1. 1
    13
      .idea/workspace.xml
  2. 16
    0
      MyPassionProjectClient/src/app/app.scss
  3. 1
    1
      MyPassionProjectClient/src/pages/game-search/game-search.html
  4. 5
    0
      MyPassionProjectClient/src/pages/game-search/game-search.scss
  5. 6
    1
      MyPassionProjectClient/src/pages/login/login.scss
  6. 6
    1
      MyPassionProjectClient/src/pages/signup/signup.scss
  7. 0
    4
      MyPassionProjectClient/src/pages/summary/summary.scss
  8. 5
    2
      MyPassionProjectClient/src/pages/welcome/welcome.scss
  9. 5
    5
      MyPassionProjectClient/src/theme/variables.scss

+ 1
- 13
.idea/workspace.xml Прегледај датотеку 

@@ -1,19 +1,7 @@
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="">
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>
4 
+    <list default="true" id="e7490434-64fb-4385-9a0e-a04ccfae4c30" name="Default" comment="" />
17 5 
     <ignored path="$PROJECT_DIR$/target/" />
18 6 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
19 7 
     <option name="TRACKING_ENABLED" value="true" />

+ 16
- 0
MyPassionProjectClient/src/app/app.scss Прегледај датотеку 

@@ -15,6 +15,22 @@
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 17
18 
+.toolbar-background{
19 
+    background-color: #ff798a;
20 
+}
21 
+
22 
+.toolbar-title{
23 
+    color: white;
24 
+}
25 
+
26 
+.back-button{
27 
+    color: white;
28 
+}
29 
+
30 
+.bar-buttons{
31 
+    color: white;
32 
+}
33 
+
18 34 
 .background{
19 35 
     background-image: url('/assets/imgs/pawns.jpg');
20 36 
     background-size: cover;

+ 1
- 1
MyPassionProjectClient/src/pages/game-search/game-search.html Прегледај датотеку 

@@ -26,7 +26,7 @@
26 26
27 27
28 28 
       <ion-item-options side="left">
29 
-        <button ion-button color="primary" (click)="doAddToOwnedAndPlayedList()">
29 
+        <button ion-button class=leftButton (click)="doAddToOwnedAndPlayedList()">
30 30 
           <ion-icon name="add"></ion-icon> Owned and Played
31 31 
         </button>
32 32 
       </ion-item-options>

+ 5
- 0
MyPassionProjectClient/src/pages/game-search/game-search.scss Прегледај датотеку 

@@ -1,3 +1,8 @@
1 1 
 page-game-search {
2 
+    leftButton{
3 
+        .button{
4 
+            color: #e2ceb3;
5 
+        }
6 
+    }
2 7
3 8 
 }

+ 6
- 1
MyPassionProjectClient/src/pages/login/login.scss Прегледај датотеку 

@@ -1,3 +1,8 @@
1 1 
 page-login {
2 
-
2 
+    .button{
3 
+        border-radius: 20px;
4 
+        font-size: 1.3em;
5 
+        background: #e2ceb3;
6 
+        color:white;
7 
+    }
3 8 
 }

+ 6
- 1
MyPassionProjectClient/src/pages/signup/signup.scss Прегледај датотеку 

@@ -1,3 +1,8 @@
1 1 
 page-signup {
2 
-
2 
+    .button{
3 
+        border-radius: 20px;
4 
+        font-size: 1.3em;
5 
+        background: #e2ceb3;
6 
+        color:white;
7 
+    }
3 8 
 }

+ 0
- 4
MyPassionProjectClient/src/pages/summary/summary.scss Прегледај датотеку 

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

+ 5
- 2
MyPassionProjectClient/src/pages/welcome/welcome.scss Прегледај датотеку 

@@ -1,5 +1,8 @@
1 1 
 page-welcome {
2 
-    button{
3 
-        border-radius: 5px;
2 
+    .button{
3 
+        border-radius: 20px;
4 
+        font-size: 1.3em;
5 
+        background: #e2ceb3;
6 
+        color:white;
4 7 
     }
5 8 
 }

+ 5
- 5
MyPassionProjectClient/src/theme/variables.scss Прегледај датотеку 

@@ -34,11 +34,11 @@ $app-direction: ltr;
34 34 
 // The "primary" color is the only required color in the map.
35 35
36 36 
 $colors: (
37 
-  primary:    #488aff,
38 
-  secondary:  #32db64,
39 
-  danger:     #f53d3d,
40 
-  light:      #f4f4f4,
41 
-  dark:       #222
37 
+  primary:    #df8f46,
38 
+  secondary:  #00939c,
39 
+  danger:     #e2ceb3,
40 
+  light:      #f8f9fd,
41 
+  dark:       #ff798a
42 42 
 );
43 43
44 44