From 736f0d9e5a3b585c86aa2561ce3fbb31eb876798 Mon Sep 17 00:00:00 2001
From: Abhishek <guywhodesigns@gmail.com>
Date: Aug 01 2018 14:50:43 +0000
Subject: fix tabs and icons


---

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b2f8562..186e84b 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,8 +15,8 @@ import { TabsPage } from '../pages/tabs/tabs';
 import { HomePage } from '../pages/home/home';
 import { MagazinePage } from '../pages/magazine/magazine';
 import { AskPage } from '../pages/ask/ask';
-import { CalendarPage, Search, meetingDetails } from '../pages/calendar/calendar';
 import { MorePage, AboutDetailPage, AboutPage, BookmarksPage, WomenDiversity, FedoraPodcast, PodcastPlayer } from '../pages/more/more';
+import { CalendarPage, Search, meetingDetails } from '../pages/calendar/calendar';
 import { NotificationsPage } from '../pages/notifications/notifications';
 import { PackageSearchPage } from '../pages/package-search/package-search';
 import { ViewPackagePage } from '../pages/view-package/view-package';
diff --git a/src/assets/img/player-forward.svg b/src/assets/img/player-forward.svg
new file mode 100644
index 0000000..6ed6a79
--- /dev/null
+++ b/src/assets/img/player-forward.svg
@@ -0,0 +1,3 @@
+<svg width="45" height="31" viewBox="0 0 45 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.8571 30.8571V0L0 15.4286L21.8571 30.8571ZM23.1429 15.4286L45 30.8571V0L23.1429 15.4286Z" transform="translate(45) scale(-1 1)" fill="white" fill-opacity="0.75"/>
+</svg>
diff --git a/src/assets/img/player-rewind.svg b/src/assets/img/player-rewind.svg
new file mode 100644
index 0000000..6d16ddf
--- /dev/null
+++ b/src/assets/img/player-rewind.svg
@@ -0,0 +1,3 @@
+<svg width="45" height="31" viewBox="0 0 45 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.8571 30.8571V0L0 15.4286L21.8571 30.8571ZM23.1429 15.4286L45 30.8571V0L23.1429 15.4286Z" fill="white" fill-opacity="0.75"/>
+</svg>
diff --git a/src/pages/more/more.scss b/src/pages/more/more.scss
index 111653f..608e5d6 100755
--- a/src/pages/more/more.scss
+++ b/src/pages/more/more.scss
@@ -51,12 +51,11 @@ page-more {
 
 bookmarks,
 about-us,
-<<<<<<< HEAD about-detail,
-women-diversity {
-  =======about-detail,
+about-detail,
+women-diversity ,
   fedora-podcast,
   podcast-player {
-    >>>>>>>add templates ion-header {
+    ion-header {
       padding: 16px 24px;
       background-color: #fff;
       span {