EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1669 from crazyserver/MOBILE-2629 

Mobile 2629
main
Juan Leyva 2018-12-17 14:20:36 +01:00 committed by GitHub
parent 9d5e0479e3 6931391fb4
commit cbc25c322d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
View File

@ -3,7 +3,7 @@
</ion-item-divider>
<core-loading [hideUntil]="loaded" class="core-loading-center">
<div class="core-horizontal-scroll" *ngIf="items && items.length > 0">
<ng-container *ngFor="let item of items">
<div *ngFor="let item of items">
<ion-card>
<a ion-item text-wrap detail-none class="core-course-module-handler item-media" (click)="action($event, item)" [title]="item.name">
<img item-start [src]="item.iconUrl" alt="" role="presentation" *ngIf="item.iconUrl" class="core-module-icon">
@ -11,7 +11,7 @@
<p><core-format-text [text]="item.coursename"></core-format-text></p>
</a>
</ion-card>
</ng-container>
</div>
</div>
<core-empty-box *ngIf="items.length <= 0" image="assets/img/icons/activities.svg" [message]="'addon.block_recentlyaccesseditems.noitems' | translate"></core-empty-box>

2
src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
View File

@ -1,3 +1,3 @@
ion-app.app-root addon-block-recentlyaccesseditems .core-horizontal-scroll .card {
ion-app.app-root addon-block-recentlyaccesseditems .core-horizontal-scroll > div {
@include horizontal_scroll_item(80%, 250px, 300px);
}

3
src/components/ion-tabs/ion-tabs.scss
View File

@ -16,7 +16,10 @@ ion-app.app-root core-ion-tabs {
}
}
}
}
.tab-badge.badge {
background-color: $ion-tabs-badge-color;
}
}

2
src/components/tabs/tabs.scss
View File

@ -44,7 +44,7 @@ ion-app.app-root .core-tabs-bar {
&[aria-selected=true] {
color: $core-top-tabs-color-active !important;
border: 0 !important;
border-bottom: 2px solid $core-top-tabs-color-active !important;
border-bottom: 2px solid $core-top-tabs-border-active !important;
}
}

5
src/core/courses/components/course-progress/course-progress.scss
View File

@ -100,12 +100,11 @@ ion-app.app-root core-courses-course-progress {
ion-app.app-root .core-horizontal-scroll core-courses-course-progress {
@include horizontal_scroll_item(45%, 210px, 300px);
@include horizontal_scroll_item(80%, 250px, 300px);
ion-card.card {
.core-course-thumb {
padding-top: 40%;
padding-top: 30%;
}
.core-course-link {

2
src/core/login/pages/credentials/credentials.html
View File

@ -43,7 +43,7 @@
<ion-list *ngIf="identityProviders && identityProviders.length" padding-top>
<ion-list-header text-wrap>{{ 'core.login.potentialidps' | translate }}</ion-list-header>
<button ion-item *ngFor="let provider of identityProviders" text-wrap class="core-oauth-icon" (click)="oauthClicked(provider)" title="{{provider.name}}">
<img [src]="provider.iconurl" alt="{{provider.name}}" item-start>
<img [src]="provider.iconurl" alt="" width="32" height="32" item-start>
{{provider.name}}
</button>
</ion-list>

21
src/core/login/pages/reconnect/reconnect.scss
View File

@ -18,6 +18,16 @@ ion-app.app-root page-core-login-reconnect {
background: $core-login-box-background-color;
border: 1px solid $core-login-box-background-border;
color: $core-login-box-text-color;
.item {
background: $core-login-item-background-color;
@include padding-horizontal(0);
}
.item-inner {
background: $core-login-item-inner-background-color;
@include padding-horizontal(0);
}
}
.core-sitename, .core-siteurl {
@ -41,14 +51,11 @@ ion-app.app-root page-core-login-reconnect {
}
.list .core-username {
&.item-md {
@include padding-horizontal($item-md-padding-start, $content-padding);
&.item {
@include padding-horizontal(0);
}
&.item-ios {
@include padding-horizontal($item-ios-padding-start, $content-padding);
}
&.item-wp {
@include padding-horizontal($item-wp-padding-start, $content-padding);
.item-heading {
margin-top: 0;
}
.item-inner {

2
src/core/login/pages/site/site.scss
View File

@ -1,6 +1,6 @@
ion-app.app-root page-core-login-site {
.scroll-content {
background: $core-login-page-background-color;
background-color: $core-login-page-background-color;
}
img.login-logo {

4
src/theme/variables.scss
View File

@ -107,6 +107,7 @@ $tabs-background: $gray-darker !default;
$tabs-border-color: #b2b2b2 !default;
$tabs-tab-color-active: $core-color !default;
$tabs-tab-color-inactive: $white !default;
$ion-tabs-badge-color: $tabs-tab-color-active !default;
$text-input-highlight-color-valid: $green !default;
$text-input-highlight-color-invalid: $red !default;
@ -147,6 +148,8 @@ $core-login-box-background-border: $gray !default;
$core-login-box-text-color: $text-color !default;
$core-login-button-outline: false !default;
$core-login-loading-color: false !default;
$core-login-item-inner-background-color: $white !default;
$core-login-item-background-color: $white !default;
// App iOS Variables
// --------------------------------------------------
@ -241,6 +244,7 @@ $core-top-tabs-background: $white !default;
$core-top-tabs-color: $gray-dark !default;
$core-top-tabs-border: $gray !default;
$core-top-tabs-color-active: $core-color !default;
$core-top-tabs-border-active: $core-top-tabs-color-active !default;
$core-splitview-selected: $core-color-light !default;
$core-progressbar-color: $core-color-light !default;