Hima 6 年之前
父節點
當前提交
de515c75d6

+ 9 - 9
src/app/External-Page/external-page-content/external-page-content.component.css

@@ -34,10 +34,9 @@ input,button {
 
 .sliderNews-w .carousel-caption .more {
     width: 90px;
-    padding: 5px;
+    padding: 2px;
     background-color: #00a99d;
     border: 1px solid #00a99d;
-    border-radius: 5px;
     color: #fff;
     position: absolute;
     left: 10px;
@@ -60,10 +59,11 @@ input,button {
 .eventPart-w,
 .eventPartEn-w {
     width: 100%;
-    height: 40px;
-    padding: 5px 0;
-    background-color: #e5f7f6;
-    margin: 10px 0;
+    height: 50px;
+    padding: 12px 0;
+    background-color: #EEF8F7;
+    margin: 15px 0;
+    border-radius: 5px;
 }
 
 
@@ -104,7 +104,7 @@ input,button {
 .eventPart-w .carousel-caption p,
 .eventPartEn-w .carousel-caption p {
     margin-left: 10px;
-    color: #8e8d8d;
+    color: #b9b7b7;
 }
 
 .eventPart-w .carousel-caption p img {
@@ -134,7 +134,7 @@ input,button {
     left: 10px;
     background-color: transparent;
     border: none;
-    color: #1ba097;
+    color: #23cabe;
     top: 0;
     cursor: pointer;
     font-weight: bold;
@@ -145,7 +145,7 @@ input,button {
     right: 10px;
     background-color: transparent;
     border: none;
-    color: #1ba097;
+    color: #23cabe;
     top: 0;
     cursor: pointer;
     font-weight: bold;

+ 21 - 12
src/app/External-Page/external-page-header/external-page-header.component.css

@@ -58,8 +58,7 @@ input,button {
 .externalPage-w {
     width: 100%;
     height: 45px;
-    
-    background: #D9D9D9
+    background: rgb(217, 217, 217,0.7) !important
 
     /* background: url('../../../assets/image/XMLID_19_.png') no-repeat center center;
     background-size: cover; */
@@ -236,7 +235,7 @@ input,button {
 
 .pagesHeader-w {
     width: 100%;
-    background: rgba(94, 204, 196, 0.5) !important;
+    background:  rgb(0, 221, 188,0.5) !important;
     margin-top: -6px;
     position: relative;
     height: 50px;
@@ -494,14 +493,32 @@ input,button {
       margin: 0 auto;
       direction: ltr;
   }
+  
+
 
   .menuHeaderEn-w li a {
       float: left;
       margin: 0 15px;
+      transition: all 0.5s;
+      background-color: #02635c;
+      color: #fff;
+      margin-top: -2px;
+      height: 49px;
+  }
+
+
+  .menuHeader-w li a:hover{
+      background-color: #1dc1b5;
+      color: #fff;
   }
 
+  
+
   .menuHeader-w li a {
       font-size: 18px;
+      color: #fff;
+      margin-top: -2px;
+      height: 49px;
   }
 
   .menuHeader-w li a img {
@@ -623,15 +640,7 @@ input,button {
         direction: ltr;
     }
 
-    .menuHeader-w li {
-        border: 1px solid #fff;
-    }
-
-    .menuHeader-w li a {
-        font-size: 18px;
-        float: right;
-        margin: 0 10px;
-    }
+   
 
     
 

+ 0 - 1
src/app/External-Page/external-page-header/external-page-header.component.html

@@ -89,7 +89,6 @@
             <div class="row">
                 <div class="navbar" style="padding:0">
                     <nav class="navbar navbar-expand-lg navbar-light bg-light">
-                        
                         <!-- <a class="navbar-brand" href="#">Navbar</a> -->
                         <button class="navbar-toggler buttonMobileHeader-w" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                             <span class="navbar-toggler-icon"></span>

+ 1 - 1
src/app/app-routing.module.ts

@@ -9,7 +9,7 @@ import { ServicesComponent } from './servicesItems/services.component';
 
 
 const routes: Routes = [
-  {path: '', redirectTo: '/login', pathMatch: 'full'},
+  {path: '', redirectTo: '/InternalPage/home', pathMatch: 'full'},
   {path: 'login', component: LoginComponent},
   {path: 'signup', component: RegesterComponent},
   {path: 'services/:id', component: ServicesComponent, canActivate: [AuthGuard]},

+ 1 - 1
src/app/shared/auth-guard.service.ts

@@ -11,7 +11,7 @@ export class AuthGuardService {
   constructor(public auth: AuthServiceService, public router: Router) {}
   canActivate(): boolean {
     if (this.auth.isAuthenticated()) {
-      this.router.navigate(['/login']);
+      this.router.navigate(['/InternalPage/home']);
       return false;
     }
     return true;