Merge pull request #1500 from crazyserver/MOBILE-2567

Mobile 2567
main
Juan Leyva 2018-09-03 09:51:56 +01:00 committed by GitHub
commit 493af0d66f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
92 changed files with 1283 additions and 1359 deletions

View File

@ -1,3 +0,0 @@
page-addon-calendar-event {
}

View File

@ -1,3 +0,0 @@
page-addon-calendar-list {
}

View File

@ -1,3 +0,0 @@
page-addon-calendar-settings {
}

View File

@ -1,4 +1,4 @@
addon-messages-discussions {
ion-app.app-root addon-messages-discussions {
h2 {
display: flex;
justify-content: space-between;

View File

@ -1,4 +1,4 @@
addon-messages-discussions {
ion-app.app-root addon-messages-discussions {
h2 {
display: flex;
justify-content: space-between;
@ -7,6 +7,7 @@ addon-messages-discussions {
margin: 0;
align-self: flex-end;
display: inline-flex;
font-size: initial;
}
}
}

View File

@ -4,8 +4,7 @@ $item-message-note-text: $gray-dark !default;
$item-message-note-font-size: 75% !default;
$item-message-mine-bg: $blue-light !default;
page-addon-messages-discussion {
ion-app.app-root page-addon-messages-discussion {
.addon-messages-discussion-container {
display: flex;
flex-direction: column;
@ -104,3 +103,8 @@ page-addon-messages-discussion {
padding: 0;
}
}
ion-app.app-root.ios page-addon-messages-discussion ion-footer .toolbar:last-child {
padding-bottom: 4px;
min-height: 0;
}

View File

@ -1,4 +1,4 @@
page-addon-messages-settings {
ion-app.app-root page-addon-messages-settings {
.list-header {
margin-bottom: 0;
border-top: 0;

View File

@ -1,4 +1,4 @@
addon-mod-assign-submission {
ion-app.app-root addon-mod-assign-submission {
div.latesubmission,
div.overdue {
// @extend .core-danger-item;

View File

@ -21,13 +21,11 @@ import { CoreDirectivesModule } from '@directives/directives.module';
import { CoreCourseComponentsModule } from '@core/course/components/components.module';
import { AddonModBookIndexComponent } from './index/index';
import { AddonModBookTocPopoverComponent } from './toc-popover/toc-popover';
import { AddonModBookNavigationArrowsComponent } from './navigation-arrows/navigation-arrows';
@NgModule({
declarations: [
AddonModBookIndexComponent,
AddonModBookTocPopoverComponent,
AddonModBookNavigationArrowsComponent
AddonModBookTocPopoverComponent
],
imports: [
CommonModule,
@ -41,8 +39,7 @@ import { AddonModBookNavigationArrowsComponent } from './navigation-arrows/navig
],
exports: [
AddonModBookIndexComponent,
AddonModBookTocPopoverComponent,
AddonModBookNavigationArrowsComponent
AddonModBookTocPopoverComponent
],
entryComponents: [
AddonModBookIndexComponent,

View File

@ -18,9 +18,9 @@
<core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<div padding>
<addon-mod-book-navigation-arrows [previous]="previousChapter" [next]="nextChapter" (action)="changeChapter($event)"></addon-mod-book-navigation-arrows>
<core-navigation-bar [previous]="previousChapter > 0 && previousChapter" [next]="nextChapter > 0 && nextChapter" (action)="changeChapter($event)"></core-navigation-bar>
<core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent"></core-format-text>
<addon-mod-book-navigation-arrows [previous]="previousChapter" [next]="nextChapter" (action)="changeChapter($event)"></addon-mod-book-navigation-arrows>
<core-navigation-bar [previous]="previousChapter > 0 && previousChapter" [next]="nextChapter > 0 && nextChapter" (action)="changeChapter($event)"></core-navigation-bar>
</div>
</core-loading>

View File

@ -1,14 +0,0 @@
<ion-grid>
<ion-row>
<ion-col>
<a ion-button icon-only clear *ngIf="previous > 0" (click)="action.emit(previous)" title="{{ 'core.previous' | translate }}">
<ion-icon name="arrow-back" md="ios-arrow-back"></ion-icon>
</a>
</ion-col>
<ion-col text-right>
<a ion-button icon-only clear *ngIf="next > 0" (click)="action.emit(next)" title="{{ 'core.next' | translate }}">
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
</a>
</ion-col>
</ion-row>
</ion-grid>

View File

@ -1,32 +0,0 @@
// (C) Copyright 2015 Martin Dougiamas
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import { Component, Input, Output, EventEmitter } from '@angular/core';
/**
* Component to navigate to previous or next chapter in a book.
*/
@Component({
selector: 'addon-mod-book-navigation-arrows',
templateUrl: 'addon-mod-assign-submission-navigation-arrows.html'
})
export class AddonModBookNavigationArrowsComponent {
@Input() previous?: string; // Previous chapter ID.
@Input() next?: string; // Next chapter ID.
@Output() action?: EventEmitter<string>; // Will emit an event when the item clicked.
constructor() {
this.action = new EventEmitter();
}
}

View File

@ -1,4 +1,4 @@
page-addon-mod-chat-chat {
ion-app.app-root page-addon-mod-chat-chat {
.addon-mod-chat-notice {
margin-top: 10px;
margin-bottom: 10px;

View File

@ -1,4 +1,4 @@
page-addon-mod-chat-users {
ion-app.app-root page-addon-mod-chat-users {
.addon-mod-chat-user ion-label {
margin-bottom: 0;
}

View File

@ -1,4 +1,4 @@
page-addon-mod-feedback-form {
ion-app.app-root page-addon-mod-feedback-form {
.addon-mod_feedback-form-content {
align-self: self-start;
width: 100%;

View File

@ -1,4 +1,4 @@
addon-mod-folder-index {
ion-app.app-root addon-mod-folder-index {
.item-media > img:first-child {
width: 24px;
height: 24px;

View File

@ -1,4 +1,4 @@
addon-mod-forum-index {
ion-app.app-root addon-mod-forum-index {
.addon-forum-discussion-selected {
border-top: 5px solid $core-splitview-selected;
}

View File

@ -1,4 +1,4 @@
addon-mod-imscp-index {
ion-app.app-root addon-mod-imscp-index {
.addon-mod-imscp-container {
position: absolute;
width: 100%;

View File

@ -1,2 +0,0 @@
addon-mod-lesson-index {
}

View File

@ -1,4 +1,4 @@
page-addon-mod-lesson-menu-modal {
ion-app.app-root page-addon-mod-lesson-menu-modal {
.addon-mod_lesson-selected, .item.addon-mod_lesson-selected {
background: $blue-light;
}

View File

@ -1,4 +1,4 @@
page-addon-mod-lesson-player {
ion-app.app-root page-addon-mod-lesson-player {
.addon-mod_lesson-slideshow {
max-width: 100%;
max-height: 100%;

View File

@ -1,4 +1,4 @@
page-addon-mod-lesson-user-retake {
ion-app.app-root page-addon-mod-lesson-user-retake {
.addon-mod_lesson-highlight {
background: $blue-light;
.label, .label p {

View File

@ -1,4 +1,4 @@
addon-mod-quiz-connection-error {
ion-app.app-root addon-mod-quiz-connection-error {
background-color: $red-light;
.item {

View File

@ -1,4 +1,4 @@
addon-mod-quiz-index {
ion-app.app-root addon-mod-quiz-index {
.addon-mod_quiz-table {
.addon-mod_quiz-table-header .item-inner {

View File

@ -1,4 +1,4 @@
page-addon-mod-quiz-navigation-modal {
ion-app.app-root page-addon-mod-quiz-navigation-modal {
.addon-mod_quiz-selected, .item.addon-mod_quiz-selected {
@include border-start(5px, solid, $core-splitview-selected);
font-weight: bold;

View File

@ -1,4 +1,4 @@
page-addon-mod-quiz-player {
ion-app.app-root page-addon-mod-quiz-player {
.toolbar {
padding-top: 0;
padding-bottom: 0;

View File

@ -1,4 +1,4 @@
page-addon-mod-quiz-review {
ion-app.app-root page-addon-mod-quiz-review {
.item-radio-disabled,
.item-checkbox-disabled,
.text-input[disabled] {

View File

@ -1,4 +1,4 @@
addon-mod-scorm-index {
ion-app.app-root addon-mod-scorm-index {
.addon-mod_scorm-toc {
img {

View File

@ -1,3 +0,0 @@
addon-mod-scorm-toc-popover {
}

View File

@ -1,4 +1,4 @@
addon-mod-survey-index {
ion-app.app-root addon-mod-survey-index {
.label, .label[stacked] {
font-size: initial;

View File

@ -4,7 +4,7 @@ $addon-mod-wiki-toc-title-color: $gray-darker !default;
$addon-mod-wiki-toc-border-color: $gray-dark !default;
$addon-mod-wiki-toc-background-color: $gray-light !default;
addon-mod-wiki-index {
ion-app.app-root addon-mod-wiki-index {
background-color: $white;
.core-tabs-content-container,

View File

@ -1,4 +1,4 @@
addon-mod-wiki-subwiki-picker {
ion-app.app-root addon-mod-wiki-subwiki-picker {
$core-subwiki-selected: $core-color !default;

View File

@ -1,4 +1,4 @@
page-addon-mod-wiki-edit {
ion-app.app-root page-addon-mod-wiki-edit {
.addon-mod_wiki-wrongversionlock .label {
margin: 0;
}

View File

@ -1,4 +1,4 @@
addon-mod-workshop-assessment {
ion-app.app-root addon-mod-workshop-assessment {
.item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;
}
@ -16,7 +16,7 @@ addon-mod-workshop-assessment {
}
}
.card.with-borders addon-mod-workshop-assessment {
ion-app.app-root .card.with-borders addon-mod-workshop-assessment {
.item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;
}

View File

@ -1,4 +1,4 @@
addon-mod-workshop-submission {
ion-app.app-root addon-mod-workshop-submission {
.item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;
}
@ -16,7 +16,7 @@ addon-mod-workshop-submission {
}
}
.card.with-borders addon-mod-workshop-submission {
ion-app.app-root .card.with-borders addon-mod-workshop-submission {
.item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;
}

View File

@ -1,4 +1,4 @@
page-addon-mod-workshop-phase-info {
ion-app.app-root page-addon-mod-workshop-phase-info {
.core-workshop-phase-selected {
background-color: $white;
@include border-start(5px, solid, $core-splitview-selected);

View File

@ -1,4 +1,4 @@
page-addon-notifications-settings {
ion-app.app-root page-addon-notifications-settings {
.list-header {
margin-bottom: 0;
border-top: 0;

View File

@ -1,4 +1,4 @@
ion-app.app-root.ios {
.button-ios {
min-height: $button-ios-height
}
@ -21,8 +21,9 @@
@include margin($item-ios-padding-icon-top, null, $item-ios-padding-icon-bottom, 0);
}
@each $color-name, $color-base, $color-contrast in get-colors($colors-ios) {
.ios .core-#{$color-name}-card {
.core-#{$color-name}-card {
@extend .card-ios ;
@extend .card-content-ios;
@ -36,19 +37,24 @@
}
}
.ios .core-avoid-header ion-content {
.core-avoid-header ion-content {
top: $navbar-ios-height;
height: calc(100% - #{($navbar-ios-height)});
}
.platform-cordova.ios .core-avoid-header ion-content.statusbar-padding,
.platform-cordova.ios .core-avoid-header .menu-inner > ion-content {
top: $navbar-ios-height + $cordova-ios-statusbar-padding;
&.platform-cordova .core-avoid-header ion-content.statusbar-padding,
&.platform-cordova .core-avoid-header .menu-inner > ion-content {
height: calc(100% - #{($navbar-ios-height + $cordova-ios-statusbar-padding)});
height: calc(100% - #{($navbar-ios-height)} - constant(safe-area-inset-top));
height: calc(100% - #{($navbar-ios-height)} - env(safe-area-inset-top));
top: calc(#{$navbar-ios-height + $cordova-ios-statusbar-padding});
top: calc(#{$navbar-ios-height} + constant(safe-area-inset-top));
top: calc(#{$navbar-ios-height} + env(safe-area-inset-top));
}
.platform-cordova.ios .core-avoid-header .core-avoid-header .menu-inner > ion-content,
.platform-cordova.ios core-tab core-split-view .core-avoid-header .menu-inner > ion-content {
&.platform-cordova .core-avoid-header .core-avoid-header .menu-inner > ion-content,
core-tab core-split-view .core-avoid-header .menu-inner > ion-content {
top: 0;
height: 100%;
}
@ -120,7 +126,7 @@
// Different levels of padding.
@for $i from 0 through 15 {
.ios .core-padding-#{$i} {
.core-padding-#{$i} {
@include padding(null, null, null, 15px * $i + $item-ios-padding-start);
}
}
@ -132,3 +138,4 @@
.card-ios.with-borders .item-ios:last-child .item-inner {
border-bottom: 0;
}
}

View File

@ -1,4 +1,4 @@
ion-app.app-root.md {
.button-md {
min-height: $button-md-height;
}
@ -22,7 +22,7 @@
}
@each $color-name, $color-base, $color-contrast in get-colors($colors-md) {
.md .core-#{$color-name}-card {
.core-#{$color-name}-card {
@extend .card-md;
@extend .card-content-md;
@ -36,7 +36,7 @@
}
}
.md .core-avoid-header ion-content {
.core-avoid-header ion-content {
top: $navbar-md-height;
height: calc(100% - #{($navbar-md-height)});
}
@ -108,12 +108,11 @@
// Different levels of padding.
@for $i from 0 through 15 {
.md .core-padding-#{$i} {
.core-padding-#{$i} {
@include padding(null, null, null, 15px * $i + $item-md-padding-start);
}
}
// Recover borders on items inside cards.
.card-md.with-borders .item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;
@ -121,3 +120,4 @@
.card-md.with-borders .item-md:last-child .item-inner {
border-bottom: 0;
}
}

View File

@ -18,6 +18,7 @@
// Alignment
// -------------------------
ion-app.app-root {
.text-left { text-align: left; }
.text-right { text-align: right; }
.text-center { text-align: center; }
@ -89,8 +90,6 @@
}
}
// Define an alternative way to set a heading in an item without using a heading tag.
// This is done for accessibility reasons when a heading is semantically incorrect.
.item .item-heading {
@ -412,7 +411,6 @@ ion-col ion-select {
}
}
:not(.item) > * > * > ion-select,
.core-button-select {
background-color: white;
@ -462,7 +460,6 @@ ion-col ion-select {
// File uploader.
// -------------------------
.core-fileuploader-file-handler {
position: relative;
@ -886,16 +883,6 @@ ion-alert.core-inapp-notification {
}
}
body.keyboard-is-open {
.scroll-content, .fixed-content {
margin-bottom: 0 !important;
}
core-ion-tabs .tabbar {
display: none;
}
}
.item.item-radio, .item.item-checkbox {
// Fix links and videos in ion-radio and ion-checkbox.
.input-wrapper {
@ -920,6 +907,27 @@ body.keyboard-is-open {
}
}
// Fix modals displayed over action sheet.
.disable-scroll ion-modal .ion-page {
pointer-events: initial;
}
}
[dir="ltr"] body, [dir="rtl"] body {
padding-top: constant(safe-area-inset-top); //for iOS 11.2
padding-top: env(safe-area-inset-top); //for iOS 11.1
}
body.keyboard-is-open {
.scroll-content, .fixed-content {
margin-bottom: 0 !important;
}
core-ion-tabs .tabbar {
display: none;
}
}
// Fix iframes in fullscreen mode.
//
// Ionic sets "contain: strict" to some elements. This enables paint containment,
@ -936,8 +944,3 @@ ion-modal,
.split-pane {
contain: size layout style;
}
// Fix modals displayed over action sheet.
.disable-scroll ion-modal .ion-page {
pointer-events: initial;
}

View File

@ -1,4 +1,4 @@
ion-app.app-root.wp {
.button-wp {
min-height: $button-wp-height;
}
@ -22,7 +22,7 @@
}
@each $color-name, $color-base, $color-contrast in get-colors($colors-wp) {
.wp .core-#{$color-name}-card {
.core-#{$color-name}-card {
@extend .card-wp ;
@extend .card-content-wp;
@ -36,14 +36,14 @@
}
}
.wp .core-avoid-header ion-content {
.core-avoid-header ion-content {
top: $navbar-wp-height;
height: calc(100% - #{($navbar-wp-height)});
}
// Different levels of padding.
@for $i from 0 through 15 {
.wp .core-padding-#{$i} {
.core-padding-#{$i} {
@include padding(null, null, null, 15px * $i + $item-wp-padding-start);
}
}
@ -55,3 +55,4 @@
.card-wp.with-borders .item-wp:last-child .item-inner {
border-bottom: 0;
}
}

View File

@ -1,4 +1,4 @@
core-chart {
ion-app.app-root core-chart {
display: block;
canvas {

View File

@ -1,4 +1,4 @@
core-context-menu-popover {
ion-app.app-root core-context-menu-popover {
.item-md ion-icon[item-start] + .item-inner,
.item-md ion-icon[item-start] + .item-input {
@include margin-horizontal(5px, null);

View File

@ -1,4 +1,4 @@
<button [hidden]="hideMenu" ion-button clear icon-only [attr.aria-label]="ariaLabel" (click)="showContextMenu($event)">
<button [hidden]="hideMenu" ion-button clear icon-only [attr.aria-label]="ariaLabel" (click)="showContextMenu($event)" class="bar-button">
<core-icon [name]="icon"></core-icon>
</button>
<ng-content></ng-content>

View File

@ -1,4 +1,4 @@
core-empty-box {
ion-app.app-root core-empty-box {
.core-empty-box {
position: absolute;
@include position(0, 0, 0, 0);

View File

@ -1,3 +1,4 @@
ion-app.app-root {
.card-md core-file + core-file > .item-md.item-block > .item-inner {
border-top: 1px solid $list-md-border-color;
}
@ -9,3 +10,4 @@
.card-wp core-file + core-file > .item-wp.item-block > .item-inner {
border-top: 1px solid $list-wp-border-color;
}
}

View File

@ -1,4 +1,4 @@
core-iframe {
ion-app.app-root core-iframe {
> div {
height: 100%;
}

View File

@ -1,4 +1,4 @@
core-input-errors {
ion-app.app-root core-input-errors {
width: 100%;
.core-input-error-container {

View File

@ -1,4 +1,4 @@
core-ion-tabs {
ion-app.app-root core-ion-tabs {
.tabbar {
z-index: 101; // For some reason, the regular z-index isn't enough with our tabs, use a higher one.
@ -20,15 +20,15 @@ core-ion-tabs {
}
}
.ios core-ion-tabs .core-ion-tabs-loading {
ion-app.app-root.ios core-ion-tabs .core-ion-tabs-loading {
min-height: $tabs-ios-tab-min-height;
}
.md core-ion-tabs .core-ion-tabs-loading {
ion-app.app-root.md core-ion-tabs .core-ion-tabs-loading {
min-height: $tabs-md-tab-min-height;
}
.wp core-ion-tabs .core-ion-tabs-loading {
ion-app.app-root.wp core-ion-tabs .core-ion-tabs-loading {
min-height: $tabs-wp-tab-min-height;
}
@ -82,16 +82,14 @@ core-ion-tab.show-tab {
}
.ios {
core-ion-tab > .ion-page > ion-header .toolbar-ios {
padding-top: 4px;
}
ion-app.app-root.ios {
@include core-ion-tabs-statusbar-padding($toolbar-ios-height, $toolbar-ios-padding, $content-ios-padding, $cordova-ios-statusbar-padding, $cordova-ios-statusbar-padding-modal-max-width, true);
}
.md {
ion-app.app-root.md {
@include core-ion-tabs-statusbar-padding($toolbar-md-height, $toolbar-md-padding, $content-md-padding, $cordova-md-statusbar-padding, $cordova-md-statusbar-padding-modal-max-width);
}
.wp {
ion-app.app-root.wp {
@include core-ion-tabs-statusbar-padding($toolbar-wp-height, $toolbar-wp-padding, $content-wp-padding, $cordova-wp-statusbar-padding, $cordova-wp-statusbar-padding-modal-max-width);
}

View File

@ -1,3 +1,4 @@
ion-app.app-root {
core-loading {
@include core-transition(height, 200ms);
@ -48,3 +49,4 @@ core-loading.core-loading-loaded {
}
}
}
}

View File

@ -1,4 +1,4 @@
.core-input-required-asterisk, .icon.core-input-required-asterisk {
ion-app.app-root .core-input-required-asterisk, ion-app.app-root .icon.core-input-required-asterisk {
color: $red !important;
font-size: 8px;
@include padding(null, null, null, 4px);

View File

@ -1,3 +1,4 @@
core-navbar-buttons, .core-navbar-button-hidden {
ion-app.app-root core-navbar-buttons,
ion-app.app-root .core-navbar-button-hidden {
display: none !important;
}

View File

@ -1,18 +1,18 @@
<ion-grid no-padding *ngIf="previous || info || next">
<ion-row>
<ion-col text-left>
<a ion-button icon-only clear color="info" *ngIf="previous" (click)="action.emit(previous)" [title]="'core.previous' | translate">
<ion-icon name="arrow-dropleft-circle"></ion-icon>
<ion-col text-start>
<a ion-button icon-only clear *ngIf="previous" (click)="action.emit(previous)" [title]="'core.previous' | translate">
<ion-icon name="arrow-back" md="ios-arrow-back"></ion-icon>
</a>
</ion-col>
<ion-col text-center>
<a ion-button icon-only clear color="info" *ngIf="info" (click)="showInfo()" [title]="title">
<a ion-button icon-only clear *ngIf="info" (click)="showInfo()" [title]="title">
<ion-icon name="information-circle"></ion-icon>
</a>
</ion-col>
<ion-col text-right>
<a ion-button icon-only clear color="info" *ngIf="next" (click)="action.emit(next)" [title]="'core.next' | translate">
<ion-icon name="arrow-dropright-circle"></ion-icon>
<ion-col text-end>
<a ion-button icon-only clear *ngIf="next" (click)="action.emit(next)" [title]="'core.next' | translate">
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
</a>
</ion-col>
</ion-row>

View File

@ -1,6 +1,6 @@
$core-progress-bar-height: 5px !default;
core-progress-bar {
ion-app.app-root core-progress-bar {
@include padding(null, 55px, null, null);
position: relative;
display: block;

View File

@ -1,4 +1,4 @@
core-rich-text-editor {
ion-app.app-root core-rich-text-editor {
height: 40vh;
overflow: hidden;
min-height: 200px; /* Just in case vh is not supported */
@ -121,6 +121,6 @@ core-rich-text-editor {
}
.keyboard-is-open core-rich-text-editor {
body.keyboard-is-open ion-app.app-root core-rich-text-editor {
min-height: 200px;
}

View File

@ -1,4 +1,4 @@
core-search-box {
ion-app.app-root core-search-box {
.button.item-button[icon-only] {
margin: 0;
padding: ($content-padding / 2) $content-padding;

View File

@ -1,7 +1,7 @@
$core-send-message-input-background: $gray;
$core-send-message-input-color: $black;
core-send-message-form {
ion-app.app-root core-send-message-form {
background: $white;
form {

View File

@ -1,4 +1,4 @@
core-show-password {
ion-app.app-root core-show-password {
padding: 0px;
width: 100%;
position: relative;
@ -22,13 +22,13 @@ core-show-password {
}
}
.md {
ion-app.app-root.md {
.item-label-stacked core-show-password .button[icon-only] {
bottom: 0;
}
}
.ios {
ion-app.app-root.ios {
.item-label-stacked core-show-password .button[icon-only] {
bottom: -5px;
}
@ -37,7 +37,7 @@ core-show-password {
}
}
.wp {
ion-app.app-root.wp {
.item-label-stacked core-show-password .button[icon-only] {
bottom: 7px;
}

View File

@ -1,4 +1,4 @@
core-split-view {
ion-app.app-root core-split-view {
ion-menu.split-pane-side {
display: block;
@ -40,12 +40,3 @@ core-split-view {
padding-top: 0 !important;
}
}
.ios .split-pane {
.core-avoid-header ion-content.statusbar-padding,
.core-avoid-header .menu-inner > ion-content {
top: $navbar-ios-height;
height: calc(100% - #{($navbar-ios-height)});
}
}

View File

@ -1,4 +1,4 @@
.core-tabs-bar {
ion-app.app-root .core-tabs-bar {
@include position(null, null, null, 0);
position: relative;
z-index: $z-index-toolbar;
@ -49,7 +49,7 @@
}
}
.md .core-tabs-bar a.tab-slide {
ion-app.app-root.md .core-tabs-bar a.tab-slide {
// @extend .tabs-md .tab-button;
min-height: $tabs-md-tab-min-height;
@ -57,7 +57,7 @@
color: $tabs-md-tab-text-color;
}
.ios .core-tabs-bar a.tab-slide {
ion-app.app-root.ios .core-tabs-bar a.tab-slide {
// @extend .tabs-ios .tab-button;
max-width: $tabs-ios-tab-max-width;
min-height: $tabs-ios-tab-min-height;
@ -67,11 +67,7 @@
color: $tabs-ios-tab-text-color;
}
.ios .tabs:not(.tabs-ios[tabsPlacement=top]) .tabbar {
padding-bottom: 0;
}
.wp .core-tabs-bar a.tab-slide {
ion-app.app-root.wp .core-tabs-bar a.tab-slide {
//@extend .tabs-wp .tab-button;
@include border-radius(0);
@ -84,7 +80,7 @@
box-shadow: none;
}
core-tabs {
ion-app.app-root core-tabs {
.core-tabs-content-container {
height: 100%;
@ -129,11 +125,11 @@ core-tabs {
}
}
:not(.has-refresher) > .scroll-content.no-scroll {
ion-app.app-root :not(.has-refresher) > .scroll-content.no-scroll {
overflow: hidden !important;
}
.ios .core-tabs-bar {
ion-app.app-root.ios .core-tabs-bar {
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
@ -143,11 +139,11 @@ core-tabs {
}
}
.md .core-tabs-bar::after {
ion-app.app-root.md .core-tabs-bar::after {
@extend .header-md::after;
}
.ios, .md, .wp {
ion-app.app-root.ios, ion-app.app-root.md, ion-app.app-root.wp {
.core-avoid-header ion-content core-tabs core-tab ion-content {
top: 0 !important;
height: 100% !important;

View File

@ -311,7 +311,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
const width = this.domUtils.getElementWidth(this.slides.getNativeElement()) || this.slides.renderedWidth;
if (width) {
this.maxSlides = Math.floor(width / 120);
this.maxSlides = Math.floor(width / 100);
return;
}

View File

@ -1,4 +1,4 @@
core-timer {
ion-app.app-root core-timer {
.item.item-block .item-inner {
border: 0;
}

View File

@ -1,10 +1,10 @@
ion-badge.core-course-download-section-progress {
ion-app.app-root ion-badge.core-course-download-section-progress {
display: block;
@include float(start);
@include margin(12px, 12px, null, 12px);
}
core-course-format {
ion-app.app-root core-course-format {
.core-format-progress-list {
margin-bottom: 0;

View File

@ -1,4 +1,4 @@
core-course-module-completion a {
ion-app.app-root core-course-module-completion a {
img {
padding: 5px;
width: 30px;

View File

@ -1,4 +1,4 @@
core-course-module {
ion-app.app-root core-course-module {
background: white;
display: block;
@ -51,7 +51,7 @@ core-course-module {
}
}
.md core-course-module {
ion-app.app-root.md core-course-module {
.core-module-description {
@include padding(null, $label-md-margin-end, null, null);
margin-bottom: $label-md-margin-bottom;
@ -81,7 +81,7 @@ core-course-module {
}
}
.ios core-course-module {
ion-app.app-root.ios core-course-module {
.core-module-description {
@include padding(null, $label-ios-margin-end, null, null);
margin-bottom: $label-md-margin-bottom;
@ -106,7 +106,7 @@ core-course-module {
}
}
.wp core-course-module {
ion-app.app-root.wp core-course-module {
.core-module-description {
@include padding(null, $item-wp-padding-end / 2, null, null);
margin-bottom: $label-md-margin-bottom;

View File

@ -1,3 +0,0 @@
page-core-course-section {
}

View File

@ -1,4 +1,4 @@
core-courses-course-list-item {
ion-app.app-root core-courses-course-list-item {
.core-course-enrollment-img {
max-width: 16px;
max-height: 16px;

View File

@ -1,4 +1,4 @@
core-courses-course-progress {
ion-app.app-root core-courses-course-progress {
ion-card.card {
display: flex;
flex-direction: column;

View File

@ -1,4 +1,4 @@
core-courses-course-progress {
ion-app.app-root core-courses-course-progress {
.core-course-module-handler.item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;

View File

@ -1,4 +1,4 @@
page-core-courses-course-preview {
ion-app.app-root page-core-courses-course-preview {
.core-course-thumb {
height: 150px;
width: 100%;

View File

@ -1,3 +0,0 @@
page-core-courses-my-courses {
}

View File

@ -1,4 +1,4 @@
page-core-courses-my-overview {
ion-app.app-root page-core-courses-my-overview {
ion-badge.core-course-download-courses-progress {
display: block;
@include float(start);

View File

@ -1,3 +0,0 @@
page-core-courses-search {
}

View File

@ -1,4 +1,4 @@
page-core-emulator-capture-media {
ion-app.app-root page-core-emulator-capture-media {
ion-content {
.core-av-wrapper {
position: absolute;

View File

@ -1,4 +1,4 @@
core-grades-course {
ion-app.app-root core-grades-course {
.core-grades-table {
border-collapse: collapse;
line-height: 20px;
@ -74,7 +74,7 @@ core-grades-course {
}
}
.split-pane-side, .split-pane-main {
ion-app.app-root .split-pane-side, ion-app.app-root .split-pane-main {
core-grades-course .core-grades-table .hidden-phone {
display: none;
opacity: 0;

View File

@ -1,4 +1,4 @@
page-core-login-credentials {
ion-app.app-root page-core-login-credentials {
.scroll-content {
background: $core-login-page-background-color;
}

View File

@ -1,2 +0,0 @@
page-core-login-email-signup {
}

View File

@ -1,4 +1,4 @@
page-core-login-forgotten-password {
ion-app.app-root page-core-login-forgotten-password {
.content {
background: -webkit-radial-gradient(white, $gray-light);
background: radial-gradient(white, $gray-light);

View File

@ -1,4 +1,4 @@
page-core-login-init {
ion-app.app-root page-core-login-init {
.scroll-content {
background-color: $core-color-init-screen; /* Change this to add a bg image or change color */
background: -webkit-radial-gradient($core-color-init-screen-alt, $core-color-init-screen);

View File

@ -1,4 +1,4 @@
page-core-login-reconnect {
ion-app.app-root page-core-login-reconnect {
.scroll-content {
background: $core-login-page-background-color;
}

View File

@ -1,4 +1,4 @@
page-core-login-site-policy {
ion-app.app-root page-core-login-site-policy {
.card {
height: 300px;
}

View File

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

View File

@ -1,4 +1,4 @@
page-core-login-sites {
ion-app.app-root page-core-login-sites {
.item-button[icon-only] ion-icon {
font-size: 2.3em;
}

View File

@ -1,4 +1,4 @@
page-core-mainmenu {
ion-app.app-root page-core-mainmenu {
.ion-md-fa-graduation-cap,
.ion-ios-fa-graduation-cap,
.ion-ios-fa-graduation-cap-outline,

View File

@ -1,4 +1,4 @@
page-core-mainmenu-more {
ion-app.app-root page-core-mainmenu-more {
$core-more-icon: $gray-darker !default;
$core-more-background-ios: $list-ios-background-color !default;
$core-more-background-md: $list-md-background-color !default;

View File

@ -1,5 +0,0 @@
core-user-profile-field {
}

View File

@ -1,2 +0,0 @@
page-core-user-about {
}

View File

@ -1,4 +1,4 @@
page-core-user-profile {
ion-app.app-root page-core-user-profile {
.core-icon-foreground {
position: relative;
@include position(null, null, 30px, 60px);

View File

@ -1,4 +1,4 @@
page-core-viewer-iframe {
ion-app.app-root page-core-viewer-iframe {
core-loading .core-loading-content {
height: 100%;
}

View File

@ -1,4 +1,4 @@
.core-zoom-pane {
ion-app.app-root .core-zoom-pane {
height: 100%;
img {

View File

@ -147,7 +147,7 @@ $loading-ios-spinner-color: $core-loading-spinner-color;
$spinner-ios-ios-color: $core-spinner-color;
$tabs-ios-tab-color-inactive: $tabs-tab-color-inactive;
$button-ios-outline-background-color: $core-button-outline-background-color;
$toolbar-ios-height: 44px + 15;
$toolbar-ios-height: 44px + 8; // Avoid toolbar with different heights.
$checkbox-ios-icon-border-radius: 0px !default;
// App Material Design Variables
@ -164,7 +164,6 @@ $tabs-md-tab-color-inactive: $tabs-tab-color-inactive;
$button-md-outline-background-color: $core-button-outline-background-color;
$font-family-md-base: "Roboto", "Noto Sans", "Helvetica Neue", sans-serif !default;
// App Windows Variables
// --------------------------------------------------
// Windows only Sass variables can go here