-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2401 from sunbird-cb/cbrelease-4.8.16.1
Cbrelease 4.8.16.1
- Loading branch information
Showing
20 changed files
with
331 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
library/ws-widget/collection/src/lib/_common/content-toc/pipes/replace-nbsp.pipe.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { ReplaceNbspPipe } from './replace-nbsp.pipe'; | ||
|
|
||
| describe('ReplaceNbspPipe', () => { | ||
| it('create an instance', () => { | ||
| const pipe = new ReplaceNbspPipe(); | ||
| expect(pipe).toBeTruthy(); | ||
| }); | ||
| }); |
14 changes: 14 additions & 0 deletions
14
library/ws-widget/collection/src/lib/_common/content-toc/pipes/replace-nbsp.pipe.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { Pipe, PipeTransform } from '@angular/core' | ||
|
|
||
| @Pipe({ | ||
| name: 'replaceNbsp', | ||
| }) | ||
| export class ReplaceNbspPipe implements PipeTransform { | ||
|
|
||
| transform(value: any): any { | ||
| if (value.includes(' ')) { | ||
| return value.replace(/ /g, ' ') | ||
| } | ||
| return value | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
...rvey-form-left-section/survey-form/survey-form-section/survey-form-section.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <div class="tips-container" *ngIf="isVisible"> | ||
| <ng-container *ngFor="let data of surveyFormData"> | ||
| <div class="card-header flex items-start justify-between"> | ||
| <span class="card-title flex mat-subheading-1">{{data.title}}</span> | ||
| <a mat-icon-button class="close-button flex" (click)="closeCard()"> | ||
| <mat-icon>close</mat-icon> | ||
| </a> | ||
| </div> | ||
| <div class="circle-box"> | ||
| <div class="background-circle"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="tip-content flex flex-col"> | ||
| <div class="tip-content-top flex flex-row"> | ||
| <div class="background flex items-center"> | ||
| <img class="book-icon" src="{{data?.ImageUrl}}" | ||
| alt="{{data?.ImageUrl}}"> | ||
| </div> | ||
| <div class="tip-data flex"> | ||
| <p>{{data?.content}}</p> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="tip-count"> | ||
| <a href="https://portal.igotkarmayogi.gov.in/surveyml/668e250da8bfb500083136b1" class="btn-title">{{data.btnTitle}}</a> | ||
| </div> | ||
| </div> | ||
| </ng-container> | ||
| </div> |
157 changes: 157 additions & 0 deletions
157
...rvey-form-left-section/survey-form/survey-form-section/survey-form-section.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| .tips-container { | ||
| background-color: #F9CB97; | ||
| padding: 16px; | ||
| padding-bottom: 0px; | ||
| border-radius: 8px; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: space-between; | ||
| margin-bottom: 1rem; | ||
| overflow: hidden; | ||
| width: 385px; | ||
| box-sizing: border-box; | ||
|
|
||
|
|
||
| } | ||
|
|
||
| @media screen and (max-width: 1000px) { | ||
| .tips-container { | ||
| width: 100%; | ||
|
|
||
| } | ||
| } | ||
|
|
||
| .tips-header { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| margin-bottom: 8px; | ||
| z-index: 10; | ||
| } | ||
|
|
||
| .tips-header h3 { | ||
| margin: 0; | ||
| font-size: 1.2em; | ||
| color: #000000; | ||
| font-family: Montserrat; | ||
| font-size: 16px; | ||
| z-index: 10; | ||
| } | ||
|
|
||
| .tips-header button { | ||
| background: none; | ||
| border: none; | ||
| color: #01468f; | ||
| cursor: pointer; | ||
| font-family: Lato; | ||
| font-size: 14px; | ||
| z-index: 10; | ||
| } | ||
|
|
||
| .tip-content { | ||
| display: flex; | ||
| // justify-content: space-between; | ||
| z-index: 10; | ||
| padding-top: 6px; | ||
| margin-bottom: 8px; | ||
| } | ||
|
|
||
| .tip-content p { | ||
| margin-left: 12px; | ||
| margin-bottom: 4px; | ||
| color: #000000; | ||
| font-family: Lato; | ||
| font-size: 14px; | ||
| z-index: 10; | ||
| line-height: 16.8px; | ||
| } | ||
|
|
||
| .tip-count { | ||
| display: flex; | ||
| justify-content: end; | ||
| align-items: center; | ||
| font-family: Lato !important; | ||
| font-size: 14px !important; | ||
| z-index: 10; | ||
| font-weight: 600; | ||
| line-height: 19.5px; | ||
| } | ||
|
|
||
| // .tip-data { | ||
| // width: calc(100% - 110px); | ||
| // } | ||
|
|
||
|
|
||
| .background-circle { | ||
| position: absolute; | ||
| z-index: 1; | ||
| right: -6.5em; | ||
| top: 2.8em; | ||
| width: 178px; | ||
| height: 178px; | ||
| border-radius: 100%; | ||
| background-color: #fcd2a3; | ||
| } | ||
|
|
||
| .circle-box { | ||
| position: relative; | ||
| width: 100%; | ||
| height: 0px; | ||
| } | ||
|
|
||
| .book-icon { | ||
| width: 50px; | ||
| height: 50px; | ||
| padding: 6px; | ||
| box-sizing: border-box; | ||
| } | ||
|
|
||
| .background { | ||
| background-color: white; | ||
| justify-content: center; | ||
| width: 100px; | ||
| height: 51px; | ||
| border-radius: 5px; | ||
| text-align: center; | ||
| } | ||
| .view-more { | ||
| display: flex; | ||
| align-items: center; | ||
| text-align: center; | ||
| height: 40px; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| .view-more:hover { | ||
| background-color: #DCDFE5; | ||
| } | ||
| .card-header { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| } | ||
|
|
||
| .card-title { | ||
| font-weight: 600; | ||
| width: 85%; | ||
| font-family: 'Montserrat'; | ||
| font-size: 16px; | ||
| line-height: 19.5px; | ||
| } | ||
|
|
||
| .close-button { | ||
| cursor: pointer; | ||
| vertical-align: top; | ||
| color: #1b4ca1; | ||
| } | ||
| .btn-title { | ||
| color: #fff !important; | ||
| background-color: #1b4ca1; | ||
| border-radius: 16px; | ||
| padding: 8px 16px; | ||
| font-weight: 700; | ||
| font-size: 14px; | ||
| width: 102px; | ||
| text-align: center; | ||
| margin-bottom: 7px; | ||
|
|
||
| } |
Oops, something went wrong.