Skip to content

Commit

Permalink
style changes for history lists
Browse files Browse the repository at this point in the history
* include title for all state indicators
* shorten title
* change style of deleted indicator
* comment out unused less variables
  • Loading branch information
martenson committed Feb 15, 2018
1 parent 283ab04 commit 755fb9f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions client/galaxy/scripts/mvc/history/history-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ var HistoryGridView = GridView.extend({
for (let state of ["ok", "running", "queued", "new", "error"]) {
const stateCount = contentsStates[state];
if (stateCount) {
stateHtml += `<div class="count-box state-color-${state}">${stateCount}</div> `;
stateHtml += `<div class="count-box state-color-${state}" title="Datasets in ${state} state">${stateCount}</div> `;
}
}
const contentsActive = req["contents_active"];
const deleted = contentsActive["deleted"];
if (deleted) {
stateHtml += `<div class="count-box state-color-deleted" title="Number of datasets that are deleted.">${deleted}</div> `;
stateHtml += `<div class="count-box state-color-deleted" title="Deleted datasets">${deleted}</div> `;
}
const hidden = contentsActive["hidden"];
if (hidden) {
stateHtml += `<div class="count-box state-color-hidden" title="Number of datasets that are marked as hidden.">${hidden}</div> `;
stateHtml += `<div class="count-box state-color-hidden" title="Hidden datasets">${hidden}</div> `;
}
$(`.delayed-value-datasets_by_state[data-history-id='${historyId}']`).html(stateHtml);
$(`.delayed-value-disk_size[data-history-id='${historyId}']`).html(req["nice_size"]);
Expand Down
9 changes: 5 additions & 4 deletions client/galaxy/style/less/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -1177,8 +1177,9 @@ ul.manage-table-actions li {
}

.state-color-deleted {
border-color: @state-deleted-border;
background: @state-deleted-bg;
border-color: darken(@state-default-border, 30%);
border-style: dotted;
background: darken(@state-default-bg, 30%);
}

.state-color-hidden {
Expand Down Expand Up @@ -1803,7 +1804,7 @@ div.toolTitleNoSection
display: none;
}

// communication channel bootstrap modal
// communication channel bootstrap modal
.chat-modal {
overflow: hidden;
}
Expand All @@ -1818,7 +1819,7 @@ div.toolTitleNoSection
}

.close-modal {
float: right;
float: right;
cursor: pointer;
}

Expand Down
6 changes: 3 additions & 3 deletions client/galaxy/style/less/galaxy_variables.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Additional variables that are not used by bootstrap but are used
// in Galaxy stylesheets
// in Galaxy stylesheets

@base-bg: @white;
@base-text-color: @black;
Expand Down Expand Up @@ -29,8 +29,8 @@
@state-running-border: #AAAA66;
@state-running-bg: #FFFFCC;

@state-deleted-border: #330066;
@state-deleted-bg: #3399FF;
// @state-deleted-border: #330066;
// @state-deleted-bg: #3399FF;

// Theme, expects tmp-site-config.less written by grunt
@import "tmp-site-config.less";
Expand Down

0 comments on commit 755fb9f

Please sign in to comment.