Skip to content

Commit

Permalink
UI, histories: move load indicator style to less, use better name
Browse files Browse the repository at this point in the history
  • Loading branch information
carlfeberhard committed Aug 31, 2015
1 parent 15fe2b7 commit efc1df7
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 17 deletions.
4 changes: 2 additions & 2 deletions client/galaxy/scripts/mvc/history/multi-panel.js
Expand Up @@ -488,7 +488,7 @@ var MultiPanelColumns = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
},

_postFetchAll : function( fetchData ){
this.$( '.history-loading-indicator' ).remove();
this.$( '.histories-loading-indicator' ).remove();
// when new histories is fetched and the indicator is not required,
// the panel will jump slightly left - totally aesthetic but jarring
// TODO: this probably would be best handled elsewhere during a refinement cycle (if any)
Expand Down Expand Up @@ -1124,7 +1124,7 @@ var MultiPanelColumns = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
].join(''), { variable: 'view' }),

loadingIndicatorTemplate : _.template([
'<div class="history-loading-indicator">',
'<div class="histories-loading-indicator">',
'<span class="fa fa-spin fa-spinner"></span>', _l( 'Loading histories' ), '...',
'</div>'
].join(''), { variable: 'view' }),
Expand Down
15 changes: 15 additions & 0 deletions client/galaxy/style/less/history.less
Expand Up @@ -803,6 +803,21 @@
overflow: auto;
}
}

// loading indicator on far right of multipanel view
.histories-loading-indicator {
// if we don't bring the width down here, the space is way too large for vertical text
width: 8px;
transform: rotate(90deg);
transform-origin: left top 0;
margin-left: 16px;
white-space: nowrap;
color: grey;
span {
// space btwn icon and text
margin-right: 8px;
}
}
}


Expand Down

0 comments on commit efc1df7

Please sign in to comment.