Bootstrap 3

New: Updated UI
New: Mobile browser support
Fixed: /favicon.ico will return the favicon now
This commit is contained in:
Mark McDowall
2014-05-04 00:11:43 -07:00
parent 28fa264c69
commit 99f2b07a11
148 changed files with 2691 additions and 2054 deletions
@@ -5,8 +5,23 @@ define(
'Shared/Toolbar/Button/ButtonView'
], function (Marionette, ButtonView) {
return Marionette.CollectionView.extend({
className: 'btn-group',
itemView : ButtonView
className : 'btn-group',
itemView : ButtonView,
initialize: function (options) {
this.menu = options.menu;
this.className = 'btn-group';
if (options.menu.collapse) {
this.className += ' btn-group-collapse';
}
},
onRender: function () {
if (this.menu.collapse) {
this.$el.addClass('btn-group-collapse');
}
}
});
});
+4 -4
View File
@@ -97,13 +97,13 @@ define(
}
}
var regionId = position + "_" + (index + 1);
var regionId = position + '_' + (index + 1);
var region = this[regionId];
if (!region) {
var regionClassName = "x-toolbar-" + position + "-" + (index + 1);
this.ui[position + '_x'].append('<div class="toolbar-group '+regionClassName+'" />\r\n');
region = this.addRegion(regionId, "." + regionClassName);
var regionClassName = 'x-toolbar-' + position + '-' + (index + 1);
this.ui[position + '_x'].append('<div class="toolbar-group ' + regionClassName + '" />\r\n');
region = this.addRegion(regionId, '.' + regionClassName);
}
region.show(buttonGroupView);
@@ -1,2 +1,2 @@
<div class="pull-left page-toolbar x-toolbar-left" />
<div class="pull-right page-toolbar x-toolbar-right" />
<div class="page-toolbar pull-left pull-none-xs x-toolbar-left" />
<div class="page-toolbar pull-right pull-none-xs x-toolbar-right" />