From c4ab9d8e2dfab78722d77e475537a88da6a977ec Mon Sep 17 00:00:00 2001 From: subranil Date: Thu, 9 Jul 2020 11:34:43 +0530 Subject: [PATCH 1/3] Issue #SB-19773 fix: text replaced for no book available --- src/app/resources/resources.component.html | 9 +++------ src/app/resources/resources.component.scss | 4 ++++ src/assets/i18n/en.json | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app/resources/resources.component.html b/src/app/resources/resources.component.html index 1cd7e8e92..4b6a5f190 100644 --- a/src/app/resources/resources.component.html +++ b/src/app/resources/resources.component.html @@ -98,14 +98,11 @@
- +
-

- {{'NO_BOOKS_AVAILABLE' | translate}} -

-

{{'NO_BOOKS_DEFINITION' | translate:{'%s': appLabel} }}

- +

{{'NO_BOOKS_TEXT' | translate:{'%s': appLabel} }}

+ {{'REQUEST_CONTENT' | translate}}
diff --git a/src/app/resources/resources.component.scss b/src/app/resources/resources.component.scss index 08bb0fed4..c8203cb00 100644 --- a/src/app/resources/resources.component.scss +++ b/src/app/resources/resources.component.scss @@ -54,10 +54,14 @@ border-radius: 4px; background-color: #FFFFFF; color: #004D9F; + padding-left: 16px; + padding-right: 16px; } .explore-more-books { --background: #024F9D; border-radius: 4px; + padding-left: 16px; + padding-right: 16px; } .sub-heading { padding: 1em 4em !important; diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index f65013b38..c56eed88c 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -160,7 +160,7 @@ "CREDITS_LICENCE_INFO": "Credits & License Info", "CSV_DOWNLOAD_SUCCESS": "{{%s}} saved in ‘Downloads’", "CURRENT_LANGUAGE": "Current Language ", - "REQUEST_CONTENT": "Request for Content", + "REQUEST_CONTENT": "LET US KNOW HERE", "SEE_MORE_BOOKS": "See more books and content", "DATA_SYNC": "Data Sync", "DATA_SYNC_FAILURE": "Could not sync data, try again later", @@ -757,5 +757,6 @@ "INTERACTIVE_MATERIAL": "interactive study material", "THANKING_NOTE": "We will notify you as soon as your state board uploads your requested books on {{%s}}", "EXPLORE_HEADING": "Explore following on {{%s}}", - "SEE_MORE_CONTENT": "See more content" + "SEE_MORE_CONTENT": "See more content", + "NO_BOOKS_TEXT": "Couldn't find your subject's textbook on {{%s}}?" } From aa94eb0e5ad73c0598dc3fcd745d376675280ae5 Mon Sep 17 00:00:00 2001 From: subranil Date: Thu, 9 Jul 2020 13:51:08 +0530 Subject: [PATCH 2/3] Issue #SB-19773 CHORE: string changed in language file --- src/assets/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index c56eed88c..ef81d88ce 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -160,7 +160,7 @@ "CREDITS_LICENCE_INFO": "Credits & License Info", "CSV_DOWNLOAD_SUCCESS": "{{%s}} saved in ‘Downloads’", "CURRENT_LANGUAGE": "Current Language ", - "REQUEST_CONTENT": "LET US KNOW HERE", + "REQUEST_CONTENT": "Let us know here", "SEE_MORE_BOOKS": "See more books and content", "DATA_SYNC": "Data Sync", "DATA_SYNC_FAILURE": "Could not sync data, try again later", From 39f24670e6dba4df9e89f6a83f4e1028bca59228 Mon Sep 17 00:00:00 2001 From: subranil Date: Thu, 9 Jul 2020 18:34:21 +0530 Subject: [PATCH 3/3] Issue #SB-19773 CHORE: changed color to common values --- src/app/resources/resources.component.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/resources/resources.component.scss b/src/app/resources/resources.component.scss index c8203cb00..ab8340024 100644 --- a/src/app/resources/resources.component.scss +++ b/src/app/resources/resources.component.scss @@ -21,7 +21,7 @@ z-index: 1; } .main-container { - background: #fff; + background: $white; position: relative; } .offline-header { @@ -44,7 +44,7 @@ background-color: #f2f2f2; } .sb-view-more { - background: #edf4f9; + background: $light-blue; text-align: center; padding: $base-block-space * 2; color: $primary-color; @@ -52,13 +52,13 @@ } .explore-more-content { border-radius: 4px; - background-color: #FFFFFF; + background-color: $white; color: #004D9F; padding-left: 16px; padding-right: 16px; } .explore-more-books { - --background: #024F9D; + --background: #{$blue}; border-radius: 4px; padding-left: 16px; padding-right: 16px; @@ -66,7 +66,7 @@ .sub-heading { padding: 1em 4em !important; font-size: 12px; - color: #333333; + color: $gray-800; margin: 0; } .sb-nodownloads-container { @@ -79,7 +79,7 @@ margin: 0; font-size: 16px; padding-top: 4%; - color: #666666; + color: $gray-400; font-weight: bold; letter-spacing: -0.46px }