From 058b8377a86a8be6d5a261cf19867345c62ecee0 Mon Sep 17 00:00:00 2001 From: heyarne Date: Wed, 20 Feb 2019 15:06:15 +0100 Subject: [PATCH] Use loading indicator provided by bulma --- src/cljs/airsonic_ui/views/breadcrumbs.cljs | 5 ++--- .../airsonic_ui/views/loading_spinner.cljs | 5 ----- src/sass/app.sass | 21 +++++-------------- 3 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 src/cljs/airsonic_ui/views/loading_spinner.cljs diff --git a/src/cljs/airsonic_ui/views/breadcrumbs.cljs b/src/cljs/airsonic_ui/views/breadcrumbs.cljs index bbaf715..c958315 100644 --- a/src/cljs/airsonic_ui/views/breadcrumbs.cljs +++ b/src/cljs/airsonic_ui/views/breadcrumbs.cljs @@ -1,7 +1,6 @@ (ns airsonic-ui.views.breadcrumbs (:require [re-frame.core :refer [subscribe]] - [airsonic-ui.routes :as routes :refer [url-for]] - [airsonic-ui.views.loading-spinner :refer [loading-spinner]])) + [airsonic-ui.routes :as routes :refer [url-for]])) ;; Breadcrumbs are implemented in such a way that they provide a stringent ;; hierarchy no matter how you came to the url. They should allow easy @@ -15,7 +14,7 @@ (for [[idx [href label]] (map-indexed vector (butlast items))] [:li {:key idx} [:a {:href href} label]]) [:li.is-active>a (last items) - (when content-pending? [loading-spinner])]]]])) + (when content-pending? [:span.loader])]]]])) (defmulti breadcrumbs (fn dispatch-on [[route-id] content] route-id)) diff --git a/src/cljs/airsonic_ui/views/loading_spinner.cljs b/src/cljs/airsonic_ui/views/loading_spinner.cljs deleted file mode 100644 index a50528e..0000000 --- a/src/cljs/airsonic_ui/views/loading_spinner.cljs +++ /dev/null @@ -1,5 +0,0 @@ -(ns airsonic-ui.views.loading-spinner - (:require [airsonic-ui.views.icon :refer [icon]])) - -(defn loading-spinner [] - [:span.loading-spinner [icon :reload]]) diff --git a/src/sass/app.sass b/src/sass/app.sass index 059a292..826ce7e 100644 --- a/src/sass/app.sass +++ b/src/sass/app.sass @@ -17,6 +17,11 @@ .loader +loader +// small loading indicator at top of content +.breadcrumb + .loader + margin-left: .5em + // bottom bar .has-navbar-fixed-bottom padding-bottom: 64px @@ -189,7 +194,6 @@ .media-content align-self: center - // floating notifications .notifications:not(:empty) @extend .container @@ -199,21 +203,6 @@ right: 0 padding-top: 3.2rem -// loading indicator -@keyframes you-spin-my-head-right-round - from - transform: rotate(0deg) - transform-origin: 50% 46% - - to - transform: rotate(359deg) - transform-origin: 50% 46% - -.loading-spinner - .icon - animation: 1s infinite you-spin-my-head-right-round - - // route specific styling .search .content .section