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

MOBILE-2795 style: Improvement on item border styles

main
Pau Ferrer Ocaña 2019-01-07 11:41:07 +01:00
parent 746ebf5afe
commit 7b93786176
9 changed files with 56 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/addon/block/timeline/components/events/events.scss
View File

@ -1,19 +1,7 @@
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;
}
.core-course-module-handler.item-ios.item-block .item-inner {
border-bottom: $hairlines-width solid $list-ios-border-color;
}
.core-course-module-handler.item-wp.item-block .item-inner {
border-bottom: 1px solid $list-wp-border-color;
}
.core-course-module-handler.item:last-child .item-inner {
border-bottom: 0;
.core-course-module-handler.item {
@include core-items();
}
.core-course-module-handler.item .item-heading:first-child {

35
src/addon/mod/workshop/components/assessment/assessment.scss
View File

@ -1,35 +1,4 @@
ion-app.app-root addon-mod-workshop-assessment {
.item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;
}
.item-ios.item-block .item-inner {
border-bottom: $hairlines-width solid $list-ios-border-color;
}
.item-wp.item-block .item-inner {
border-bottom: 1px solid $list-wp-border-color;
}
&:last-child .item .item-inner {
border-bottom: 0;
}
}
ion-app.app-root 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;
}
.item-ios.item-block .item-inner {
border-bottom: $hairlines-width solid $list-ios-border-color;
}
.item-wp.item-block .item-inner {
border-bottom: 1px solid $list-wp-border-color;
}
&:last-child .item .item-inner {
border-bottom: 0;
}
@include core-as-items();
}

35
src/addon/mod/workshop/components/submission/submission.scss
View File

@ -1,35 +1,4 @@
ion-app.app-root addon-mod-workshop-submission {
.item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;
}
.item-ios.item-block .item-inner {
border-bottom: $hairlines-width solid $list-ios-border-color;
}
.item-wp.item-block .item-inner {
border-bottom: 1px solid $list-wp-border-color;
}
&:last-child .item .item-inner {
border-bottom: 0;
}
}
ion-app.app-root 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;
}
.item-ios.item-block .item-inner {
border-bottom: $hairlines-width solid $list-ios-border-color;
}
.item-wp.item-block .item-inner {
border-bottom: 1px solid $list-wp-border-color;
}
&:last-child .item .item-inner {
border-bottom: 0;
}
@include core-as-items();
}

9
src/app/app.ios.scss
View File

@ -70,15 +70,6 @@ ion-app.app-root.ios {
}
}
// Recover borders on items inside cards.
.card-ios.with-borders .item-ios.item-block .item-inner {
border-bottom: $hairlines-width solid $list-ios-border-color;
}
.card-ios.with-borders .item-ios:last-child .item-inner {
border-bottom: 0;
}
.radio-ios .radio-icon {
@include position(0, null, null, 0);
@include margin(0);

8
src/app/app.md.scss
View File

@ -48,14 +48,6 @@ ion-app.app-root.md {
}
}
// Recover borders on items inside cards.
.card-md.with-borders .item-md.item-block .item-inner {
border-bottom: 1px solid $list-md-border-color;
}
.card-md.with-borders .item-md:last-child .item-inner {
border-bottom: 0;
}
.action-sheet-md {
.action-sheet-title,
.action-sheet-container > .action-sheet-group:first-child {

10
src/app/app.scss
View File

@ -96,6 +96,16 @@ ion-app.app-root {
border: 0;
}
// Recover borders on items inside cards.
.card.with-borders .core-as-item,
.core-as-item {
@include core-as-items();
}
.card.with-borders .item {
@include core-items();
}
.core-oauth-icon, .item.core-oauth-icon, .list .item.core-oauth-icon {
min-height: 32px;
img, .label {

8
src/app/app.wp.scss
View File

@ -47,12 +47,4 @@ ion-app.app-root.wp {
@include padding(null, null, null, 15px * $i + $item-wp-padding-start);
}
}
// Recover borders on items inside cards.
.card-wp.with-borders .item-wp.item-block .item-inner {
border-bottom: 1px solid $list-wp-border-color;
}
.card-wp.with-borders .item-wp:last-child .item-inner {
border-bottom: 0;
}
}

4
src/components/file/file.scss
View File

@ -13,4 +13,8 @@ ion-app.app-root {
core-file + core-file > .item-wp.item-block > .item-inner {
border-top: 1px solid $list-wp-border-color;
}
core-file > .item.item-block > .item-inner {
border-bottom: 0;
}
}

36
src/theme/variables.scss
View File

@ -433,6 +433,42 @@ $core-question-state-incorrect-color: $red-light !default;
}
}
@mixin core-as-items() {
.item-md.item-block > .item-inner {
border-bottom: 1px solid $list-md-border-color;
}
.item-ios.item-block > .item-inner {
border-bottom: $hairlines-width solid $list-ios-border-color;
}
.item-wp.item-block > .item-inner {
border-bottom: 1px solid $list-wp-border-color;
}
&:last-child .item > .item-inner {
border-bottom: 0;
}
}
@mixin core-items() {
&.item-md.item-block > .item-inner {
border-bottom: 1px solid $list-md-border-color;
}
&.item-ios.item-block > .item-inner {
border-bottom: $hairlines-width solid $list-ios-border-color;
}
&.item-wp.item-block > .item-inner {
border-bottom: 1px solid $list-wp-border-color;
}
&:last-child > .item-inner {
border-bottom: 0;
}
}
// Font Awesome
$fa-font-path: $font-path;
@import "font-awesome";