From e35bebd9af415c200420cacef9937bc201af55e8 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 10 Jan 2020 10:15:11 +0100 Subject: [PATCH] MOBILE-3242 ui: Display different cursor in all clickable elements --- src/addon/calendar/components/calendar/calendar.scss | 2 ++ .../components/upcoming-events/upcoming-events.scss | 5 +++++ src/addon/calendar/pages/day/day.html | 4 ++-- .../competency/pages/competency/competency.html | 4 ++-- .../components/index/addon-mod-assign-index.html | 2 +- src/addon/mod/chat/pages/sessions/sessions.html | 2 +- .../components/index/addon-mod-forum-index.html | 8 ++++---- src/addon/mod/label/label.scss | 3 ++- .../components/index/addon-mod-scorm-index.html | 2 +- src/addon/qtype/ddwtos/component/ddwtos.scss | 2 ++ src/app/app.scss | 12 ++++++++++++ src/components/user-avatar/user-avatar.scss | 1 + .../only-title-block/only-title-block.scss | 5 +++++ .../grades/components/course/core-grades-course.html | 2 +- src/core/grades/components/course/course.scss | 4 ++++ 15 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 src/addon/calendar/components/upcoming-events/upcoming-events.scss create mode 100644 src/core/block/components/only-title-block/only-title-block.scss diff --git a/src/addon/calendar/components/calendar/calendar.scss b/src/addon/calendar/components/calendar/calendar.scss index d04e2091b..436e2d210 100644 --- a/src/addon/calendar/components/calendar/calendar.scss +++ b/src/addon/calendar/components/calendar/calendar.scss @@ -89,6 +89,7 @@ ion-app.app-root addon-calendar-calendar { @include border-end(1px, solid, $calendar-border-color); overflow: hidden; min-height: 60px; + cursor: pointer; &:first-child { @include padding(null, null, null, 10px); @@ -131,6 +132,7 @@ ion-app.app-root addon-calendar-calendar { border-radius: 50%; } &.dayblank { + cursor: auto; background-color: $gray-lighter; @include darkmode() { background-color: $black; diff --git a/src/addon/calendar/components/upcoming-events/upcoming-events.scss b/src/addon/calendar/components/upcoming-events/upcoming-events.scss new file mode 100644 index 000000000..b8c06c58f --- /dev/null +++ b/src/addon/calendar/components/upcoming-events/upcoming-events.scss @@ -0,0 +1,5 @@ +ion-app.app-root addon-calendar-upcoming-events { + .addon-calendar-event { + cursor: pointer; + } +} diff --git a/src/addon/calendar/pages/day/day.html b/src/addon/calendar/pages/day/day.html index d81aff79e..a48f1d51f 100644 --- a/src/addon/calendar/pages/day/day.html +++ b/src/addon/calendar/pages/day/day.html @@ -48,7 +48,7 @@ - +

@@ -61,7 +61,7 @@ {{ 'core.deletedoffline' | translate }} -
+
diff --git a/src/addon/competency/pages/competency/competency.html b/src/addon/competency/pages/competency/competency.html index 664ca9393..e3cd3ef36 100644 --- a/src/addon/competency/pages/competency/competency.html +++ b/src/addon/competency/pages/competency/competency.html @@ -25,7 +25,7 @@ {{ competency.competency.comppath.framework.name }}  /  - {{ ancestor.name }} + {{ ancestor.name }} {{ ancestor.name }}  /  @@ -35,7 +35,7 @@
{{ 'addon.competency.nocrossreferencedcompetencies' | translate }}

- + {{ relatedcomp.shortname }} - {{ relatedcomp.idnumber }}

diff --git a/src/addon/mod/assign/components/index/addon-mod-assign-index.html b/src/addon/mod/assign/components/index/addon-mod-assign-index.html index 4ccbf69c2..467f9e49d 100644 --- a/src/addon/mod/assign/components/index/addon-mod-assign-index.html +++ b/src/addon/mod/assign/components/index/addon-mod-assign-index.html @@ -15,7 +15,7 @@ - + diff --git a/src/addon/mod/chat/pages/sessions/sessions.html b/src/addon/mod/chat/pages/sessions/sessions.html index acffafa23..b77fe3601 100644 --- a/src/addon/mod/chat/pages/sessions/sessions.html +++ b/src/addon/mod/chat/pages/sessions/sessions.html @@ -20,7 +20,7 @@ {{ 'addon.mod_chat.showincompletesessions' | translate }} - diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html index 986c6da0c..a2444345a 100644 --- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html +++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html @@ -43,7 +43,7 @@
- +

@@ -57,10 +57,10 @@

{{ 'core.notsent' | translate }}

-
+
- +

@@ -94,7 +94,7 @@ - + diff --git a/src/addon/mod/label/label.scss b/src/addon/mod/label/label.scss index 46d2a8600..0a9552937 100644 --- a/src/addon/mod/label/label.scss +++ b/src/addon/mod/label/label.scss @@ -1,5 +1,6 @@ -.item.core-course-module-handler.addon-mod-label-handler { +ion-app.app-root .item.core-course-module-handler.addon-mod-label-handler { align-items: center; + cursor: auto; &:hover { opacity: 1; diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html index c7f421705..a9fcfd058 100644 --- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html +++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html @@ -98,7 +98,7 @@

- + ({{ 'addon.mod_scorm.score' | translate }}: {{sco.score_raw}})

diff --git a/src/addon/qtype/ddwtos/component/ddwtos.scss b/src/addon/qtype/ddwtos/component/ddwtos.scss index 33666ece9..8e1d7ee53 100644 --- a/src/addon/qtype/ddwtos/component/ddwtos.scss +++ b/src/addon/qtype/ddwtos/component/ddwtos.scss @@ -20,6 +20,7 @@ addon-qtype-ddwtos { border: 1px solid $gray-darker; margin-bottom: 2px; border-radius: 5px; + cursor: pointer; } .draghome, .drag { display: inline-block; @@ -41,6 +42,7 @@ addon-qtype-ddwtos { z-index: 2; border-radius: 5px; line-height: 25px; + cursor: pointer; } .drag.selected { z-index: 3; diff --git a/src/app/app.scss b/src/app/app.scss index 75f830591..d20506265 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -333,6 +333,10 @@ ion-app.app-root { width: 100%; } + &[fullonclick="true"] { + cursor: pointer; + } + audio, video, a, iframe { pointer-events: auto; } @@ -371,6 +375,7 @@ ion-app.app-root { background-color: rgba(0, 0, 0, .5); } text-align: center; + cursor: pointer; width: 32px; height: 32px; @@ -1081,6 +1086,7 @@ ion-app.app-root { } .core-expandable { + cursor: pointer; ion-icon[item-start] + .item-inner { @include margin-horizontal(0px, null); } @@ -1101,6 +1107,12 @@ ion-app.app-root { transition: opacity 100ms ease-in-out; opacity: .1; } + + a.item, + .core-clickable, + select { + cursor: pointer; + } } @each $color-name, $color-base, $color-contrast in get-colors($colors) { diff --git a/src/components/user-avatar/user-avatar.scss b/src/components/user-avatar/user-avatar.scss index c5296a850..a2c8fbbc1 100644 --- a/src/components/user-avatar/user-avatar.scss +++ b/src/components/user-avatar/user-avatar.scss @@ -1,5 +1,6 @@ ion-avatar[core-user-avatar] { position: relative; + cursor: pointer; .contact-status { position: absolute; diff --git a/src/core/block/components/only-title-block/only-title-block.scss b/src/core/block/components/only-title-block/only-title-block.scss new file mode 100644 index 000000000..d190ac7e6 --- /dev/null +++ b/src/core/block/components/only-title-block/only-title-block.scss @@ -0,0 +1,5 @@ +ion-app.app-root core-block-only-title { + .item-divider { + cursor: pointer; + } +} \ No newline at end of file diff --git a/src/core/grades/components/course/core-grades-course.html b/src/core/grades/components/course/core-grades-course.html index 9832467c9..9a6ee1845 100644 --- a/src/core/grades/components/course/core-grades-course.html +++ b/src/core/grades/components/course/core-grades-course.html @@ -16,7 +16,7 @@ - + diff --git a/src/core/grades/components/course/course.scss b/src/core/grades/components/course/course.scss index 5a3a9eb4e..c5ccb244d 100644 --- a/src/core/grades/components/course/course.scss +++ b/src/core/grades/components/course/course.scss @@ -85,6 +85,10 @@ ion-app.app-root core-grades-course { font-size: 0.85em; } } + + .core-grades-grade-clickable { + cursor: pointer; + } } }