Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
Issue #SB-0000 merge: Sprint 2 changes to sprint 3 Merge pull request #…
Browse files Browse the repository at this point in the history 
…478 from Sunbird-Ed/release-1.14.0

Release 1.14.0
  • Loading branch information
@AmiableAnil
AmiableAnil authored Feb 15, 2019
2 parents 497f09f + 2afc8d5 commit 2057971
Show file tree
Hide file tree
Showing 12 changed files with 161 additions and 158 deletions.
10 changes: 9 additions & 1 deletion src/assets/styles/_helper.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@
.MR5{
margin-right: 5px;
}
.MR4{
@include margin(null, 4px, null, null);
}

.MR6{
@include margin(null, 6px, null, null);
Expand All @@ -89,6 +92,11 @@
@include margin(null, 10px, null, null);
}


.MR12{
@include margin(null, 12px, null, null);
}

.MR15{
@include margin(null, 15px, null, null);
}
Expand Down Expand Up @@ -217,7 +225,7 @@
}

.PR10{
padding-right: 10px;
@include padding(null, 10px, null, null)
}

.PR15{
Expand Down
4 changes: 2 additions & 2 deletions src/component/card/resource/resource-card.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="custom card grid" [ngClass]="{'saved': sectionName===savedResourcesSection, 'recent': sectionName===recentViewedSection}">
<div class="left">
<div class="img-container">
<img class="app-icon" src="{{ course?.courseLogoUrl || course?.appIcon || defaultImg }}">
<img src="{{ course?.courseLogoUrl || course?.appIcon || defaultImg }}">
</div>
</div>
<div class="right">
Expand All @@ -13,7 +13,7 @@
</div>
<div>
<span class="info">{{course?.gradeLevel}}</span>
<span class="separator-dot"></span>
<span class="separator-dot" *ngIf = "course?.subject"></span>
<span class="info">{{course?.subject}}</span>
</div>

Expand Down
213 changes: 104 additions & 109 deletions src/component/card/resource/resource-card.scss
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,119 @@

.resource-card{
box-shadow: none;
}
.app-icon{
width:100%;
min-height:70px;
max-height:70px;
.resource-card{
box-shadow: none;
}
.custom.card {
width: 282px;
border-radius: 2px;
height: 80px;
// box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.12);
grid-gap: 13px;
background-color: #fff;
&.saved {
border-radius: 2px;
background-color: rgba(0, 136, 68, 0.1);
border: 0.5px solid #008844;
}
.custom.card {
width: 282px;
&.recent {
border-radius: 2px;
height: 80px;
// box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.12);
grid-gap: 13px;
background-color: #fff;
&.saved {
border-radius: 2px;
background-color: rgba(0, 136, 68, 0.1);
border: 0.5px solid #008844;
background-color: rgba(2, 79, 157, 0.1);
border: 0.5px solid #024f9d;
}
@include margin(0, 16px, 0, 0);
@include padding(15px, 16px);
display: grid;
grid-template-columns: 1fr 2.9fr;
&.about{
display: block;
ion-label{
margin-bottom: 1px;
font-size: 12px;
font-weight: bold;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.4px;
color: #a4a4a4;
}
&.recent {
border-radius: 2px;
background-color: rgba(2, 79, 157, 0.1);
border: 0.5px solid #024f9d;
p{
margin-top: 0;
font-size: 14px;
font-weight: normal;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.4px;
color: #000000;
}
@include margin(0, 16px, 0, 0);
@include padding(15px, 16px);
}
// &:first-child {
// @include margin(null, null, null, 21px !important);
// }
// &:last-child {
// @include margin(null, 16px, null, null !important);
// }
.left {
overflow:hidden;
display: grid;
grid-template-columns: 1fr 2.9fr;
&.about{
display: block;
ion-label{
margin-bottom: 1px;
font-size: 12px;
font-weight: bold;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.4px;
color: #a4a4a4;
}
p{
margin-top: 0;
font-size: 14px;
font-weight: normal;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.4px;
color: #000000;
}
}
// &:first-child {
// @include margin(null, null, null, 21px !important);
// }
// &:last-child {
// @include margin(null, 16px, null, null !important);
// }
.left {
overflow:hidden;
display: grid;
grid-template-columns: 1fr;
grid-template-rows: 1fr;
grid-template-columns: 1fr;
grid-template-rows: 1fr;

.img-container {
background-color: grey;
width:100%;
min-height:70px;
}
.img-container {
background-color: grey;
width:100%;
width: 56px;
height: 56px;
}
.right {
overflow:hidden;
display: grid;
grid-template-columns: 1fr;
grid-template-rows: 1fr;
}
.right {
overflow:hidden;
display: grid;
grid-template-columns: 1fr;
grid-template-rows: 1fr;

.title {
width:100%;
overflow:hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
margin:0;
margin-bottom: 3px;
padding:0;
font-weight: 500;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.4px;
color: #333333;
}
.info{
font-size: 12px;
font-weight: 500;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.4px;
color: #979797;
}
.title {
width:100%;
overflow:hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
margin:0;
margin-bottom: 3px;
padding:0;
font-weight: 500;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.4px;
color: #333333;
}
.info{
font-size: 12px;
font-weight: 500;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.4px;
color: #979797;
}
}

&.offline{
.left{
margin: -16px 0 -15px -16px;
&.offline{
.left{
margin: -16px 0 -15px -16px;

.img-container {
display: flex;
align-items: center;
background-color: map-get($colors, danger);
.icon{
margin: auto;
font-size: 25px;
}
.img-container {
display: flex;
align-items: center;
background-color: map-get($colors, danger);
.icon{
margin: auto;
font-size: 25px;
}
}
.right{
opacity: 0.5;
}
}
.right{
opacity: 0.5;
}
}
}
2 changes: 1 addition & 1 deletion src/pages/profile/personal-details-edit.profile/personal-details-edit.profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{{'ERROR_NAME_INVALID' | translate}}</div>
</ion-label>
<ion-input class="form-control" #name formControlName="name" placeholder="{{ 'NAME_HINT' | translate }}"
(ionChange)="enableSubmitButton();"></ion-input>
(ionChange)="enableSubmitButton();" dir="{{commonUtilService.getAppDirection()}}"></ion-input>
</ion-item>
<ion-item>
<ion-label stacked class="label-font">{{'STATE' | translate}}</ion-label>
Expand Down
10 changes: 5 additions & 5 deletions src/pages/resources/resources.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

<ion-content overflow-scroll="true" class="course-scroll-holder1" style="background: #EBEBEB;">
<ion-refresher (ionRefresh)="swipeDownToRefresh($event)"></ion-refresher>
<div class="horizontal-scroll PLR16px bg-white">
<a class="medium-pill" *ngFor="let medium of categoryMediums; let i = index;" [ngClass]="{'active': medium?.selected}" [@appear] (click)="mediumClick(i)">{{medium?.name}} Medium</a>
<div class="horizontal-scroll PLR15px bg-white">
<a class="medium-pill MR4" *ngFor="let medium of categoryMediums; let i = index;" [ngClass]="{'active': medium?.selected}" [@appear] (click)="mediumClick(medium?.name)">{{medium?.name}} Medium</a>
</div>

<div class="horizontal-scroll PTB10 PLR16px class-filter-cotainer" id="gradeScroll" [@ScrollHorizontal]="{value: currentGrade?.selected, params: {left_indent: current_index * 72}}">
<a class="class-pill" *ngFor="let grade of categoryGradeLevels; let i = index; let first = first"
<div class="horizontal-scroll PTB10 PLR15px class-filter-cotainer class-shadow" id="gradeScroll" [@ScrollHorizontal]="{value: currentGrade?.selected, params: {left_indent: current_index * 72}}">
<a class="class-pill MR12" *ngFor="let grade of categoryGradeLevels; let i = index; let first = first"
[ngClass]="{'active': grade?.selected, '': !grade?.selected}" attr.id="class{{i}}" (click)="classClick(i);" [@appear]="{value: grade?.selected, params: {left_indent: i * 72}}">
{{grade?.name}}
</a>
Expand Down Expand Up @@ -96,7 +96,7 @@
</div>
<div>
<span class="info">{{item?.gradeLevel}}</span>
<span class="separator-dot"></span>
<span class="separator-dot" *ngIf = "item?.subject"></span>
<span class="info">{{item?.subject}}</span>
</div>

Expand Down
32 changes: 14 additions & 18 deletions src/pages/resources/resources.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@ page-resources {
.scroll-heading {
padding-top: 10px;
@extend .NotoSans-bold;
font-size: 1.350em;
width: 60%;
color: #333333;
font-size: 16px;
}
.view-all-link {
font-size: 1.2rem;
Expand Down Expand Up @@ -196,7 +197,7 @@ page-resources {
}

.medium-pill {
min-width: 120px;
min-width: 106px;
// height: 30px;
height: 100%;
// border-radius: 2px !important;
Expand Down Expand Up @@ -232,10 +233,10 @@ page-resources {
.class-filter-cotainer {
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
background-color: #f4f4f4;
margin-bottom: 4px;
}

.class-pill {
min-width: 75px;
min-width: 47px;
// height: 30px;
// border-radius: 15px !important;
// box-shadow: 0 3px 4px 0 rgba(0, 0, 0, 0.12);
Expand All @@ -256,25 +257,23 @@ page-resources {
// box-shadow: 0 3px 4px 0 rgba(0, 0, 0, 0.19);
// background-color: #024f9d;
// color: #ffffff;
opacity: 1;
opacity: 1.5;
}
&:last-child {
@include margin(0, 30, 0, 0);
}
}
.app-icon{
width:100%;
height:50px;
}
.section-solid{
background-color: #ffffff;
.heading{
font-size: 18px;
font-size: 16px;
font-weight: bold;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: -0.5px;
color: #024f9d;
color: #333333;
padding-bottom: 4px;
}
.card-container {
width:100%;
Expand Down Expand Up @@ -318,10 +317,9 @@ page-resources {
grid-template-columns: 1fr;
grid-template-rows: 1fr;
.img-container {
background-color: grey;
width:100%;
min-height:70px;
max-height:70px;
background-color: #d8d8d8;
width: 56px;
height: 56px;
}
}
.right {
Expand Down Expand Up @@ -359,6 +357,4 @@ page-resources {
}
}
}
}


}
Loading

0 comments on commit 2057971

Please sign in to comment.