From 5afa521482c5a256eafd11cf651add0f29b6d4d3 Mon Sep 17 00:00:00 2001 From: kj1352 Date: Sat, 27 Jun 2020 16:40:22 +0530 Subject: [PATCH] Common styles scss code removed from each scss file and added to common file with shadow attribute for header --- src/app/attendance/attendance.component.html | 6 +-- src/app/attendance/attendance.component.scss | 48 ----------------- src/app/calendar/calendar.component.html | 6 +-- src/app/calendar/calendar.component.scss | 50 +++-------------- src/app/chat-page/chat-page.component.html | 6 +-- src/app/chat-page/chat-page.component.scss | 47 +--------------- src/app/forum-page/forum-page.component.html | 4 +- src/app/forum-page/forum-page.component.scss | 46 ---------------- .../post-details/post-details.component.html | 4 +- .../post-details/post-details.component.scss | 50 ----------------- src/app/settings/settings.component.html | 4 +- src/app/settings/settings.component.scss | 48 ----------------- .../chapter-notes.component.html | 4 +- .../chapter-notes.component.scss | 47 ---------------- src/app/tabs/courses/quiz/quiz.component.html | 4 +- src/app/tabs/courses/quiz/quiz.component.scss | 53 +++---------------- .../video-chapter.component.html | 4 +- .../video-chapter.component.scss | 47 ---------------- .../video-notes/video-notes.component.scss | 40 -------------- src/app/tabs/home/home.component.scss | 4 +- src/app/tabs/more/more.component.html | 2 +- src/app/tabs/more/more.component.scss | 4 +- src/styles.scss | 45 +++++++++++++++- 23 files changed, 84 insertions(+), 489 deletions(-) diff --git a/src/app/attendance/attendance.component.html b/src/app/attendance/attendance.component.html index c7df51f..20a087c 100644 --- a/src/app/attendance/attendance.component.html +++ b/src/app/attendance/attendance.component.html @@ -1,5 +1,5 @@ -
-
+ diff --git a/src/app/attendance/attendance.component.scss b/src/app/attendance/attendance.component.scss index af1ca8e..916adcd 100644 --- a/src/app/attendance/attendance.component.scss +++ b/src/app/attendance/attendance.component.scss @@ -1,51 +1,3 @@ -.page { - background-color: var(--black); - height: 100vh; - overflow: auto; - padding-bottom: 60px; -} - -.nav-header { - background-color: var(--ash-black); - display: flex; - align-items: center; - padding: 0 5%; - height: 60px; - position: sticky; - position: -webkit-sticky; - top: 0; - z-index: 1; - box-shadow: 0px 0px 5px var(--black); - - .close-button { - border: 0px; - background-color: transparent; - .icon { - width: 16px; - height: 16px; - fill: var(--light-grey); - } - } - - h5 { - font-size: 16px; - color: white; - font-weight: 400; - margin-left: 20px; - letter-spacing: 1px; - - .icon { - width: 15px; - height: 15px; - fill: white; - margin-right: 3px; - vertical-align: middle; - position: relative; - top: -1px; - } - } -} - .statistics-upfold { display: flex; align-items: center; diff --git a/src/app/calendar/calendar.component.html b/src/app/calendar/calendar.component.html index 764870f..b685d76 100644 --- a/src/app/calendar/calendar.component.html +++ b/src/app/calendar/calendar.component.html @@ -1,5 +1,5 @@ -
-
+ diff --git a/src/app/calendar/calendar.component.scss b/src/app/calendar/calendar.component.scss index 980d653..3f39935 100644 --- a/src/app/calendar/calendar.component.scss +++ b/src/app/calendar/calendar.component.scss @@ -1,54 +1,16 @@ -.page { - height: 100vh; - overflow: auto; - background-color: var(--ash-black); +.page-container { + padding-bottom: 0; } - .nav-header { - background-color: var(--ash-black); - display: flex; - align-items: center; - padding: 0 5%; - height: 60px; - position: sticky; - position: -webkit-sticky; - top: 0; - z-index: 1; - - .close-button { - border: 0px; - background-color: transparent; - .icon { - width: 16px; - height: 16px; - fill: var(--light-grey); - } - } - - .show-all-button { + button.show-all-button { margin-left: auto; background-color: var(--dark-grey); color: white; - border: 0px; - border-radius: 3px; - height: 35px; - padding: 0 15px; font-size: 14px; - } - - .profile-button { - background-color: transparent; - margin-left: auto; - border: 0px; - margin-top: 5px; - } - - img { - width: 35px; - height: 35px; - border-radius: 50%; - overflow: hidden; + height: 40px; + border-radius: 5px; + padding: 0 15px; } } diff --git a/src/app/chat-page/chat-page.component.html b/src/app/chat-page/chat-page.component.html index 469d300..a577035 100644 --- a/src/app/chat-page/chat-page.component.html +++ b/src/app/chat-page/chat-page.component.html @@ -1,5 +1,5 @@ -
-
+ diff --git a/src/app/chat-page/chat-page.component.scss b/src/app/chat-page/chat-page.component.scss index f301246..8de921d 100644 --- a/src/app/chat-page/chat-page.component.scss +++ b/src/app/chat-page/chat-page.component.scss @@ -1,48 +1,5 @@ -.page { - background-color: var(--ash-black); - height: 100vh; - overflow: auto; -} - -.nav-header { - background-color: var(--ash-black); - display: flex; - align-items: center; - padding: 0 5%; - height: 60px; - position: sticky; - position: -webkit-sticky; - top: 0; - z-index: 1; - box-shadow: 0px 0px 5px var(--black); - - .close-button { - border: 0px; - background-color: transparent; - .icon { - width: 15px; - height: 15px; - fill: var(--light-grey); - } - } - - h5 { - font-size: 16px; - color: white; - font-weight: 400; - margin-left: 20px; - letter-spacing: 1px; - - .icon { - width: 15px; - height: 15px; - fill: white; - margin-right: 3px; - vertical-align: middle; - position: relative; - top: -1px; - } - } +.page-container { + padding-bottom: 0; } .segment-buttons { diff --git a/src/app/forum-page/forum-page.component.html b/src/app/forum-page/forum-page.component.html index 6997324..09c1202 100644 --- a/src/app/forum-page/forum-page.component.html +++ b/src/app/forum-page/forum-page.component.html @@ -1,4 +1,4 @@ -
+
-
+ diff --git a/src/app/forum-page/forum-page.component.scss b/src/app/forum-page/forum-page.component.scss index dfab091..e69de29 100644 --- a/src/app/forum-page/forum-page.component.scss +++ b/src/app/forum-page/forum-page.component.scss @@ -1,46 +0,0 @@ -.page { - background-color: var(--black); - height: 100vh; - overflow: auto; -} - -.nav-header { - background-color: var(--ash-black); - display: flex; - align-items: center; - padding: 0 5%; - height: 60px; - position: sticky; - position: -webkit-sticky; - top: 0; - z-index: 1; - box-shadow: 0px 0px 5px var(--black); - - .close-button { - border: 0px; - background-color: transparent; - .icon { - width: 15px; - height: 15px; - fill: var(--light-grey); - } - } - - h5 { - font-size: 16px; - color: white; - font-weight: 400; - margin-left: 20px; - letter-spacing: 1px; - - .icon { - width: 15px; - height: 15px; - fill: white; - margin-right: 3px; - vertical-align: middle; - position: relative; - top: -1px; - } - } -} diff --git a/src/app/reusable-components/forum/post-details/post-details.component.html b/src/app/reusable-components/forum/post-details/post-details.component.html index f15b7ba..a736151 100644 --- a/src/app/reusable-components/forum/post-details/post-details.component.html +++ b/src/app/reusable-components/forum/post-details/post-details.component.html @@ -1,4 +1,4 @@ -
+
-
+ diff --git a/src/app/reusable-components/forum/post-details/post-details.component.scss b/src/app/reusable-components/forum/post-details/post-details.component.scss index e5e867c..7b46e59 100644 --- a/src/app/reusable-components/forum/post-details/post-details.component.scss +++ b/src/app/reusable-components/forum/post-details/post-details.component.scss @@ -1,51 +1 @@ @import '../forum.component.scss'; - -.page { - background-color: var(--black); - height: 100vh; - overflow: auto; -} - -.nav-header { - background-color: var(--ash-black); - display: flex; - align-items: center; - padding: 0 5%; - height: 60px; - position: sticky; - position: -webkit-sticky; - top: 0; - z-index: 1; - box-shadow: 0px 0px 5px var(--black); - - .close-button { - border: 0px; - background-color: transparent; - .icon { - width: 15px; - height: 15px; - fill: var(--light-grey); - } - } - - h5 { - font-size: 16px; - color: white; - font-weight: 400; - margin-left: 20px; - letter-spacing: 1px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - - .icon { - width: 15px; - height: 15px; - fill: white; - margin-right: 3px; - vertical-align: middle; - position: relative; - top: -1px; - } - } -} diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index 659eb37..2d44707 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -1,4 +1,4 @@ -
+
+ diff --git a/src/app/settings/settings.component.scss b/src/app/settings/settings.component.scss index 4cea47b..aa0d890 100644 --- a/src/app/settings/settings.component.scss +++ b/src/app/settings/settings.component.scss @@ -1,51 +1,3 @@ -.page { - background-color: var(--black); - height: 100vh; - overflow: auto; -} - -.nav-header { - background-color: var(--ash-black); - display: flex; - align-items: center; - padding: 0 5%; - height: 60px; - position: sticky; - position: -webkit-sticky; - top: 0; - z-index: 1; - box-shadow: 0px 0px 5px var(--black); - - .close-button { - border: 0px; - background-color: transparent; - .icon { - width: 15px; - height: 15px; - fill: var(--light-grey); - } - } - - h5 { - font-size: 16px; - color: white; - font-weight: 400; - margin-left: 20px; - letter-spacing: 1px; - - .icon { - width: 15px; - height: 15px; - fill: white; - margin-right: 3px; - vertical-align: middle; - position: relative; - top: -1px; - } - } -} - - ul { list-style: none; } diff --git a/src/app/tabs/courses/chapter-notes/chapter-notes.component.html b/src/app/tabs/courses/chapter-notes/chapter-notes.component.html index 3362f09..bef6dac 100644 --- a/src/app/tabs/courses/chapter-notes/chapter-notes.component.html +++ b/src/app/tabs/courses/chapter-notes/chapter-notes.component.html @@ -1,4 +1,4 @@ -
+
- + diff --git a/src/app/tabs/courses/chapter-notes/chapter-notes.component.scss b/src/app/tabs/courses/chapter-notes/chapter-notes.component.scss index 9e18c3e..7756b47 100644 --- a/src/app/tabs/courses/chapter-notes/chapter-notes.component.scss +++ b/src/app/tabs/courses/chapter-notes/chapter-notes.component.scss @@ -1,50 +1,3 @@ -.page { - background-color: var(--black); - height: 100vh; - padding-bottom: 60px; - overflow: auto; -} - -.nav-header { - background-color: var(--ash-black); - display: flex; - align-items: center; - padding: 0 5%; - height: 60px; - position: sticky; - position: -webkit-sticky; - top: 0; - z-index: 1; - - .close-button { - border: 0px; - background-color: transparent; - .icon { - width: 16px; - height: 16px; - fill: var(--light-grey); - } - } - - h5 { - font-size: 16px; - color: white; - font-weight: 400; - margin-left: 20px; - letter-spacing: 1px; - - .icon { - width: 15px; - height: 15px; - fill: white; - margin-right: 3px; - vertical-align: middle; - position: relative; - top: -1px; - } - } -} - h2 { padding: 0 5%; font-size: 22px; diff --git a/src/app/tabs/courses/quiz/quiz.component.html b/src/app/tabs/courses/quiz/quiz.component.html index 2eeccbd..ee96724 100644 --- a/src/app/tabs/courses/quiz/quiz.component.html +++ b/src/app/tabs/courses/quiz/quiz.component.html @@ -1,5 +1,5 @@ -
-