Merge branch 'development' of https://github.com/COS301-SE-2023/xPOSE …

…into development
COS301-SE-2023 · Oct 16, 2023 · f5d5dee · f5d5dee
2 parents a426e46 + 842dc1f
commit f5d5dee
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/frontend/angular/xpose/src/app/create-event/create-event.page.scss b/frontend/angular/xpose/src/app/create-event/create-event.page.scss
@@ -44,15 +44,23 @@ label {
 }
 
 ion-input, ion-textarea {
-  border: 1px solid hsl(304, 49%, 82%);
-  border-radius: 8px;
-  padding: 12px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  padding: 10px;
   width: 100%;
-  color: #000000;
+  color: #000;
   font-weight: normal;
-  margin-top: 2px;
-  margin-bottom: 20px;
+  margin-top: 5px;
+  margin-bottom: 10px;
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1);
+  background-color: #ccc;
+  outline: none; /* Remove the focus outline */
+}
+
+
+ion-input::selection, ion-textarea::selection {
+  background-color: #eb0091;
+  color: #eb0091;
 }
 
 ion-radio {

diff --git a/frontend/angular/xpose/src/app/edit/edit.page.scss b/frontend/angular/xpose/src/app/edit/edit.page.scss
@@ -151,7 +151,7 @@ ion-content {
   background-color: #0056b3;
 }
 .name-section{
-  margin-top: 90px;
+  margin-top: 90px; 
 }
 
 /* Profile picture */
@@ -164,4 +164,7 @@ ion-content {
   border: 2px solid #ccc;
   display: block;
   margin: 0 auto 16px;
+}
+input{
+  background-color: #0056b3;
 }
diff --git a/frontend/angular/xpose/src/app/event/event.page.html b/frontend/angular/xpose/src/app/event/event.page.html
@@ -52,7 +52,7 @@
             <ion-img [src]="generateAvatar(message.photoURL)" loading="lazy"></ion-img>
           </ion-avatar>
           <ion-label class="chat-content">
-            <h2 class="chat-name">{{ message.displayName }} <b>{{ toDate(message.timestamp) }}</b></h2>
+            <h2 class="chat-name">{{ message.displayName }} <p>{{ toDate(message.timestamp) }}</p></h2>
             <p class="chat-message">{{ message.message }}</p>
             <!-- <span class="chat-timestamp">{{ message.timestamp | date:'shortTime' }}</span> -->
           </ion-label>
@@ -127,7 +127,7 @@ <h1 class="section-title">Participants</h1>
                 {{ participant.display_name }} <b>@{{ participant.uniq_username }}</b>
 
               </p>
-              <p class="participant-email"> <b *ngIf="participant.location">{{ participant.location }} </b></p>
+              <!-- <p class ="participant-email"> <b *ngIf="participant.location">{{ participant.location }} </b></p> -->
             </ion-label>
           </ion-item>
 

diff --git a/frontend/angular/xpose/src/app/home/home.page.scss b/frontend/angular/xpose/src/app/home/home.page.scss
@@ -12,7 +12,7 @@ ion-card {
   border: 1px solid #d1d1d1;
   border-radius: 10px;
   overflow: hidden;
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 6px #00000075;
   transition: transform 0.3s ease, box-shadow 0.3s ease;
   cursor: pointer;
 }