2:49 a.m.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/bc797256606a/
Changeset: bc797256606a
User: guerler
Date: 2014-05-31 08:49:30
Summary: Ui/Charts: Improve css structure, pack scripts
Affected #: 10 files
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f
config/plugins/visualizations/charts/static/app.css
--- a/config/plugins/visualizations/charts/static/app.css
+++ b/config/plugins/visualizations/charts/static/app.css
@@ -1,29 +1,3 @@
-.ui-label {
- font-weight: bold;
-}
-.ui-message {
- padding: 2px 2px 2px 10px;
-}
-
-.ui-icon {
- font-size: 1.2em;
-}
-
-.ui-button-icon {
- margin-right: 5px;
-}
-
-.ui-button-icon .button {
- margin-right: 5px;
- margin-left: 5px;
-}
-
-.ui-button-icon .title {
- position: relative;
- font-size: 0.8em;
- font-weight: normal;
- top: -1px;
-}
.charts-grid .item {
padding: 5px;
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f
config/plugins/visualizations/charts/static/charts/types.js
--- a/config/plugins/visualizations/charts/static/charts/types.js
+++ b/config/plugins/visualizations/charts/static/charts/types.js
@@ -69,7 +69,7 @@
'nvd3_scatter' : nvd3_scatter,
'nvd3_histogram' : nvd3_histogram,
'nvd3_histogram_discrete' : nvd3_histogram_discrete,
- /*'highcharts_bar' : highcharts_bar,
+ 'highcharts_bar' : highcharts_bar,
'highcharts_bar_stacked' : highcharts_bar_stacked,
'highcharts_bar_horizontal' : highcharts_bar_horizontal,
'highcharts_bar_horizontal_stacked' : highcharts_bar_horizontal_stacked,
@@ -78,9 +78,9 @@
'highcharts_line' : highcharts_line,
'highcharts_scatter' : highcharts_scatter,
'highcharts_histogram' : highcharts_histogram,
- 'highcharts_histogram_discrete' : highcharts_histogram_discrete,*/
+ 'highcharts_histogram_discrete' : highcharts_histogram_discrete,
'highcharts_boxplot' : highcharts_boxplot,
- //'highcharts_heatmap' : highcharts_heatmap
+ 'highcharts_heatmap' : highcharts_heatmap
}
});
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f
config/plugins/visualizations/charts/static/library/ui-table-form.js
--- a/config/plugins/visualizations/charts/static/library/ui-table-form.js
+++ b/config/plugins/visualizations/charts/static/library/ui-table-form.js
@@ -16,14 +16,23 @@
list: [],
// initialize
- initialize: function(options) {
+ initialize: function(app, options) {
+
+ // link app
+ this.app = app;
+
+ // get options
+ this.options = Utils.merge(options, this.optionsDefault);
+
// ui elements
- this.table_title = new Ui.Label({title: options.title});
- this.table = new Table.View({content: options.content});
+ this.table_title = new Ui.Label({title: this.options.title});
+ this.table = new Table.View({content: this.options.content});
// create element
- var $view = $('<div/>');
- $view.append(Utils.wrap(this.table_title.$el));
+ var $view = $('<div class="ui-table-form"/>');
+ if (this.options.title) {
+ $view.append(Utils.wrap(this.table_title.$el));
+ }
$view.append(Utils.wrap(this.table.$el));
// add element
@@ -45,7 +54,7 @@
// load settings elements into table
for (var id in settings) {
- this._add(id, settings[id], model);
+ this._add(settings[id].id || id, settings[id], model);
}
// trigger change
@@ -68,7 +77,7 @@
// text input field
case 'text' :
field = new Ui.Input({
- id : 'field_' + id,
+ id : 'field-' + id,
placeholder : settings_def.placeholder,
value : model.get(id),
onchange : function(value) {
@@ -79,7 +88,7 @@
// select field
case 'select' :
field = new Ui.Select.View({
- id : 'field_' + id,
+ id : 'field-' + id,
data : settings_def.data,
value : model.get(id),
onchange : function(value) {
@@ -101,15 +110,63 @@
}
});
break;
+ case 'dataset':
+ field = new Ui.Select.View({
+ id : 'field-' + id,
+ onchange : function(value) {
+ // set new value
+ model.set(id, value);
+ }
+ });
+
+ // link refresh event
+ self.app.datasets.on('all', function() {
+ // identify selectables
+ var selectable = [];
+ self.app.datasets.each(function(dataset) {
+ if (dataset.get('datatype_id') == settings_def.data) {
+ selectable.push({value: dataset.get('id'), label:
dataset.get('name')});
+ }
+ });
+
+ // update select field
+ field.update(selectable);
+
+ // set value
+ if (!model.get(id)) {
+ model.set(id, field.first());
+ }
+ field.value(model.get(id));
+ });
+
+ // trigger change
+ self.app.datasets.trigger('all.datasets');
+ break;
// slider input field
+ case 'textarea' :
+ field = new Ui.Textarea({
+ id : 'field-' + id,
+ onchange : function() {
+ model.set(id, field.value());
+ }
+ });
+ break;
+
+ // separator
case 'separator' :
field = $('<div/>');
break;
- // skip unkown types
+
+ // default
default:
- console.log('ui-table-form:_add', 'Unknown setting type
(' + settings_def.type + ')');
- return;
-
+ field = new Ui.Input({
+ id : 'field-' + id,
+ placeholder : settings_def.placeholder,
+ type : settings_def.type,
+ onchange : function() {
+ model.set(id, field.value());
+ }
+ });
}
// set value
@@ -125,13 +182,20 @@
// combine field and info
var $input = $('<div/>');
$input.append(field.$el);
- $input.append('<div class="toolParamHelp"
style="font-size: 0.9em;">' + settings_def.info +
'</div>');
+ if (settings_def.info) {
+ $input.append('<div class="ui-table-form-info">'
+ settings_def.info + '</div>');
+ }
// add row to table
- this.table.add('<span style="white-space: nowrap;">'
+ settings_def.title + '</span>', '25%');
- this.table.add($input);
+ if (this.options.style == 'bold') {
+ this.table.add(new Ui.Label({title: settings_def.title, cls:
'form-label'}).$el);
+ this.table.add($input);
+ } else {
+ this.table.add('<span
class="ui-table-form-title">' + settings_def.title +
'</span>', '25%');
+ this.table.add($input);
+ }
} else {
- this.table.add('<h6 style="white-space: nowrap;">' +
settings_def.title + ':<h6/>');
+ this.table.add('<div
class="ui-table-form-separator">' + settings_def.title +
':<div/>');
this.table.add($('<div/>'));
}
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f
config/plugins/visualizations/charts/static/library/ui.js
--- a/config/plugins/visualizations/charts/static/library/ui.js
+++ b/config/plugins/visualizations/charts/static/library/ui.js
@@ -472,7 +472,7 @@
placeholder : '',
disabled : false,
visible : true,
- cls : 'form-control'
+ cls : ''
},
// initialize
@@ -570,6 +570,60 @@
}
});
+// plugin
+var RadioButton = Backbone.View.extend(
+{
+ // options
+ optionsDefault: {
+ value : '',
+ type : 'text',
+ placeholder : '',
+ disabled : false,
+ visible : true,
+ cls : 'form-control'
+ },
+
+ // initialize
+ initialize : function(options) {
+ // configure options
+ this.options = Utils.merge(options, this.optionsDefault);
+
+ // create new element
+ this.setElement(this._template(this.options));
+
+ // disable input field
+ if (this.options.disabled) {
+ this.$el.prop('disabled', true);
+ }
+
+ // hide input field
+ if (!this.options.visible) {
+ this.$el.hide();
+ }
+
+ // onchange event handler. fires on user activity.
+ var self = this;
+ this.$el.on('input', function() {
+ if (self.options.onchange) {
+ self.options.onchange(self.$el.val());
+ }
+ });
+ },
+
+ // value
+ value : function (new_val) {
+ if (new_val !== undefined) {
+ this.$el.val(new_val);
+ }
+ return this.$el.val();
+ },
+
+ // element
+ _template: function(options) {
+ return '<input id="' + options.id + '" type="'
+ options.type + '" value="' + options.value + '"
placeholder="' + options.placeholder + '" class="ui-input ' +
options.cls + '">';
+ }
+});
+
// return
return {
Label : Label,
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f static/scripts/mvc/ui/ui-modal.js
--- a/static/scripts/mvc/ui/ui-modal.js
+++ b/static/scripts/mvc/ui/ui-modal.js
@@ -173,7 +173,7 @@
// fill regular modal template
_template: function(title) {
- return '<div class="modal">' +
+ return '<div class="ui-modal modal">' +
'<div class="modal-backdrop fade in"
style="z-index: -1;"></div>' +
'<div class="modal-dialog">' +
'<div class="modal-content">' +
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f static/scripts/mvc/ui/ui-portlet.js
--- a/static/scripts/mvc/ui/ui-portlet.js
+++ b/static/scripts/mvc/ui/ui-portlet.js
@@ -39,19 +39,22 @@
// link title
this.$title = this.$el.find('#portlet-header-text');
- // set content height
+ // set content format
+ var $portlet_content = this.$el.find('#portlet-content');
if (!this.options.scrollable) {
if (this.options.title) {
- this.$el.find('#portlet-content').addClass('no-scroll');
+ $portlet_content.addClass('no-scroll');
} else {
- this.$el.find('#portlet-content').css('height',
'100%');
+ $portlet_content.addClass('no-scroll-no-title');
}
+ } else {
+ $portlet_content.addClass('scroll');
}
- // set content height
+ // set content padding
if (this.options.nopadding) {
- this.$el.find('#portlet-content').css('padding',
'0px');
- this.$el.find('#content').css('padding', '0px');
+ $portlet_content.css('padding', '0px');
+ $content.css('padding', '0px');
}
// append buttons
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f static/scripts/packed/mvc/ui/ui-modal.js
--- a/static/scripts/packed/mvc/ui/ui-modal.js
+++ b/static/scripts/packed/mvc/ui/ui-modal.js
@@ -1,1 +1,1 @@
-define([],function(){var
a=Backbone.View.extend({elMain:"body",optionsDefault:{title:"ui-modal",body:"",backdrop:true,height:null,width:null,closing_events:false,closing_callback:null},buttonList:{},initialize:function(b){if(b){this._create(b)}},show:function(b){this.initialize(b);if(this.options.height){this.$body.css("height",this.options.height);this.$body.css("overflow","hidden")}else{this.$body.css("max-height",$(window).height()/2)}if(this.options.width){this.$dialog.css("width",this.options.width)}if(this.visible){this.$el.show()}else{this.$el.fadeIn("fast")}this.visible=true},hide:function(){this.visible=false;this.$el.fadeOut("fast");if(this.options.closing_callback){this.options.closing_callback()}},enableButton:function(b){var
c=this.buttonList[b];this.$buttons.find("#"+c).prop("disabled",false)},disableButton:function(b){var
c=this.buttonList[b];this.$buttons.find("#"+c).prop("disabled",true)},showButton:function(b){var
c=this.buttonList[b];this.$buttons.find("#"+c).show()},hideButton:function(b){var
c=this.buttonList[b];this.$buttons.find("#"+c).hide()},getButton:function(b){var
c=this.buttonList[b];return
this.$buttons.find("#"+c)},scrollTop:function(){return
this.$body.scrollTop()},_create:function(d){var
c=this;this.options=_.defaults(d,this.optionsDefault);if(this.options.body=="progress"){this.options.body=$('<div
class="progress progress-striped active"><div class="progress-bar
progress-bar-info"
style="width:100%"></div></div>')}if(this.$el){this.$el.remove();$(document).off("keyup.ui-modal")}this.setElement(this._template(this.options.title));this.$dialog=(this.$el).find(".modal-dialog");this.$body=(this.$el).find(".modal-body");this.$footer=(this.$el).find(".modal-footer");this.$buttons=(this.$el).find(".buttons");this.$backdrop=(this.$el).find(".modal-backdrop");this.$body.html(this.options.body);if(!this.options.backdrop){this.$backdrop.removeClass("in")}if(this.options.buttons){this.buttonList={};var
b=0;$.each(this.options.buttons,function(e,g){var
f="button-"+b++;c.$buttons.append($('<button
id="'+f+'"></button>').text(e).click(g)).append("
");c.buttonList[e]=f})}else{this.$footer.hide()}$(this.elMain).append($(this.el));if(this.options.closing_events){$(document).on("keyup.ui-modal",function(f){if(f.keyCode==27){c.hide()}});this.$el.find(".modal-backdrop").on("click",function(){c.hide()})}},_template:function(b){return'<div
class="modal"><div class="modal-backdrop fade in"
style="z-index: -1;"></div><div
class="modal-dialog"><div class="modal-content"><div
class="modal-header"><button type="button"
class="close" style="display:
none;">×</button><h4
class="title">'+b+'</h4></div><div
class="modal-body" style="position: static;"></div><div
class="modal-footer"><div class="buttons" style="float:
right;"></div></div></div</div></div>'}});return{View:a}});
\ No newline at end of file
+define([],function(){var
a=Backbone.View.extend({elMain:"body",optionsDefault:{title:"ui-modal",body:"",backdrop:true,height:null,width:null,closing_events:false,closing_callback:null},buttonList:{},initialize:function(b){if(b){this._create(b)}},show:function(b){this.initialize(b);if(this.options.height){this.$body.css("height",this.options.height);this.$body.css("overflow","hidden")}else{this.$body.css("max-height",$(window).height()/2)}if(this.options.width){this.$dialog.css("width",this.options.width)}if(this.visible){this.$el.show()}else{this.$el.fadeIn("fast")}this.visible=true},hide:function(){this.visible=false;this.$el.fadeOut("fast");if(this.options.closing_callback){this.options.closing_callback()}},enableButton:function(b){var
c=this.buttonList[b];this.$buttons.find("#"+c).prop("disabled",false)},disableButton:function(b){var
c=this.buttonList[b];this.$buttons.find("#"+c).prop("disabled",true)},showButton:function(b){var
c=this.buttonList[b];this.$buttons.find("#"+c).show()},hideButton:function(b){var
c=this.buttonList[b];this.$buttons.find("#"+c).hide()},getButton:function(b){var
c=this.buttonList[b];return
this.$buttons.find("#"+c)},scrollTop:function(){return
this.$body.scrollTop()},_create:function(d){var
c=this;this.options=_.defaults(d,this.optionsDefault);if(this.options.body=="progress"){this.options.body=$('<div
class="progress progress-striped active"><div class="progress-bar
progress-bar-info"
style="width:100%"></div></div>')}if(this.$el){this.$el.remove();$(document).off("keyup.ui-modal")}this.setElement(this._template(this.options.title));this.$dialog=(this.$el).find(".modal-dialog");this.$body=(this.$el).find(".modal-body");this.$footer=(this.$el).find(".modal-footer");this.$buttons=(this.$el).find(".buttons");this.$backdrop=(this.$el).find(".modal-backdrop");this.$body.html(this.options.body);if(!this.options.backdrop){this.$backdrop.removeClass("in")}if(this.options.buttons){this.buttonList={};var
b=0;$.each(this.options.buttons,function(e,g){var
f="button-"+b++;c.$buttons.append($('<button
id="'+f+'"></button>').text(e).click(g)).append("
");c.buttonList[e]=f})}else{this.$footer.hide()}$(this.elMain).append($(this.el));if(this.options.closing_events){$(document).on("keyup.ui-modal",function(f){if(f.keyCode==27){c.hide()}});this.$el.find(".modal-backdrop").on("click",function(){c.hide()})}},_template:function(b){return'<div
class="ui-modal modal"><div class="modal-backdrop fade in"
style="z-index: -1;"></div><div
class="modal-dialog"><div class="modal-content"><div
class="modal-header"><button type="button"
class="close" style="display:
none;">×</button><h4
class="title">'+b+'</h4></div><div
class="modal-body" style="position: static;"></div><div
class="modal-footer"><div class="buttons" style="float:
right;"></div></div></div</div></div>'}});return{View:a}});
\ No newline at end of file
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f static/scripts/packed/mvc/ui/ui-portlet.js
--- a/static/scripts/packed/mvc/ui/ui-portlet.js
+++ b/static/scripts/packed/mvc/ui/ui-portlet.js
@@ -1,1 +1,1 @@
-define(["utils/utils"],function(a){var
b=Backbone.View.extend({visible:false,optionsDefault:{title:"",icon:"",buttons:null,body:null,scrollable:true,nopadding:false,operations:null,placement:"bottom"},$title:null,$content:null,$buttons:null,$operations:null,initialize:function(d){this.options=a.merge(d,this.optionsDefault);this.setElement(this._template(this.options));this.$content=this.$el.find("#content");this.$title=this.$el.find("#portlet-header-text");if(!this.options.scrollable){if(this.options.title){this.$el.find("#portlet-content").addClass("no-scroll")}else{this.$el.find("#portlet-content").css("height","100%")}}if(this.options.nopadding){this.$el.find("#portlet-content").css("padding","0px");this.$el.find("#content").css("padding","0px")}this.$buttons=$(this.el).find("#buttons");if(this.options.buttons){var
c=this;$.each(this.options.buttons,function(e,f){f.$el.prop("id",e);c.$buttons.append(f.$el)})}else{this.$buttons.remove()}this.$operations=$(this.el).find("#operations");if(this.options.operations){var
c=this;$.each(this.options.operations,function(e,f){f.$el.prop("id",e);c.$operations.append(f.$el)})}if(this.options.body){this.append(this.options.body)}},append:function(c){this.$content.append(a.wrap(c))},content:function(){return
this.$content},show:function(){this.$el.fadeIn("fast");this.visible=true},hide:function(){this.$el.fadeOut("fast");this.visible=false},enableButton:function(c){this.$buttons.find("#"+c).prop("disabled",false)},disableButton:function(c){this.$buttons.find("#"+c).prop("disabled",true)},hideOperation:function(c){this.$operations.find("#"+c).hide()},showOperation:function(c){this.$operations.find("#"+c).show()},setOperation:function(e,d){var
c=this.$operations.find("#"+e);c.off("click");c.on("click",d)},title:function(d){var
c=this.$title;if(d){c.html(d)}return c.html()},_template:function(d){var c='<div
class="ui-portlet">';if(d.title){c+='<div
id="portlet-header" class="portlet-header"><div
id="operations" style="float:
right;"></div><h3>';if(d.icon){c+='<i class="icon fa
'+d.icon+'"> </i>'}c+='<span
id="portlet-header-text">'+d.title+"</span></h3></div>"}c+='<div
id="portlet-content"
class="portlet-content">';if(d.placement=="top"){c+='<div
id="buttons" class="buttons"></div>'}c+='<div
id="content"
class="content"></div>';if(d.placement=="bottom"){c+='<div
id="buttons"
class="buttons"></div>'}c+="</div></div>";return
c}});return{View:b}});
\ No newline at end of file
+define(["utils/utils"],function(a){var
b=Backbone.View.extend({visible:false,optionsDefault:{title:"",icon:"",buttons:null,body:null,scrollable:true,nopadding:false,operations:null,placement:"bottom"},$title:null,$content:null,$buttons:null,$operations:null,initialize:function(e){this.options=a.merge(e,this.optionsDefault);this.setElement(this._template(this.options));this.$content=this.$el.find("#content");this.$title=this.$el.find("#portlet-header-text");var
d=this.$el.find("#portlet-content");if(!this.options.scrollable){if(this.options.title){d.addClass("no-scroll")}else{d.addClass("no-scroll-no-title")}}else{d.addClass("scroll")}if(this.options.nopadding){d.css("padding","0px");$content.css("padding","0px")}this.$buttons=$(this.el).find("#buttons");if(this.options.buttons){var
c=this;$.each(this.options.buttons,function(f,g){g.$el.prop("id",f);c.$buttons.append(g.$el)})}else{this.$buttons.remove()}this.$operations=$(this.el).find("#operations");if(this.options.operations){var
c=this;$.each(this.options.operations,function(f,g){g.$el.prop("id",f);c.$operations.append(g.$el)})}if(this.options.body){this.append(this.options.body)}},append:function(c){this.$content.append(a.wrap(c))},content:function(){return
this.$content},show:function(){this.$el.fadeIn("fast");this.visible=true},hide:function(){this.$el.fadeOut("fast");this.visible=false},enableButton:function(c){this.$buttons.find("#"+c).prop("disabled",false)},disableButton:function(c){this.$buttons.find("#"+c).prop("disabled",true)},hideOperation:function(c){this.$operations.find("#"+c).hide()},showOperation:function(c){this.$operations.find("#"+c).show()},setOperation:function(e,d){var
c=this.$operations.find("#"+e);c.off("click");c.on("click",d)},title:function(d){var
c=this.$title;if(d){c.html(d)}return c.html()},_template:function(d){var c='<div
class="ui-portlet">';if(d.title){c+='<div
id="portlet-header" class="portlet-header"><div
id="operations" style="float:
right;"></div><h3>';if(d.icon){c+='<i class="icon fa
'+d.icon+'"> </i>'}c+='<span
id="portlet-header-text">'+d.title+"</span></h3></div>"}c+='<div
id="portlet-content"
class="portlet-content">';if(d.placement=="top"){c+='<div
id="buttons" class="buttons"></div>'}c+='<div
id="content"
class="content"></div>';if(d.placement=="bottom"){c+='<div
id="buttons"
class="buttons"></div>'}c+="</div></div>";return
c}});return{View:b}});
\ No newline at end of file
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f static/style/blue/base.css
--- a/static/style/blue/base.css
+++ b/static/style/blue/base.css
@@ -148,7 +148,7 @@
.form-control::-moz-placeholder{color:#999}
.form-control:-ms-input-placeholder{color:#999}
.form-control::-webkit-input-placeholder{color:#999}
-.form-control{display:block;width:100%;height:27px;padding:4px
10px;font-size:12px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px
solid #aaa;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px
rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px
rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out
.15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out
.15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px
rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px
rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}
+.form-control,.ui-input{display:block;width:100%;height:27px;padding:4px
10px;font-size:12px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px
solid #aaa;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px
rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px
rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out
.15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out
.15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px
rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px
rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}
.form-control[disabled],.form-control[readonly],fieldset[disabled]
.form-control{cursor:not-allowed;background-color:#eee}
textarea.form-control{height:auto}
.form-group{margin-bottom:15px}
@@ -1278,6 +1278,13 @@
.upload-ftp .upload-ftp-help{margin-bottom:10px}
.upload-ftp .upload-ftp-warning{text-align:center;margin-top:20px}
.upload-settings
.upload-settings-cover{position:absolute;width:100%;height:100%;top:0px;left:0px;background:#fff;opacity:0.4;cursor:no-drop}
+.ui-table-form-separator{font-weight:bold;font-size:0.9em}
+.ui-label{font-weight:bold}
+.ui-message{padding:2px 2px 2px 10px}
+.ui-icon{font-size:1.2em}
+.ui-button-icon{margin-right:5px}
+.ui-button-icon .button{margin-right:5px;margin-left:5px}
+.ui-button-icon .title{position:relative;font-size:0.8em;font-weight:normal;top:-1px}
.ui-tabs .ui-tabs-add{font-size:0.8em;margin-right:5px}
.ui-tabs .ui-tabs-delete{font-size:0.8em;margin-left:5px;cursor:pointer}
.no-highlight{-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;-ms-user-select:none;}
diff -r 18db7291e89062110a3c81df9293a68935779c47 -r
bc797256606a55ca3a793110a46740f869dd506f static/style/src/less/ui.less
--- a/static/style/src/less/ui.less
+++ b/static/style/src/less/ui.less
@@ -1,3 +1,40 @@
+.ui-table-form-separator {
+ font-weight: bold;
+ font-size: 0.9em;
+}
+
+.ui-label {
+ font-weight: bold;
+}
+
+.ui-message {
+ padding: 2px 2px 2px 10px;
+}
+
+.ui-icon {
+ font-size: 1.2em;
+}
+
+.ui-button-icon {
+ margin-right: 5px;
+}
+
+.ui-button-icon .button {
+ margin-right: 5px;
+ margin-left: 5px;
+}
+
+.ui-button-icon .title {
+ position: relative;
+ font-size: 0.8em;
+ font-weight: normal;
+ top: -1px;
+}
+
+.ui-input {
+ &:extend(.form-control);
+}
+
.ui-tabs {
.ui-tabs-add {
font-size : 0.8em;
@@ -56,7 +93,7 @@
.portlet-content {
height: inherit;
padding: 10px;
-
+
.content {
padding : 10px;
height : 100%;
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.