mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Merge pull request #6226 from dannon/minor_style_fixes
[18.05] Two minor aliases for (exterior) backwards compatibility, minor badge tweaks
This commit is contained in:
Martin Cech
@@ -47,7 +47,7 @@ const TOURPAGE_TEMPLATE = `
|
||||
</a>
|
||||
- <%- tour.attributes.description || "No description given." %>
|
||||
<% _.each(tour.attributes.tags, function(tag) { %>
|
||||
<span class="label label-primary sm-label-pad">
|
||||
<span class="badge badge-primary">
|
||||
<%- tag.charAt(0).toUpperCase() + tag.slice(1) %>
|
||||
</span>
|
||||
<% }); %>
|
||||
|
||||
@@ -1127,18 +1127,14 @@ div.odd_row {
|
||||
// Tool panel stuff
|
||||
|
||||
// Extra label colors
|
||||
.label-beta {
|
||||
.badge-beta {
|
||||
@extend .badge-warning;
|
||||
}
|
||||
|
||||
.label-new {
|
||||
.badge-new {
|
||||
@extend .badge-info;
|
||||
}
|
||||
|
||||
.sm-label-pad {
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
span.toolParameterExpandableCollapsable {
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
@@ -1289,6 +1285,19 @@ a.action-button {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.btn-xs {
|
||||
// The 'new' bootstrap 4 btn-sm is about the same size as the old btn-xs,
|
||||
// should serve as a replacement for anything expecting this.
|
||||
@extend .btn-sm;
|
||||
}
|
||||
|
||||
.btn-default {
|
||||
// A hopefully temporary alias (as with above) to provide backwards
|
||||
// compatibility for external stuff using .btn-default, which is now
|
||||
// .btn-secondary.
|
||||
@extend .btn-secondary;
|
||||
}
|
||||
|
||||
//.action-button > * {
|
||||
// vertical-align: middle;
|
||||
//}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
||||
define("mvc/tours",["exports","utils/localization","libs/backbone","libs/underscore","libs/bootstrap-tour"],function(t,e,n,o){"use strict";function a(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e.default=t,e}function r(t){var e=f(t);window.sessionStorage.setItem("activeGalaxyTour",JSON.stringify(t));var n=new d(c.extend({steps:e.steps},p));return n.init(),n.goTo(0),n.restart(),n}function i(t){var e=g+"api/tours/"+t;$.getJSON(e,function(t){r(t)})}function s(){var t=JSON.parse(window.sessionStorage.getItem("activeGalaxyTour"));if(t&&(t=f(t))&&t.steps&&window&&window.self===window.top){var e=new d(c.extend({steps:t.steps},p));e.init(),e.restart()}}Object.defineProperty(t,"__esModule",{value:!0}),t.ToursView=void 0,t.giveTourWithData=r,t.giveTourById=i,t.activeGalaxyTourRunner=s;var u=function(t){return t&&t.__esModule?t:{default:t}}(e),l=a(n),c=a(o),d=window.Tour,g="undefined"==typeof Galaxy?"/":Galaxy.root,p={storage:window.sessionStorage,onEnd:function(){window.sessionStorage.removeItem("activeGalaxyTour")},delay:150,orphan:!0},f=function(t){return c.each(t.steps,function(t){t.preclick&&(t.onShow=function(){c.each(t.preclick,function(t){$(t).click()})}),t.postclick&&(t.onHide=function(){c.each(t.postclick,function(t){$(t).click()})}),t.textinsert&&(t.onShown=function(){$(t.element).val(t.textinsert).trigger("change")}),t.path&&(console.warn("This Galaxy Tour is attempting to use path navigation. This is known to be unstable and can possibly get the Galaxy client 'stuck' in a tour, and at this time is not allowed."),delete t.path)}),t},h=l.Model.extend({urlRoot:g+"api/tours"}),v=l.Collection.extend({url:g+"api/tours",model:h}),b=t.ToursView=l.View.extend({title:(0,u.default)("Tours"),initialize:function(){var t=this;this.setElement("<div/>"),this.model=new v,this.model.fetch({success:function(){t.render()},error:function(){console.error("Failed to fetch tours.")}})},render:function(){var t=c.template('\n <h2>Galaxy Tours</h2>\n <p>This page presents a list of interactive tours available on this Galaxy server.\n Select any tour to get started (and remember, you can click \'End Tour\' at any time).</p>\n\n<div class="row mb-3">\n <div class="col-12 btn-group" role="group" aria-label="Tag selector">\n <% _.each(tourtagorder, function(tag) { %>\n <button class="btn btn-primary tag-selector-button" tag-selector-button="<%- tag %>">\n <%- tag %>\n </button>\n <% }); %>\n </div>\n</div>\n\n<% _.each(tourtagorder, function(tourtagkey) { %>\n<div tag="<%- tourtagkey %>" class="row mb-3">\n <div class="col-12">\n <% var tourtag = tourtags[tourtagkey]; %>\n <h4>\n <%- tourtag.name %>\n </h4>\n <ul class="list-group">\n <% _.each(tourtag.tours, function(tour) { %>\n <li class="list-group-item">\n <a href="/tours/<%- tour.id %>" class="tourItem" data-tour.id=<%- tour.id %>>\n <%- tour.attributes.name || tour.id %>\n </a>\n - <%- tour.attributes.description || "No description given." %>\n <% _.each(tour.attributes.tags, function(tag) { %>\n <span class="label label-primary sm-label-pad">\n <%- tag.charAt(0).toUpperCase() + tag.slice(1) %>\n </span>\n <% }); %>\n </li>\n <% }); %>\n </ul>\n </div>\n</div>\n<% }); %>'),e={};c.each(this.model.models,function(t){null===t.attributes.tags?(void 0===e.Untagged&&(e.Untagged={name:"Untagged",tours:[]}),e.Untagged.tours.push(t)):c.each(t.attributes.tags,function(n){n=n.charAt(0).toUpperCase()+n.slice(1),void 0===e[n]&&(e[n]={name:n,tours:[]}),e[n].tours.push(t)})});var n=Object.keys(e).sort();this.$el.html(t({tours:this.model.models,tourtags:e,tourtagorder:n})).on("click",".tourItem",function(t){t.preventDefault(),i($(this).data("tour.id"))}).on("click",".tag-selector-button",function(t){var e=$(t.target),n="block",o=e.attr("tag-selector-button");e.toggleClass("btn-primary"),e.toggleClass("btn-secondary"),e.hasClass("btn-secondary")&&(n="none"),$("div[tag='"+o+"']").css({display:n})})}});t.default={ToursView:b,giveTourWithData:r,giveTourById:i,activeGalaxyTourRunner:s}});
|
||||
define("mvc/tours",["exports","utils/localization","libs/backbone","libs/underscore","libs/bootstrap-tour"],function(t,e,n,o){"use strict";function a(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e.default=t,e}function r(t){var e=f(t);window.sessionStorage.setItem("activeGalaxyTour",JSON.stringify(t));var n=new d(c.extend({steps:e.steps},p));return n.init(),n.goTo(0),n.restart(),n}function i(t){var e=g+"api/tours/"+t;$.getJSON(e,function(t){r(t)})}function s(){var t=JSON.parse(window.sessionStorage.getItem("activeGalaxyTour"));if(t&&(t=f(t))&&t.steps&&window&&window.self===window.top){var e=new d(c.extend({steps:t.steps},p));e.init(),e.restart()}}Object.defineProperty(t,"__esModule",{value:!0}),t.ToursView=void 0,t.giveTourWithData=r,t.giveTourById=i,t.activeGalaxyTourRunner=s;var u=function(t){return t&&t.__esModule?t:{default:t}}(e),l=a(n),c=a(o),d=window.Tour,g="undefined"==typeof Galaxy?"/":Galaxy.root,p={storage:window.sessionStorage,onEnd:function(){window.sessionStorage.removeItem("activeGalaxyTour")},delay:150,orphan:!0},f=function(t){return c.each(t.steps,function(t){t.preclick&&(t.onShow=function(){c.each(t.preclick,function(t){$(t).click()})}),t.postclick&&(t.onHide=function(){c.each(t.postclick,function(t){$(t).click()})}),t.textinsert&&(t.onShown=function(){$(t.element).val(t.textinsert).trigger("change")}),t.path&&(console.warn("This Galaxy Tour is attempting to use path navigation. This is known to be unstable and can possibly get the Galaxy client 'stuck' in a tour, and at this time is not allowed."),delete t.path)}),t},h=l.Model.extend({urlRoot:g+"api/tours"}),v=l.Collection.extend({url:g+"api/tours",model:h}),b=t.ToursView=l.View.extend({title:(0,u.default)("Tours"),initialize:function(){var t=this;this.setElement("<div/>"),this.model=new v,this.model.fetch({success:function(){t.render()},error:function(){console.error("Failed to fetch tours.")}})},render:function(){var t=c.template('\n <h2>Galaxy Tours</h2>\n <p>This page presents a list of interactive tours available on this Galaxy server.\n Select any tour to get started (and remember, you can click \'End Tour\' at any time).</p>\n\n<div class="row mb-3">\n <div class="col-12 btn-group" role="group" aria-label="Tag selector">\n <% _.each(tourtagorder, function(tag) { %>\n <button class="btn btn-primary tag-selector-button" tag-selector-button="<%- tag %>">\n <%- tag %>\n </button>\n <% }); %>\n </div>\n</div>\n\n<% _.each(tourtagorder, function(tourtagkey) { %>\n<div tag="<%- tourtagkey %>" class="row mb-3">\n <div class="col-12">\n <% var tourtag = tourtags[tourtagkey]; %>\n <h4>\n <%- tourtag.name %>\n </h4>\n <ul class="list-group">\n <% _.each(tourtag.tours, function(tour) { %>\n <li class="list-group-item">\n <a href="/tours/<%- tour.id %>" class="tourItem" data-tour.id=<%- tour.id %>>\n <%- tour.attributes.name || tour.id %>\n </a>\n - <%- tour.attributes.description || "No description given." %>\n <% _.each(tour.attributes.tags, function(tag) { %>\n <span class="badge badge-primary">\n <%- tag.charAt(0).toUpperCase() + tag.slice(1) %>\n </span>\n <% }); %>\n </li>\n <% }); %>\n </ul>\n </div>\n</div>\n<% }); %>'),e={};c.each(this.model.models,function(t){null===t.attributes.tags?(void 0===e.Untagged&&(e.Untagged={name:"Untagged",tours:[]}),e.Untagged.tours.push(t)):c.each(t.attributes.tags,function(n){n=n.charAt(0).toUpperCase()+n.slice(1),void 0===e[n]&&(e[n]={name:n,tours:[]}),e[n].tours.push(t)})});var n=Object.keys(e).sort();this.$el.html(t({tours:this.model.models,tourtags:e,tourtagorder:n})).on("click",".tourItem",function(t){t.preventDefault(),i($(this).data("tour.id"))}).on("click",".tag-selector-button",function(t){var e=$(t.target),n="block",o=e.attr("tag-selector-button");e.toggleClass("btn-primary"),e.toggleClass("btn-secondary"),e.hasClass("btn-secondary")&&(n="none"),$("div[tag='"+o+"']").css({display:n})})}});t.default={ToursView:b,giveTourWithData:r,giveTourById:i,activeGalaxyTourRunner:s}});
|
||||
+19
-20
@@ -1736,45 +1736,47 @@ button.btn-primary {
|
||||
box-shadow: 0 0 0 0.2rem rgba(37, 83, 123, 0.5); }
|
||||
|
||||
.btn-secondary, input[type="submit"],
|
||||
button, .action-button, .menubutton {
|
||||
button, .action-button, .btn-default, .menubutton {
|
||||
color: #212529;
|
||||
background-color: #dee2e6;
|
||||
border-color: #dee2e6; }
|
||||
.btn-secondary:hover, input[type="submit"]:hover,
|
||||
button:hover, .action-button:hover, .menubutton:hover {
|
||||
button:hover, .action-button:hover, .btn-default:hover, .menubutton:hover {
|
||||
color: #212529;
|
||||
background-color: #c8cfd6;
|
||||
border-color: #c1c9d0; }
|
||||
.btn-secondary:focus, input[type="submit"]:focus,
|
||||
button:focus, .action-button:focus, .menubutton:focus, .btn-secondary.focus, input.focus[type="submit"],
|
||||
button.focus, .focus.action-button, .focus.menubutton {
|
||||
button:focus, .action-button:focus, .btn-default:focus, .menubutton:focus, .btn-secondary.focus, input.focus[type="submit"],
|
||||
button.focus, .focus.action-button, .focus.btn-default, .focus.menubutton {
|
||||
box-shadow: 0 0 0 0.2rem rgba(222, 226, 230, 0.5); }
|
||||
.btn-secondary.disabled, input.disabled[type="submit"],
|
||||
button.disabled, .disabled.action-button, .disabled.menubutton, .btn-secondary:disabled, input[type="submit"]:disabled,
|
||||
button:disabled, .action-button:disabled, .menubutton:disabled {
|
||||
button.disabled, .disabled.action-button, .disabled.btn-default, .disabled.menubutton, .btn-secondary:disabled, input[type="submit"]:disabled,
|
||||
button:disabled, .action-button:disabled, .btn-default:disabled, .menubutton:disabled {
|
||||
color: #212529;
|
||||
background-color: #dee2e6;
|
||||
border-color: #dee2e6; }
|
||||
.btn-secondary:not(:disabled):not(.disabled):active, input[type="submit"]:not(:disabled):not(.disabled):active,
|
||||
button:not(:disabled):not(.disabled):active, .action-button:not(:disabled):not(.disabled):active, .menubutton:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, input[type="submit"]:not(:disabled):not(.disabled).active,
|
||||
button:not(:disabled):not(.disabled).active, .action-button:not(:disabled):not(.disabled).active, .menubutton:not(:disabled):not(.disabled).active,
|
||||
button:not(:disabled):not(.disabled):active, .action-button:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled):active, .menubutton:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, input[type="submit"]:not(:disabled):not(.disabled).active,
|
||||
button:not(:disabled):not(.disabled).active, .action-button:not(:disabled):not(.disabled).active, .btn-default:not(:disabled):not(.disabled).active, .menubutton:not(:disabled):not(.disabled).active,
|
||||
.show > .btn-secondary.dropdown-toggle,
|
||||
.show > input.dropdown-toggle[type="submit"],
|
||||
.show >
|
||||
button.dropdown-toggle,
|
||||
.show > .dropdown-toggle.action-button,
|
||||
.show > .dropdown-toggle.btn-default,
|
||||
.show > .dropdown-toggle.menubutton {
|
||||
color: #212529;
|
||||
background-color: #c1c9d0;
|
||||
border-color: #bac2cb; }
|
||||
.btn-secondary:not(:disabled):not(.disabled):active:focus, input[type="submit"]:not(:disabled):not(.disabled):active:focus,
|
||||
button:not(:disabled):not(.disabled):active:focus, .action-button:not(:disabled):not(.disabled):active:focus, .menubutton:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, input[type="submit"]:not(:disabled):not(.disabled).active:focus,
|
||||
button:not(:disabled):not(.disabled).active:focus, .action-button:not(:disabled):not(.disabled).active:focus, .menubutton:not(:disabled):not(.disabled).active:focus,
|
||||
button:not(:disabled):not(.disabled):active:focus, .action-button:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled):active:focus, .menubutton:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, input[type="submit"]:not(:disabled):not(.disabled).active:focus,
|
||||
button:not(:disabled):not(.disabled).active:focus, .action-button:not(:disabled):not(.disabled).active:focus, .btn-default:not(:disabled):not(.disabled).active:focus, .menubutton:not(:disabled):not(.disabled).active:focus,
|
||||
.show > .btn-secondary.dropdown-toggle:focus,
|
||||
.show > input.dropdown-toggle[type="submit"]:focus,
|
||||
.show >
|
||||
button.dropdown-toggle:focus,
|
||||
.show > .dropdown-toggle.action-button:focus,
|
||||
.show > .dropdown-toggle.btn-default:focus,
|
||||
.show > .dropdown-toggle.menubutton:focus {
|
||||
box-shadow: 0 0 0 0.2rem rgba(222, 226, 230, 0.5); }
|
||||
|
||||
@@ -2125,7 +2127,7 @@ button, .btn-group-lg > .action-button, .btn-group-lg > .menubutton {
|
||||
border-radius: 0.3rem; }
|
||||
|
||||
.btn-sm, .btn-group-sm > .btn, .btn-group-sm > input[type="submit"], .btn-group-sm >
|
||||
button, .btn-group-sm > .action-button, .btn-group-sm > .menubutton, .multi-panel-history .control-column .btn, .multi-panel-history .control-column input[type="submit"], .multi-panel-history .control-column
|
||||
button, .btn-group-sm > .action-button, .btn-group-sm > .menubutton, .btn-xs, .multi-panel-history .control-column .btn, .multi-panel-history .control-column input[type="submit"], .multi-panel-history .control-column
|
||||
button, .multi-panel-history .control-column .action-button, .multi-panel-history .control-column .menubutton, .multi-panel-history .history-column .panel-controls .btn, .multi-panel-history .history-column .panel-controls input[type="submit"], .multi-panel-history .history-column .panel-controls
|
||||
button, .multi-panel-history .history-column .panel-controls .action-button, .multi-panel-history .history-column .panel-controls .menubutton {
|
||||
padding: 0.25rem 0.5rem;
|
||||
@@ -2505,7 +2507,7 @@ button,
|
||||
margin-right: 0; }
|
||||
|
||||
.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split, .btn-group-sm > input[type="submit"] + .dropdown-toggle-split, .btn-group-sm >
|
||||
button + .dropdown-toggle-split, .btn-group-sm > .action-button + .dropdown-toggle-split, .btn-group-sm > .menubutton + .dropdown-toggle-split, .multi-panel-history .control-column .btn + .dropdown-toggle-split, .multi-panel-history .control-column input[type="submit"] + .dropdown-toggle-split, .multi-panel-history .control-column
|
||||
button + .dropdown-toggle-split, .btn-group-sm > .action-button + .dropdown-toggle-split, .btn-group-sm > .menubutton + .dropdown-toggle-split, .btn-xs + .dropdown-toggle-split, .multi-panel-history .control-column .btn + .dropdown-toggle-split, .multi-panel-history .control-column input[type="submit"] + .dropdown-toggle-split, .multi-panel-history .control-column
|
||||
button + .dropdown-toggle-split, .multi-panel-history .control-column .action-button + .dropdown-toggle-split, .multi-panel-history .control-column .menubutton + .dropdown-toggle-split, .multi-panel-history .history-column .panel-controls .btn + .dropdown-toggle-split, .multi-panel-history .history-column .panel-controls input[type="submit"] + .dropdown-toggle-split, .multi-panel-history .history-column .panel-controls
|
||||
button + .dropdown-toggle-split, .multi-panel-history .history-column .panel-controls .action-button + .dropdown-toggle-split, .multi-panel-history .history-column .panel-controls .menubutton + .dropdown-toggle-split {
|
||||
padding-right: 0.375rem;
|
||||
@@ -3715,18 +3717,18 @@ button .badge, .action-button .badge, .menubutton .badge {
|
||||
text-decoration: none;
|
||||
background-color: #198e19; }
|
||||
|
||||
.badge-info, .label-new {
|
||||
.badge-info, .badge-new {
|
||||
color: #fff;
|
||||
background-color: #1cbceb; }
|
||||
.badge-info[href]:hover, [href].label-new:hover, .badge-info[href]:focus, [href].label-new:focus {
|
||||
.badge-info[href]:hover, [href].badge-new:hover, .badge-info[href]:focus, [href].badge-new:focus {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
background-color: #119ac3; }
|
||||
|
||||
.badge-warning, .label-beta {
|
||||
.badge-warning, .badge-beta {
|
||||
color: #212529;
|
||||
background-color: #f69713; }
|
||||
.badge-warning[href]:hover, [href].label-beta:hover, .badge-warning[href]:focus, [href].label-beta:focus {
|
||||
.badge-warning[href]:hover, [href].badge-beta:hover, .badge-warning[href]:focus, [href].badge-beta:focus {
|
||||
color: #212529;
|
||||
text-decoration: none;
|
||||
background-color: #ce7b08; }
|
||||
@@ -9003,7 +9005,7 @@ button, .action-button, .menubutton {
|
||||
white-space: normal; }
|
||||
|
||||
.btn-secondary, input[type="submit"],
|
||||
button, .action-button, .menubutton {
|
||||
button, .action-button, .btn-default, .menubutton {
|
||||
border: 1px solid #bfbfbf; }
|
||||
|
||||
.dropdown-menu {
|
||||
@@ -13351,9 +13353,6 @@ div.odd_row {
|
||||
#footer {
|
||||
display: none; }
|
||||
|
||||
.sm-label-pad {
|
||||
margin-right: 2px; }
|
||||
|
||||
span.toolParameterExpandableCollapsable {
|
||||
font-weight: bold;
|
||||
cursor: pointer; }
|
||||
|
||||
Reference in New Issue
Block a user