Merge branch 'merge_haron' into 'master'

Merge haroon See merge request Cloud_Solution/diplomatic-quarter!4
4 years ago · b2b6ce1f76
parent d02151bea8 b2875fbce3
commit b2b6ce1f76
235 changed files with 7587 additions and 14 deletions
--- a/assets/images/new-design/BMR_calculator.png
+++ b/assets/images/new-design/BMR_calculator.png
--- a/assets/images/new-design/Complaint_icon.png
+++ b/assets/images/new-design/Complaint_icon.png
--- a/assets/images/new-design/active_medications.png
+++ b/assets/images/new-design/active_medications.png
--- a/assets/images/new-design/add_user_icon.png
+++ b/assets/images/new-design/add_user_icon.png
--- a/assets/images/new-design/advance_payment.png
+++ b/assets/images/new-design/advance_payment.png
--- a/assets/images/new-design/alert-triangle.png
+++ b/assets/images/new-design/alert-triangle.png
--- a/assets/images/new-design/alert_top-bar_icon.png
+++ b/assets/images/new-design/alert_top-bar_icon.png
--- a/assets/images/new-design/alert_top-bar_icon_red.png
+++ b/assets/images/new-design/alert_top-bar_icon_red.png
--- a/assets/images/new-design/ambulance.png
+++ b/assets/images/new-design/ambulance.png
--- a/assets/images/new-design/appointment_booking.png
+++ b/assets/images/new-design/appointment_booking.png
--- a/assets/images/new-design/appointment_info.png
+++ b/assets/images/new-design/appointment_info.png
--- a/assets/images/new-design/arrow_black.png
+++ b/assets/images/new-design/arrow_black.png
--- a/assets/images/new-design/arrow_menu_black-ar.png
+++ b/assets/images/new-design/arrow_menu_black-ar.png
--- a/assets/images/new-design/arrow_menu_black-en.png
+++ b/assets/images/new-design/arrow_menu_black-en.png
--- a/assets/images/new-design/arrow_menu_red.png
+++ b/assets/images/new-design/arrow_menu_red.png
--- a/assets/images/new-design/arrow_white.png
+++ b/assets/images/new-design/arrow_white.png
--- a/assets/images/new-design/ask_doctor_icon.png
+++ b/assets/images/new-design/ask_doctor_icon.png
--- a/assets/images/new-design/attach-prescription.png
+++ b/assets/images/new-design/attach-prescription.png
--- a/assets/images/new-design/available_vaccines_to_bar.png
+++ b/assets/images/new-design/available_vaccines_to_bar.png
--- a/assets/images/new-design/awesome-plus.png
+++ b/assets/images/new-design/awesome-plus.png
--- a/assets/images/new-design/awesome-star.png
+++ b/assets/images/new-design/awesome-star.png
--- a/assets/images/new-design/blood_cholesterol_icon.png
+++ b/assets/images/new-design/blood_cholesterol_icon.png
--- a/assets/images/new-design/blood_icon.png
+++ b/assets/images/new-design/blood_icon.png
--- a/assets/images/new-design/blood_pressure_icon.png
+++ b/assets/images/new-design/blood_pressure_icon.png
--- a/assets/images/new-design/blood_sugar_icon.png
+++ b/assets/images/new-design/blood_sugar_icon.png
--- a/assets/images/new-design/blood_type.png
+++ b/assets/images/new-design/blood_type.png
--- a/assets/images/new-design/bmi_health_calculator.png
+++ b/assets/images/new-design/bmi_health_calculator.png
--- a/assets/images/new-design/body_fat.png
+++ b/assets/images/new-design/body_fat.png
--- a/assets/images/new-design/body_icon.png
+++ b/assets/images/new-design/body_icon.png
--- a/assets/images/new-design/body_mass.png
+++ b/assets/images/new-design/body_mass.png
--- a/assets/images/new-design/body_mass_icon.png
+++ b/assets/images/new-design/body_mass_icon.png
--- a/assets/images/new-design/body_weight.png
+++ b/assets/images/new-design/body_weight.png
--- a/assets/images/new-design/book_appointment_arabic.png
+++ b/assets/images/new-design/book_appointment_arabic.png
--- a/assets/images/new-design/booking_icon.png
+++ b/assets/images/new-design/booking_icon.png
--- a/assets/images/new-design/booking_icon_active.png
+++ b/assets/images/new-design/booking_icon_active.png
--- a/assets/images/new-design/calendar_reminder_black_icon.svg
+++ b/assets/images/new-design/calendar_reminder_black_icon.svg
@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="107.449" height="105.327" viewBox="0 0 107.449 105.327">
+  <g id="calendar_reminder_black_icon" transform="translate(0 -0.215)">
+    <path id="Path_892" data-name="Path 892" d="M84.045,186.055h16.988a2.123,2.123,0,1,0,0-4.247H84.045a2.123,2.123,0,0,0,0,4.247Zm0,0" transform="translate(-56.44 -125.108)"/>
+    <path id="Path_893" data-name="Path 893" d="M84.045,220.189h29.729a2.124,2.124,0,1,0,0-4.248H84.045a2.124,2.124,0,0,0,0,4.248Zm0,0" transform="translate(-56.44 -148.624)"/>
+    <path id="Path_894" data-name="Path 894" d="M113.774,250.074H84.045a2.124,2.124,0,0,0,0,4.248h29.729a2.124,2.124,0,1,0,0-4.248Zm0,0" transform="translate(-56.44 -172.139)"/>
+    <path id="Path_895" data-name="Path 895" d="M107.449,20.6a20.384,20.384,0,0,0-40.322-4.247H33.976V9.984a6.371,6.371,0,1,0-12.741,0v6.371H11.181A11.194,11.194,0,0,0,0,27.536V94.359a11.2,11.2,0,0,0,11.181,11.182H86.5A11.2,11.2,0,0,0,97.679,94.359V37.973A20.373,20.373,0,0,0,107.449,20.6ZM25.482,9.984a2.123,2.123,0,0,1,4.247,0V24.849a2.123,2.123,0,0,1-4.247,0ZM93.433,94.359a6.942,6.942,0,0,1-6.934,6.934H11.181a6.942,6.942,0,0,1-6.934-6.934V48.207H14.864V90.676A2.124,2.124,0,0,0,16.988,92.8H67.951a2.139,2.139,0,0,0,1.5-.622l12.74-12.741a2.1,2.1,0,0,0,.416-.621,1.891,1.891,0,0,0,.072-.2,2.042,2.042,0,0,0,.108-.544c0-.047.027-.089.027-.135V48.207H93.432V94.359ZM78.568,48.207V75.812H67.951a2.123,2.123,0,0,0-2.124,2.123V88.554H19.112V48.207Zm-3,31.852L70.075,85.55V80.059Zm17.868-36.1H4.247V27.536A6.942,6.942,0,0,1,11.181,20.6H21.234v4.248a6.371,6.371,0,1,0,12.741,0V20.6h32.7A20.352,20.352,0,0,0,93.433,39.955Zm-6.371-7.217A16.14,16.14,0,1,1,103.2,20.6,16.157,16.157,0,0,1,87.063,36.742Zm0,0"/>
+    <path id="Path_896" data-name="Path 896" d="M266.441,40.369l-1.424-1.578a6.822,6.822,0,0,1-1.783-4.565v-1.1a8.387,8.387,0,0,0-7.573-8.288,8.666,8.666,0,0,0-6.575,2.179,7.962,7.962,0,0,0-2.612,5.854V34.68a6.732,6.732,0,0,1-1.377,4.073l-1.326,1.762a2.125,2.125,0,0,0,1.7,3.4H252.7v2.124a2.123,2.123,0,0,0,4.247,0V43.915h7.914a2.124,2.124,0,0,0,1.578-3.546Zm-16.922-.7a10.885,10.885,0,0,0,1.2-4.988V32.872a3.655,3.655,0,0,1,1.23-2.718,4.361,4.361,0,0,1,3.324-1.085,4.107,4.107,0,0,1,3.711,4.058v1.1a10.973,10.973,0,0,0,1.452,5.441Zm0,0" transform="translate(-167.652 -16.943)"/>
+  </g>
+</svg>
--- a/assets/images/new-design/calendar_reminder_red_icon.svg
+++ b/assets/images/new-design/calendar_reminder_red_icon.svg
@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="88.566" height="86.817" viewBox="0 0 88.566 86.817">
+  <g id="calendar_reminder_red_icon" transform="translate(0 -0.215)">
+    <path id="Path_892" data-name="Path 892" d="M83.672,185.309h14a1.75,1.75,0,1,0,0-3.5h-14a1.75,1.75,0,0,0,0,3.5Zm0,0" transform="translate(-60.918 -135.035)" fill="#ce1d2b"/>
+    <path id="Path_893" data-name="Path 893" d="M83.672,219.443h24.5a1.751,1.751,0,1,0,0-3.5h-24.5a1.751,1.751,0,0,0,0,3.5Zm0,0" transform="translate(-60.918 -160.416)" fill="#ce1d2b"/>
+    <path id="Path_894" data-name="Path 894" d="M108.176,250.074h-24.5a1.751,1.751,0,0,0,0,3.5h24.5a1.751,1.751,0,1,0,0-3.5Zm0,0" transform="translate(-60.918 -185.797)" fill="#ce1d2b"/>
+    <path id="Path_895" data-name="Path 895" d="M88.566,17.019a16.8,16.8,0,0,0-33.236-3.5H28V8.267a5.251,5.251,0,1,0-10.5,0v5.251H9.216A9.227,9.227,0,0,0,0,22.734v55.08a9.227,9.227,0,0,0,9.216,9.217H71.3a9.227,9.227,0,0,0,9.216-9.217V31.337A16.793,16.793,0,0,0,88.566,17.019ZM21,8.267a1.75,1.75,0,0,1,3.5,0V20.52a1.75,1.75,0,0,1-3.5,0Zm56.01,69.547A5.722,5.722,0,0,1,71.3,83.53H9.216A5.722,5.722,0,0,1,3.5,77.814V39.773h8.751V74.779A1.751,1.751,0,0,0,14,76.53H56.01a1.763,1.763,0,0,0,1.238-.513l10.5-10.5A1.731,1.731,0,0,0,68.091,65a1.56,1.56,0,0,0,.059-.166,1.683,1.683,0,0,0,.089-.449c0-.039.022-.073.022-.111v-24.5h8.751V77.814ZM64.761,39.773V62.527H56.01a1.75,1.75,0,0,0-1.751,1.75v8.752H15.753V39.773ZM62.286,66.027,57.76,70.553V66.027ZM77.014,36.272H3.5V22.734a5.722,5.722,0,0,1,5.716-5.716H17.5v3.5a5.251,5.251,0,1,0,10.5,0v-3.5H54.959A16.776,16.776,0,0,0,77.014,32.971Zm-5.251-5.949a13.3,13.3,0,1,1,13.3-13.3A13.317,13.317,0,0,1,71.763,30.323Zm0,0" fill="#ce1d2b"/>
+    <path id="Path_896" data-name="Path 896" d="M262.382,37.634l-1.174-1.3a5.623,5.623,0,0,1-1.469-3.763v-.905a6.913,6.913,0,0,0-6.243-6.831,7.143,7.143,0,0,0-5.419,1.8,6.563,6.563,0,0,0-2.153,4.825v1.49a5.549,5.549,0,0,1-1.135,3.357L243.7,37.754a1.751,1.751,0,0,0,1.4,2.8h5.962v1.751a1.75,1.75,0,0,0,3.5,0V40.557h6.523a1.751,1.751,0,0,0,1.3-2.922Zm-13.948-.578a8.972,8.972,0,0,0,.992-4.111v-1.49a3.012,3.012,0,0,1,1.014-2.24,3.594,3.594,0,0,1,2.74-.894,3.385,3.385,0,0,1,3.059,3.345v.906a9.044,9.044,0,0,0,1.2,4.485Zm0,0" transform="translate(-180.954 -18.287)" fill="#ce1d2b"/>
+  </g>
+</svg>
--- a/assets/images/new-design/calories-calculator.png
+++ b/assets/images/new-design/calories-calculator.png
--- a/assets/images/new-design/cancel.png
+++ b/assets/images/new-design/cancel.png
--- a/assets/images/new-design/cancel_icon.png
+++ b/assets/images/new-design/cancel_icon.png
--- a/assets/images/new-design/carb_protein.png
+++ b/assets/images/new-design/carb_protein.png
--- a/assets/images/new-design/chat_with_us_icon.png
+++ b/assets/images/new-design/chat_with_us_icon.png
--- a/assets/images/new-design/check-icon.png
+++ b/assets/images/new-design/check-icon.png
--- a/assets/images/new-design/check-in.png
+++ b/assets/images/new-design/check-in.png
--- a/assets/images/new-design/children_vaccines_icon.png
+++ b/assets/images/new-design/children_vaccines_icon.png
--- a/assets/images/new-design/clinic-wayfinding-2.png
+++ b/assets/images/new-design/clinic-wayfinding-2.png
--- a/assets/images/new-design/close_icon.png
+++ b/assets/images/new-design/close_icon.png
--- a/assets/images/new-design/confirm_appointment_icon.png
+++ b/assets/images/new-design/confirm_appointment_icon.png
--- a/assets/images/new-design/confirm_button.png
+++ b/assets/images/new-design/confirm_button.png
--- a/assets/images/new-design/confirm_icon.png
+++ b/assets/images/new-design/confirm_icon.png
--- a/assets/images/new-design/connect_to_internet_icon.png
+++ b/assets/images/new-design/connect_to_internet_icon.png
--- a/assets/images/new-design/cs_logo.png
+++ b/assets/images/new-design/cs_logo.png
--- a/assets/images/new-design/delivery_date_icon.png
+++ b/assets/images/new-design/delivery_date_icon.png
--- a/assets/images/new-design/device_icon.png
+++ b/assets/images/new-design/device_icon.png
--- a/assets/images/new-design/discount_offers.png
+++ b/assets/images/new-design/discount_offers.png
--- a/assets/images/new-design/doctor_book_physical_appointment.png
+++ b/assets/images/new-design/doctor_book_physical_appointment.png
--- a/assets/images/new-design/doctor_information_icon.png
+++ b/assets/images/new-design/doctor_information_icon.png
--- a/assets/images/new-design/doctor_qualification_icon.png
+++ b/assets/images/new-design/doctor_qualification_icon.png
--- a/assets/images/new-design/doctor_video.png
+++ b/assets/images/new-design/doctor_video.png
--- a/assets/images/new-design/download_pharmacy_app.png
+++ b/assets/images/new-design/download_pharmacy_app.png
--- a/assets/images/new-design/emergency_icon.png
+++ b/assets/images/new-design/emergency_icon.png
--- a/assets/images/new-design/emergency_videocall_icon.png
+++ b/assets/images/new-design/emergency_videocall_icon.png
--- a/assets/images/new-design/envelop_icon.png
+++ b/assets/images/new-design/envelop_icon.png
--- a/assets/images/new-design/eye_measurement_icon.png
+++ b/assets/images/new-design/eye_measurement_icon.png
--- a/assets/images/new-design/facebook.png
+++ b/assets/images/new-design/facebook.png
--- a/assets/images/new-design/family_icon_bottom_bar.png
+++ b/assets/images/new-design/family_icon_bottom_bar.png
--- a/assets/images/new-design/family_member_icon_active.png
+++ b/assets/images/new-design/family_member_icon_active.png
--- a/assets/images/new-design/family_member_icon_inactive.png
+++ b/assets/images/new-design/family_member_icon_inactive.png
--- a/assets/images/new-design/family_menu_icon_red.png
+++ b/assets/images/new-design/family_menu_icon_red.png
--- a/assets/images/new-design/feedback_icon.png
+++ b/assets/images/new-design/feedback_icon.png
--- a/assets/images/new-design/female_face.png
+++ b/assets/images/new-design/female_face.png
--- a/assets/images/new-design/find_us_icon.png
+++ b/assets/images/new-design/find_us_icon.png
--- a/assets/images/new-design/health_calculator_general.png
+++ b/assets/images/new-design/health_calculator_general.png
--- a/assets/images/new-design/health_calculator_icon.png
+++ b/assets/images/new-design/health_calculator_icon.png
--- a/assets/images/new-design/health_calculator_women.png
+++ b/assets/images/new-design/health_calculator_women.png
--- a/assets/images/new-design/health_convertor_icon.png
+++ b/assets/images/new-design/health_convertor_icon.png
--- a/assets/images/new-design/heart_icon.png
+++ b/assets/images/new-design/heart_icon.png
--- a/assets/images/new-design/height.png
+++ b/assets/images/new-design/height.png
--- a/assets/images/new-design/height_icon.png
+++ b/assets/images/new-design/height_icon.png
--- a/assets/images/new-design/history_icon.png
+++ b/assets/images/new-design/history_icon.png
--- a/assets/images/new-design/hmg_full_logo.png
+++ b/assets/images/new-design/hmg_full_logo.png
--- a/assets/images/new-design/hmg_services.png
+++ b/assets/images/new-design/hmg_services.png
--- a/assets/images/new-design/hmg_services_ar.png
+++ b/assets/images/new-design/hmg_services_ar.png
--- a/assets/images/new-design/home_bottom_bar.png
+++ b/assets/images/new-design/home_bottom_bar.png
--- a/assets/images/new-design/home_bottom_bar_active.png
+++ b/assets/images/new-design/home_bottom_bar_active.png
--- a/assets/images/new-design/hospital_address_icon.png
+++ b/assets/images/new-design/hospital_address_icon.png
--- a/assets/images/new-design/icon_check_list.png
+++ b/assets/images/new-design/icon_check_list.png
--- a/assets/images/new-design/icon_hospital.png
+++ b/assets/images/new-design/icon_hospital.png
--- a/assets/images/new-design/info-icon.png
+++ b/assets/images/new-design/info-icon.png
--- a/assets/images/new-design/info_icon
+++ b/assets/images/new-design/info_icon
--- a/assets/images/new-design/input_calendar_icon.png
+++ b/assets/images/new-design/input_calendar_icon.png
--- a/assets/images/new-design/input_clock_icon.png
+++ b/assets/images/new-design/input_clock_icon.png
--- a/assets/images/new-design/insurance_approvals_icon.png
+++ b/assets/images/new-design/insurance_approvals_icon.png
--- a/assets/images/new-design/insurance_card_icon.png
+++ b/assets/images/new-design/insurance_card_icon.png
--- a/assets/images/new-design/ionic-ios-eye.png
+++ b/assets/images/new-design/ionic-ios-eye.png
--- a/assets/images/new-design/lab_result_icon.png
+++ b/assets/images/new-design/lab_result_icon.png
--- a/assets/images/new-design/lakum_icon.png
+++ b/assets/images/new-design/lakum_icon.png
--- a/assets/images/new-design/linkedin.png
+++ b/assets/images/new-design/linkedin.png
--- a/assets/images/new-design/list-icon-down.png
+++ b/assets/images/new-design/list-icon-down.png
--- a/assets/images/new-design/list-icon-up.png
+++ b/assets/images/new-design/list-icon-up.png
--- a/Show More
+++ b/Show More