megaMac il y a 5 ans
Parent
commit
060b53a33e

+ 19 - 58
package-lock.json

@@ -1561,7 +1561,6 @@
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
-      "optional": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -2812,8 +2811,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -3227,8 +3225,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "depd": {
       "version": "1.1.2",
@@ -4314,8 +4311,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4336,14 +4332,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4358,20 +4352,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4488,8 +4479,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4501,7 +4491,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4516,7 +4505,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4524,14 +4512,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4550,7 +4536,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4631,8 +4616,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4644,7 +4628,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4730,8 +4713,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4767,7 +4749,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4787,7 +4768,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4831,14 +4811,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4847,7 +4825,6 @@
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
@@ -4860,7 +4837,6 @@
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
-      "optional": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -4898,8 +4874,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "get-stream": {
       "version": "3.0.0",
@@ -5159,8 +5134,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "has-value": {
       "version": "1.0.0",
@@ -5931,8 +5905,7 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -6619,7 +6592,6 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
@@ -6632,8 +6604,7 @@
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -6907,8 +6878,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -7796,7 +7766,6 @@
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -8969,7 +8938,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
-      "optional": true,
       "requires": {
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
@@ -8981,7 +8949,6 @@
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "graceful-fs": "^4.1.2",
             "pify": "^2.0.0",
@@ -8992,8 +8959,7 @@
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -9002,7 +8968,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
@@ -9013,7 +8978,6 @@
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "path-exists": "^2.0.0",
             "pinkie-promise": "^2.0.0"
@@ -9024,7 +8988,6 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "pinkie-promise": "^2.0.0"
           }
@@ -10324,7 +10287,6 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-utf8": "^0.2.0"
       }
@@ -11676,7 +11638,6 @@
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
       }

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

@@ -24,26 +24,33 @@ input,button {
     bottom: 0;
     background-color: rgba(0, 0, 0, 0.7);
     z-index: 10;
-    padding-top: 20px;
+    padding-top: 6px;
     padding-bottom: 20px;
     color: #fff;
     text-align: center;
     right: 0;
     left: 0;
+	height: 90px;
+}
+.cslide{
+	    width: 75px;
+    height: 75px;
+    margin: 0px 16px;
+    overflow: hidden;
 }
-
 .sliderNews-w .carousel-caption .more {
-    width: 104px;
+    width: 107px;
     background-color: #dedede;
     border: 1px solid #dedede;
     color: #bea380;
     position: absolute;
     left: 10px;
-    bottom: 32px;
+    bottom: 53px;
     cursor: pointer;
     transition: all 0.5s;
-    font-size: 14px;
+    font-size: 13px;
     font-weight: bold;
+    padding: 4px 0px;
 }
 
 .sliderNews-w .carousel-caption .more:hover {
@@ -54,17 +61,35 @@ input,button {
 }
 
 .sliderNews-w .carousel-caption h5 {
-    color: #00a99d;
+       color: #00a99d;
+    /*border: 1px solid;*/
+    width: 60%;
+    height: 17px;
+    margin-right: auto;
+    margin-left: auto;
+    font-size: 15px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.sliderNews-w .carousel-caption p{
+	width: 60%;
+    margin-right: auto;
+    margin-left: auto;
+    height: 22px;
+    overflow: hidden;
+    font-size: 15px;
+	    text-overflow: ellipsis;
 }
-
 .eventPart-w,
 .eventPartEn-w {
     width: 100%;
-    height: 40px;
+    height: 34px;
     padding: 5px 0;
     background-color: #e5f7f6;
     margin: 10px 0;
     margin-top: 15px;
+	    overflow: hidden;
+    font-size: 14px;
 }
 
 
@@ -75,8 +100,8 @@ input,button {
 .carousel-indicators li {
     cursor: pointer;
     width: 25px;
-    height: 7px;
-    border-radius: 5px;
+    height: 4px;
+    border-radius: 0px;
     background-color: #fff;
 }
 
@@ -131,14 +156,19 @@ input,button {
     font-weight: bold;
 }
 .eventPart-w .moreEvent-w {
-    position: absolute;
+position: absolute;
     left: 10px;
-    background-color: transparent;
-    border: none;
+    /* background-color: transparent; */
+    border: 1px solid #c0a786;
     color: #1ba097;
-    top: 0;
+    top: 0px;
     cursor: pointer;
     font-weight: bold;
+    font-size: 13px;
+    border-radius: 2px;
+    background-color: #d5d6c7;
+    padding: 2px 13px;
+	z-index: 2;
 }
 
 .eventPartEn-w .moreEventEn-w {
@@ -163,22 +193,24 @@ input,button {
 
 .externalServices-w .item {
     width: 100%;
-    height: 150px;
-    /* radial-gradient(0.5turn,#efeeee, #1db5ab, #1ba097); */
-    background: radial-gradient(farthest-corner at 129px 53px,   #4bcec7 0%, #00a99d 100%);
+    height: 100px;
+    background: radial-gradient(farthest-corner at 129px 53px, #50cec6 0%, #1b948b 100%);
     margin: 10px 0;
     transition: all 0.5s;
+	    border-image: linear-gradient(to right, #bb9e77, #e0d0bad6) 0 1 100%;
+    border-width: 0px 0px 4px 0px;
+    border-style: solid;
 }
 
 .externalServices-w .item:hover{
-    background: radial-gradient(farthest-corner at 129px 53px,     #c4d8d7 0%, #00a99d 100%);
+    background: radial-gradient(farthest-corner at 129px 53px,     #10cec4 0%, #01867d 100%);
 }
 
 .externalServices-w .item img {
-    width: 50px;
-    height: 50px;
+    width: 40px;
+    height: 40px;
     margin: 10px 0;
-    margin-top: 30px;
+    margin-top: 13px;
 }
 
 
@@ -186,7 +218,7 @@ input,button {
 .externalServices-w .item p {
     color: #fff;
     font-size: 16px;
-    margin: 10px 0;
+    margin: 3px 0;
 }
 
 .lectureService-w {
@@ -202,7 +234,7 @@ input,button {
 
 .lectureService-w .advertisimentServices-w h1 {
     font-size: 18px;
-    background-color: #1ba097;
+    background-color: #08ada2;
     color: #fff;
     padding: 12px 0;
     margin: 0;
@@ -251,7 +283,7 @@ input,button {
 
 .lectureService-w .visitingTime-w h1 {
     font-size: 18px;
-    background-color: #1ba097;
+    background-color: #08ada2;
     color: #fff;
     padding: 12px 0;
     margin: 0;
@@ -271,7 +303,7 @@ input,button {
 
 .lectureService-w .visitingTime-w .monthRecord-w .body ul li {
     display: inline-block;
-    margin: 0 40px;
+    margin: 0 39px;
     margin-top: 25px;
     position: relative;
 }
@@ -294,7 +326,7 @@ input,button {
 
 .lectureService-w .visitingTime-w .achiev .body ul li {
     display: inline-block;
-    margin: 0 40px;
+    margin: 0 39px;
     margin-top: 25px;
     position: relative;
 }
@@ -326,7 +358,7 @@ input,button {
 
 .externalPageContentt-w .recordsContent-w h1 {
     font-size: 18px;
-    background-color: #1ba097;
+    background-color: #08ada2;
     color: #fff;
     padding: 12px 0;
     margin: 0;
@@ -472,7 +504,7 @@ input,button {
 
 .externalPageContentt-w .datePicker-w h1 {
     font-size: 18px;
-    background-color: #1ba097;
+    background-color: #08ada2;
     color: #fff;
     padding: 12px 0;
     margin: 0;
@@ -492,7 +524,7 @@ input,button {
 
 .maps h1 {
     font-size: 18px;
-    background-color: #1ba097;
+    background-color: #08ada2;
     color: #fff;
     padding: 12px 0;
     margin: 0;
@@ -580,27 +612,33 @@ input,button {
     }
     
     .lectureService-w #carouselExample .carousel-inner .carousel-item img {
-        height: 70px !important;
+       /* height: 70px !important;*/
         border: 2px solid #007A71;
+		    width: 100%;
+    min-height: 100%;
     }
 
     .lectureService-w #carouselExample2 .carousel-inner .carousel-item img {
-        height: 70px !important;
+       /* height: 70px !important;*/
         border: 2px solid #007A71;
+		    width: 100%;
+    min-height: 100%;
     }
   
 
     .moreNews {
-        border: none;
-        position: absolute;
-        left: 10px;
-        bottom: 5px;
-        background: #c0a786;
-        color: #fff;
-        font-size: 14px;
-        transition: all 0.5s;
-        cursor: pointer;
-        font-weight: bold;
+    border: none;
+    position: absolute;
+    left: 10px;
+    bottom: 19px;
+    background: #c0a786;
+    color: #fff;
+    font-size: 13px;
+    transition: all 0.5s;
+    cursor: pointer;
+    font-weight: bold;
+    width: 107px;
+    padding: 5px 0px;
     }
 
     .moreNews:hover {

+ 11 - 7
src/app/External-Page/external-page-content/external-page-content.component.html

@@ -13,7 +13,7 @@
                     <div class="carousel-inner">
                         <div class="carousel-item" *ngFor="let report of reports; let i = index" [ngClass]="i == 0 ? 'active' : ''">
                           <img src="{{authSer.pathImg + report['photo'].photo}}" />
-                          <div class="carousel-caption d-none d-md-block">
+                          <div class="carousel-caption d-md-block">
                               <h5>{{report.title}}</h5>
                               <p [innerHtml] = "report.description"></p>
                               <button class="more hvr-grow" (click)="goPageNew(report)">تفاصيل الخبر</button>
@@ -43,7 +43,7 @@
               <div class="col-12">
                 <div class="externalServices-w">
                   <div class="row">
-                    <div class="col-6 col-sm-6 col-md-3 col-lg-3" *ngFor="let service of services; let i = index">
+                    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12" *ngFor="let service of services; let i = index">
                       <div class="animated" style="position:relative">
                         <a (click)="onGetService(service)">
                             <div class="item text-center">
@@ -65,13 +65,13 @@
                 <div class="lectureService-w">
                   <div class="row">
                     
-                    <div class="col-12 col-sm-12 col-md-4 col-lg-4 hidden-xs">
+                    <div class="col-12 col-sm-12 col-md-4 col-lg-4 "><!-- hidden-xs -->
                       <div class="advertisimentServices-w text-center">
                         <h1>خدمات إعلانيه</h1>
                         <div class="body">
                           <div id="carouselExample" class="carousel slide" data-ride="carousel" data-interval="9000">
                             <div class="carousel-inner row w-100 mx-auto" role="listbox">
-                                <div class="carousel-item col-md-4" *ngFor="let image of firstAdvertisiment;let i = index" [ngClass]="i == 0 ? 'active' : '' ">
+                                <div class="carousel-item cslide" *ngFor="let image of firstAdvertisiment;let i = index" [ngClass]="i == 0 ? 'active' : '' ">
                                     <img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + image.photo}}" alt="slide 1">
                                 </div>
                             </div>
@@ -87,7 +87,7 @@
   
                           <div id="carouselExample2" class="carousel slide" data-ride="carousel" data-interval="9000">
                             <div class="carousel-inner row w-100 mx-auto" role="listbox">
-                              <div class="carousel-item col-md-4" *ngFor="let slide2 of secondAdvertisiment;let i = index" [ngClass]=" i == 0 ? 'active' : '' ">
+                              <div class="carousel-item cslide" *ngFor="let slide2 of secondAdvertisiment;let i = index" [ngClass]=" i == 0 ? 'active' : '' ">
                                   <img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + slide2.photo}}" alt="slide 1">
                               </div>
                             </div>
@@ -116,6 +116,7 @@
                               <div class="body">
                                 <ul class="list-unstyled">
                                   <li><img src="../../../assets/image/Path 82.png" /><span style="color:green">{{hypnosisSections.open_time}}</span></li>
+									<i class="fa fa-chevron-left fa-lg text-muted"></i>
                                   <li><img src="../../../assets/image/Path 82.png" /><span style="color:red">{{hypnosisSections.close_time}}</span></li>
                                 </ul>
                               </div>
@@ -127,6 +128,7 @@
                               <div class="body">
                                 <ul class="list-unstyled">
                                   <li><img src="../../../assets/image/Path 82.png" /><span style="color:green">{{intensiveCare.open_time}}</span></li>
+									<i class="fa fa-chevron-left fa-lg text-muted"></i>
                                   <li><img src="../../../assets/image/Path 82.png" /><span style="color:red">{{intensiveCare.close_time}}</span></li>
                                 </ul>
                               </div>
@@ -231,7 +233,7 @@
                   <div class="carousel-inner">
                       <div class="carousel-item" *ngFor="let report of reports; let i = index" [ngClass]="i == 0 ? 'active' : ''">
                         <img src="{{authSer.pathImg + report['photo'].photo}}" />
-                        <div class="carousel-caption d-none d-md-block">
+                        <div class="carousel-caption d-md-block">
                             <h5>{{report.title_en}}</h5>
                             <p [innerHtml] = "report.description_en"></p>
                             <button class="more hvr-grow" (click)="goPageNew(report)" style="left:10px;">Read More</button>
@@ -260,7 +262,7 @@
           <div class="col-12">
             <div class="externalServices-w">
               <div class="row">
-                <div class="col-6 col-sm-6 col-md-3 col-lg-3" *ngFor="let service of services; let i = index">
+                <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12" *ngFor="let service of services; let i = index">
                   <a href="{{service.link}}">
                     <div class="item text-center">
                       <img src="{{authSer.pathImg + service.photo}}" />
@@ -325,6 +327,7 @@
                             <div class="body">
                               <ul class="list-unstyled">
                                 <li><img src="../../../assets/image/Path 82.png" /><span style="color:green">{{hypnosisSections.open_time}}</span></li>
+								  <i class="fa fa-chevron-right fa-lg text-muted"></i>
                                 <li><img src="../../../assets/image/Path 82.png" /><span style="color:red">{{hypnosisSections.close_time}}</span></li>
                               </ul>
                             </div>
@@ -336,6 +339,7 @@
                             <div class="body">
                               <ul class="list-unstyled">
                                 <li><img src="../../../assets/image/Path 82.png" /><span style="color:green">{{intensiveCare.open_time}}</span></li>
+								  <i class="fa fa-chevron-right fa-lg text-muted"></i>
                                 <li><img src="../../../assets/image/Path 82.png" /><span style="color:red">{{intensiveCare.close_time}}</span></li>
                               </ul>
                             </div>

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

@@ -55,11 +55,10 @@ input,button {
     background-color: #f1f1f1;
 }
 
-.externalPage-w {
+.externalPage-w { /* <— eng mega Edit */
     width: 100%;
-    height: 45px;
-    
-    background: #D9D9D9
+    height: 36px;
+    background: #0000004d;
 
     /* background: url('../../../assets/image/XMLID_19_.png') no-repeat center center;
     background-size: cover; */
@@ -72,7 +71,7 @@ input,button {
 }
 
 .externalPage-w .login  {
-    color: #00a99d;
+    color: #ffffff;
     text-align: right;
     padding: 0 40px;
     margin: 7px 0;
@@ -117,14 +116,14 @@ input,button {
     background-color: transparent;
 }
 
-.externalPage-w input[type='text'] {
+.externalPage-w input[type='text'] {/* <— eng mega Edit */
     background-color: #fff;
     border: none;
     color: #00A99D !important;
     padding: 0 5px;
-    height: 35px;
+    height: 30px;
     width: 260px;
-    margin-top: 4px;
+    margin-top: 3px;
     transition: all 0.5s;
     border: 1px solid #00A99D !important;
 }
@@ -133,13 +132,13 @@ input,button {
     border: 2px solid #00a99d;
 }
 
-.externalPage-w .searchBtn {
+.externalPage-w .searchBtn {/* <— eng mega Edit */
     background-color: #fff;
     border: none;
-    height: 35px;
-    padding: 0 10px;
+    height: 30px;
+    padding: 0 12px;
     border: 1px solid #00a99d !important;
-    margin: 4px 10px;
+    margin: 3px 6px;
 }
 
 .externalPage-w .searchBtn i{
@@ -184,9 +183,9 @@ input,button {
 
 .logoHeader-w {
     width: 100%;
-    height: 160px;
+    height: 100px;
     display: inline-block;
-    background: url('../../../assets/image/bottomBackground.jpg');
+    /*background: url('../../../assets/image/bottomBackground.jpg');*/
     background-size: cover;
 }
 
@@ -195,7 +194,7 @@ input,button {
 .logoHeader-w .center {
     width: 100%;
     display: inline-block;
-    margin-top: 20px;
+    margin-top: 0px;
 }
 
 .logoHeader-w .leftLogo-w {
@@ -237,7 +236,7 @@ input,button {
 
 .pagesHeader-w {
     width: 100%;
-    background: rgba(94, 204, 196, 0.5) !important;
+    background: rgba(204, 204, 204, 0.46) !important;
     margin-top: -6px;
     position: relative;
     height: 50px;
@@ -489,13 +488,13 @@ input,button {
 
   .menuHeader-w {
       margin: 0 auto;
-      height: 70px;
+      height: 50px;
   }
 
   .menuHeaderEn-w {
       margin: 0 auto;
       direction: ltr;
-      height: 70px;
+      height: 50px;
   }
 
   .menuHeaderEn-w li a {
@@ -503,7 +502,7 @@ input,button {
       font-size: 20px;
       border: none;
       outline: none;
-      color: #078c82;
+      color: #31aca3; /*#078c82;*/
       background-color: inherit;
       font: inherit;
       margin: 0;
@@ -531,6 +530,7 @@ input,button {
       margin: 0 5px;
       float: right;
       margin-top: 9px;
+	      filter: invert(45%);
   }
 
   .menuHeaderEn-w li img {
@@ -540,7 +540,7 @@ input,button {
   }
 
   .menuHeaderEn-w li, .menuHeader-w li {
-    padding: 10px 10px;
+    padding: 0px 10px;
     transition: all 0.5s;
   }
 
@@ -564,7 +564,7 @@ input,button {
 
 
   .buttonMobileHeader-w {
-      margin: 15px;
+      margin: 5px;
   }
 
 @media(max-width: 767px) {
@@ -590,7 +590,7 @@ input,button {
     .externalPage-w .searchBtn {
         background-color: #fff;
         border: none;
-        height: 35px;
+        height: 30px;
         margin-left: 40px;
     }
 
@@ -600,7 +600,7 @@ input,button {
 
     .externalPage-w .login {
         margin-top: 8px;
-        color: #00a99d;
+        color: #ffffff;
         cursor: pointer;
         text-align: right;
         padding: 0 9px;

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

@@ -99,7 +99,7 @@
                             <ul class="navbar-nav mr-auto menuHeader-w">
                                 <li class="nav-item homeLinkMobile-w" (click)="goToHome()" style="cursor: pointer;" [ngClass]="{'homeExternalActive': authSer.homeActivate}"> 
                                     <a class="nav-link">
-                                        <i class="fa fa-home" style="font-size: 30px;margin:-7px 5px; color:#bda380"></i> الرئيسيه
+                                        <i class="fa fa-home" style="font-size: 30px;margin:-7px 5px; color:#85837f"></i> الرئيسيه
                                     </a>
                                 </li>
 
@@ -224,7 +224,7 @@
                             <ul class="navbar-nav mr-auto menuHeaderEn-w">
                                 <li class="nav-item" (click)="goToHome()" style="cursor: pointer;" [ngClass]="{'homeExternalActive': authSer.homeActivate}"> 
                                     <a class="nav-link">
-                                        <i class="fa fa-home" style="font-size: 35px;margin:0 5px; margin-top:-16px; color:#bda380"></i> Home
+                                        <i class="fa fa-home" style="font-size: 35px;margin:0 5px; margin-top:-16px; color:#85837f"></i> Home
                                     </a>
                                 </li>
                                 <li class="nav-item" *ngFor="let menu of externalService.headerMenus" style="position: relative;" [ngClass]="menu.active == 0 ? '' : 'activeExternalLink' ">

+ 14 - 8
src/app/Internal-Page/internal-page-header/internal-page-header.component.css

@@ -43,7 +43,7 @@ input,button {
 
 .internalHeader-w {
     width: 100%;
-    height: 35px;
+    height: 36px;
     background: rgba(185, 183, 183, 0.8);
 
     /* background: url('../../../assets/image/XMLID_19_.png') no-repeat center center;
@@ -57,7 +57,7 @@ input,button {
 }
 
 .internalHeader-w .login  {
-    color: #00a99d;
+    color: #ffffff;
     text-align: right;
     padding: 0 40px;
     margin: 5px 0;
@@ -108,7 +108,7 @@ input,button {
     color: #888;
     padding: 0 5px;
     height: 30px;
-    margin-top: 2px;
+    margin-top: 3px;
     transition: all 0.5s;
 }
 
@@ -117,10 +117,16 @@ input,button {
 }
 
 .internalHeader-w .searchBtn {
+       background-color: #fff;
+    border: none;
+    height: 30px;
+    margin-top: 3px;
     background-color: #fff;
     border: none;
     height: 30px;
-    margin-top: 2px;
+    padding: 0 12px;
+    margin: 3px 6px;
+    border: 1px solid #BDA380;
 }
 
 .profileData-w img {
@@ -160,9 +166,9 @@ input,button {
 
 .logoHeader-w {
     width: 100%;
-    height: 160px;
+    height: 100px;
     display: inline-block;
-    background: url('../../../assets/image/bottomBackground.jpg');
+  /*  background: url('../../../assets/image/bottomBackground.jpg');*/
     background-size: cover;
 }
 
@@ -171,7 +177,7 @@ input,button {
 .logoHeader-w .center {
     width: 100%;
     display: inline-block;
-    margin-top: 20px;
+    margin-top: 0px;
 }
 
 .logoHeader-w .rightLogo-w {
@@ -253,7 +259,7 @@ input,button {
     border: none;
     outline: none;
     color: #078c82;
-    padding: 14px 5px;
+    padding: 0px 5px;
     background-color: inherit;
     font: inherit;
     margin: 0;

BIN
src/assets/image/1551006917.png


BIN
src/assets/image/1551021066.png


BIN
src/assets/image/1551021147.png


BIN
src/assets/image/1551021182.png


BIN
src/assets/image/externalFooter2.png


+ 89 - 20
src/styles.css

@@ -632,6 +632,7 @@ width: 100%;
 
 .externalEventContent-w .cal-month-view .cal-cell-top {
   min-height: 50px !important;
+	    width: 27px;
 }
 
 .externalEventContent-w .cal-events {
@@ -749,7 +750,7 @@ width: 100%;
   /* Eng Magdy Style */
   .internalHeader-w{
     padding-top: 7px;
-    height: 55px !important;
+    height: 36px !important;
 background-color:#a1a1a15e !important; 
 }
 .routerLinkContainer-w {
@@ -768,19 +769,19 @@ color: #BDA380;
 }
 .internalHeader-w .searchBtn{
 
-    height: 35px !important;
+   /* height: 35px !important;
 width: 55px !important;
 border: 1px solid #BDA380 !important;
-    margin-right: 10px;
+    margin-right: 10px;*/
 }
 .pagesHeader-w{
     margin-top: 0px !important;
 background-color: #926f3f2e !important;
-height: 70px !important;
+height: 50px !important;
 	display: block;
 }
 .pagesHeader-w .navbar{
-height: 70px !important;
+height: 50px !important;
 }
 .pagesHeader-w .dropdown .dropbtn{
 margin: 0 4px !important;
@@ -799,7 +800,7 @@ box-shadow: 0px 5px 10px #00000026 !important;
 
 .internalHeader-w input[type='text']{
 width: 285px;
-height: 35px !important;
+height: 30px !important;
 border: 1px solid #BDA380 !important;
 }
 .searchBtn i{
@@ -808,15 +809,15 @@ border: 1px solid #BDA380 !important;
 .dateW{
 text-shadow: 0px 0px 0px #fff0 !important;
 }
-.ar, .en{
-height: 35px !important;
-width: 55px !important;
-text-align: center;
-background-color: #f1eded !important;
-padding-top: 4px !important;
+.ar, .en{ /* <— eng mega Edit */
+    height: 30px !important;
+    width: 46px !important;
+    text-align: center;
+    background-color: #f1eded !important;
+    padding-top: 1px !important;
 }
 .logoHeader-w{
-background-image: url('../src/assets/image/bottomBackground.jpg') !important;
+/*background-image: url('../src/assets/image/bottomBackground.jpg') !important;*/
 }
 .en:hover{
     background-color: #c3a58161 !important;
@@ -1093,7 +1094,7 @@ height: 7px !important;
   }
 
   .homeExternalActive {
-    background-color: #007A71 !important;
+    background-color: #31aca3 !important;
     color: #fff !important;
   }
 
@@ -1108,7 +1109,17 @@ height: 7px !important;
 	.carousel-caption h4, .paragraphTemplate-w {
 		width: 60% !important;
   }
-  
+	.lectureService-w .visitingTime-w .achiev .body ul li{
+		    margin: 0px 19px !important;
+	}
+	.lectureService-w .visitingTime-w .monthRecord-w .body ul li{
+		 margin: 0px 19px !important;
+	}
+  .cslide{
+	    width: 70px !important;
+    height: 70px !important;
+    margin: 0px 5px !important;
+}
   .homeActive {
     background-color: #a2835d !important;
     color: #fff !important;
@@ -1139,11 +1150,28 @@ height: 7px !important;
 		bottom: 90px !important;
 		    display: block !important;
 	}
+	.cslide{
+	    width: 50px !important;
+    height: 50px !important;
+    margin: 0px 2px !important;
+}
 	.slider .extra{
 		    bottom: 119px !important;
 		    width: 94% !important;
 		    display: block !important;
 	}
+	.lectureService-w .visitingTime-w .achiev .body ul li{
+		    margin: 0px 10px !important;
+	}
+	.lectureService-w .visitingTime-w .monthRecord-w .body ul li{
+		 margin: 0px 10px !important;
+	}
+	.lectureService-w .visitingTime-w .achiev .body ul li img{
+		    width: 59px !important;
+	}
+	.lectureService-w .visitingTime-w .monthRecord-w .body ul li img{
+		 width: 59px !important;
+	}
 	.serviceItem-w{
 		    height: 65px !important;
 		border-bottom: 3px solid #00a99d !important;
@@ -1209,11 +1237,29 @@ height: 7px !important;
 		bottom: 90px !important;
 		    display: block !important;
 	}
+		.lectureService-w .visitingTime-w .achiev .body ul li{
+		    margin: 0px 60px !important;
+	}
+	.lectureService-w .visitingTime-w .monthRecord-w .body ul li{
+		 margin: 0px 60px !important;
+	}
+	.cslide{
+	    width: 80px !important;
+    height: 80px !important;
+    margin: 0px 25px !important;
+}
 	.slider .extra{
 		    bottom: 119px !important;
 		    width: 94% !important;
 		    display: block !important;
 	}
+	.sliderNews-w .carousel-caption h5{
+		    width: 45%;
+    	height: 66px;
+	}
+	.sliderNews-w .carousel-caption p{
+		display: none;
+	}
 		.pagesHeader-w .dropdown .dropbtn, .pagesHeader-w .dropdown .dropbtn a{
 	font-size: 18px !important;
     padding: 5px 5px !important;
@@ -1260,7 +1306,23 @@ height: 7px !important;
 		    width: 94% !important;
 		    display: block !important;
 	}
-	
+	.cslide{
+	    width: 70px !important;
+    height: 70px !important;
+    margin: 0px 3px !important;
+}
+		.lectureService-w .visitingTime-w .achiev .body ul li{
+		    margin: 0px 17px !important;
+	}
+	.lectureService-w .visitingTime-w .monthRecord-w .body ul li{
+		 margin: 0px 17px !important;
+	}
+	.sliderNews-w .carousel-caption h5{
+		   display: none;
+	}
+	.sliderNews-w .carousel-caption p{
+		display: none;
+	}
 		.serviceItem-w{
 		    height: 40px !important;
 		border-bottom: 2px solid #00a99d !important;
@@ -1417,10 +1479,11 @@ height: 7px !important;
 
     .externalFooterBackground-w{
      width: 100%;
+	background-color: #05c3b4;
     }
 
     .externalFooterBackground-w .overlayFooter-w {
-      background: url('../src/assets/image/externalFooter.png') no-repeat center center !important;
+      background: url('../src/assets/image/externalFooter2.png') no-repeat center center !important;
       background-size: cover;
       position: initial !important;
     }
@@ -1473,15 +1536,21 @@ height: 7px !important;
 
 
   /* Eng Magdy Style */
+.carousel-indicators li{
+	    width: 25px !important;
+    height: 4px !important;
+	border-radius: 0px !important;
+}
   .internalHeader-w{
-    padding-top: 7px;
-    height: 55px !important;
-background-color:#a1a1a15e !important; 
+    padding-top: 0px;
+    height: 36px !important;
+background-color:#0000004d !important; 
 }
 .routerLinkContainer-w {
   background: url('../src/assets/image/background_login.jpg') no-repeat top center !important;
   background-size: auto !important;
   background-attachment: fixed !important;
+	    background-position-y: -131px !important;
 }
 .internalHeader-w[_ngcontent-c6] input[type='text'][_ngcontent-c6]::placeholder{
 color: #BDA380;