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

Merge pull request #1592 from crazyserver/MOBILE-2716 

Mobile 2716
main
Juan Leyva 2018-11-09 15:17:24 +01:00 committed by GitHub
parent 9e95285f62 c584b9ae13
commit b050eec61a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/qtype/ddmarker/component/ddmarker.scss
View File

@ -45,7 +45,7 @@ addon-qtype-ddmarker {
div.ddarea .markertexts { div.ddarea .markertexts {
min-height: 80px; min-height: 80px;
position: absolute; position: absolute;
text-align: left; @include text-align('start');
} }
.dropbackground { .dropbackground {
margin: 0 auto; margin: 0 auto;

12
src/app/app.scss
View File

@ -205,6 +205,7 @@ ion-app.app-root {
} }
input { input {
@include text-align('end');
@include rtl() { @include rtl() {
text-align: right; text-align: right;
} }
@ -248,7 +249,7 @@ ion-app.app-root {
.core-show-more { .core-show-more {
color: color($colors, dark); color: color($colors, dark);
text-align: right; @include text-align('end');
font-size: 14px; font-size: 14px;
display: block; display: block;
position: absolute; position: absolute;
@ -423,7 +424,7 @@ ion-app.app-root {
width: 100%; width: 100%;
.select-text { .select-text {
white-space: normal; white-space: normal;
text-align: right; @include text-align('end');
} }
} }
@ -448,6 +449,7 @@ ion-app.app-root {
white-space: normal; white-space: normal;
align-self: start; align-self: start;
max-width: none; max-width: none;
@include text-align('start');
&.select-md, &.select-md,
&.button-md { &.button-md {
@ -481,7 +483,7 @@ ion-app.app-root {
ion-icon:last-child { ion-icon:last-child {
@include margin(null, null, null, 5px); @include margin(null, null, null, 5px);
text-align: right; @include text-align('end');
flex-grow: 2; flex-grow: 2;
} }
} }
@ -891,7 +893,7 @@ ion-app.app-root {
.alert-head { .alert-head {
padding: 5px 10px; padding: 5px 10px;
text-align: left; @include text-align('start');
h2 { h2 {
font-size: 14px; font-size: 14px;
} }
@ -899,7 +901,7 @@ ion-app.app-root {
.alert-message { .alert-message {
padding: 5px 10px; padding: 5px 10px;
text-align: left; @include text-align('start');
p { p {
font-size: 14px; font-size: 14px;
margin-top: 5px; margin-top: 5px;

4
src/core/course/components/format/core-course-format.html
View File

@ -20,9 +20,9 @@
<!-- Section selector. --> <!-- Section selector. -->
<core-dynamic-component [component]="sectionSelectorComponent" [data]="data"> <core-dynamic-component [component]="sectionSelectorComponent" [data]="data">
<div text-wrap *ngIf="displaySectionSelector && sections && sections.length" padding class="clearfix" ion-row justify-content-between> <div text-wrap *ngIf="displaySectionSelector && sections && sections.length" padding class="clearfix" ion-row justify-content-between>
<button float-start ion-button icon-start (click)="showSectionSelector($event)" color="light" class="core-button-select button-no-uppercase" ion-col> <button float-start ion-button icon-start icon-end (click)="showSectionSelector($event)" color="light" class="core-button-select button-no-uppercase" ion-col>
<core-icon name="fa-folder"></core-icon> <core-icon name="fa-folder"></core-icon>
{{selectedSection && (selectedSection.formattedName || selectedSection.name) || 'core.course.sections' | translate }} <span class="core-section-selector-text">{{selectedSection && (selectedSection.formattedName || selectedSection.name) || 'core.course.sections' | translate }}</span>
<ion-icon name="arrow-dropdown" ios="md-arrow-dropdown"></ion-icon> <ion-icon name="arrow-dropdown" ios="md-arrow-dropdown"></ion-icon>
</button> </button>
<!-- Section download. --> <!-- Section download. -->

7
src/core/course/components/format/format.scss
View File

@ -6,6 +6,13 @@ ion-app.app-root ion-badge.core-course-download-section-progress {
ion-app.app-root core-course-format { ion-app.app-root core-course-format {
button.core-button-select .core-section-selector-text {
overflow: hidden;
text-overflow: ellipsis;
line-height: 2em;
white-space: nowrap;
}
.core-format-progress-list { .core-format-progress-list {
margin-bottom: 0; margin-bottom: 0;

2
src/core/grades/components/course/course.scss
View File

@ -13,7 +13,7 @@ ion-app.app-root core-grades-course {
@include padding(10px, 10px, 10px, null); @include padding(10px, 10px, 10px, null);
vertical-align: top; vertical-align: top;
white-space: normal; white-space: normal;
text-align: left; @include text-align('start');
} }
thead th { thead th {
vertical-align: bottom; vertical-align: bottom;