Jelajahi Sumber

redo some theme classnames

Adam Shaw 8 tahun lalu
induk
melakukan
c9109c8b2d

+ 1 - 1
src/common/DayGrid.js

@@ -77,7 +77,7 @@ var DayGrid = FC.DayGrid = Grid.extend(DayTableMixin, {
 	// `row` is the row number.
 	renderDayRowHtml: function(row, isRigid) {
 		var view = this.view;
-		var classes = [ 'fc-row', 'fc-week', view.calendar.theme.getClass('tableContent') ];
+		var classes = [ 'fc-row', 'fc-week', view.calendar.theme.getClass('dayRow') ];
 
 		if (isRigid) {
 			classes.push('fc-rigid');

+ 1 - 1
src/common/DayTableMixin.js

@@ -252,7 +252,7 @@ var DayTableMixin = FC.DayTableMixin = {
 		var view = this.view;
 
 		return '' +
-			'<div class="fc-row ' + view.calendar.theme.getClass('tableHeader') + '">' +
+			'<div class="fc-row ' + view.calendar.theme.getClass('headerRow') + '">' +
 				'<table class="' + this.view.calendar.theme.getClass('tableGrid') + '">' +
 					'<thead>' +
 						this.renderHeadTrHtml() +

+ 1 - 1
src/list/ListView.js

@@ -18,7 +18,7 @@ var ListView = View.extend({
 	renderSkeleton: function() {
 		this.el.addClass(
 			'fc-list-view ' +
-			this.calendar.theme.getClass('listContent')
+			this.calendar.theme.getClass('listView')
 		);
 
 		this.scroller.render();

+ 17 - 9
src/theme/BootstrapTheme.js

@@ -2,18 +2,26 @@
 var BootstrapTheme = Theme.extend({
 
 	classes: {
-		listContent: 'panel-default',
+		widget: 'fc-bootstrap3',
+
+		tableGrid: 'table-bordered', // avoid `table` class b/c don't want margins. only border color
+		tableList: 'table table-striped', // `table` class creates bottom margin but who cares
+
+		buttonGroup: 'btn-group',
+		button: 'btn btn-default',
+		stateActive: 'active',
+		stateDisabled: 'disabled',
+
 		popover: 'panel panel-default',
 		popoverHeader: 'panel-heading',
 		popoverContent: 'panel-body',
-		stateActive: 'active',
-		stateDisabled: 'disabled',
-		button: 'btn btn-default',
-		buttonGroup: 'btn-group',
-		tableHeader: 'panel-default',
-		tableContent: 'panel-default',
-		tableGrid: 'table-bordered',
-		tableList: 'table'
+
+		// day grid
+		headerRow: 'panel-default', // avoid `panel` class b/c don't want margins/radius. only border color
+		dayRow: 'panel-default', // "
+
+		// list view
+		listView: 'panel panel-default'
 	},
 
 	baseIconClass: 'glyphicon',

+ 15 - 9
src/theme/JqueryUiTheme.js

@@ -5,21 +5,27 @@ var JqueryUiTheme = Theme.extend({
 		widget: 'ui-widget',
 		widgetHeader: 'ui-widget-header',
 		widgetContent: 'ui-widget-content',
-		listContent: 'ui-widget-content',
-		popoverHeader: 'ui-widget-header',
-		popoverContent: 'ui-widget-content',
+
+		buttonGroup: 'fc-button-group',
+		button: 'ui-button',
+		cornerLeft: 'ui-corner-left',
+		cornerRight: 'ui-corner-right',
 		stateHighlight: 'ui-state-highlight',
 		stateDefault: 'ui-state-default',
 		stateActive: 'ui-state-active',
 		stateDisabled: 'ui-state-disabled',
 		stateHover: 'ui-state-hover',
 		stateDown: 'ui-state-down',
-		button: 'ui-button',
-		cornerLeft: 'ui-corner-left',
-		cornerRight: 'ui-corner-right',
-		buttonGroup: 'fc-button-group',
-		tableHeader: 'ui-widget-header',
-		tableContent: 'ui-widget-content'
+
+		popoverHeader: 'ui-widget-header',
+		popoverContent: 'ui-widget-content',
+
+		// day grid
+		headerRow: 'ui-widget-header',
+		dayRow: 'ui-widget-content',
+
+		// list view
+		listView: 'ui-widget-content'
 	},
 
 	baseIconClass: 'ui-icon',

+ 15 - 9
src/theme/StandardTheme.js

@@ -5,21 +5,27 @@ var StandardTheme = Theme.extend({
 		widget: 'fc-unthemed',
 		widgetHeader: 'fc-widget-header',
 		widgetContent: 'fc-widget-content',
-		listContent: 'fc-widget-content',
-		popoverHeader: 'fc-widget-header',
-		popoverContent: 'fc-widget-content',
+
+		buttonGroup: 'fc-button-group',
+		button: 'fc-button',
+		cornerLeft: 'fc-corner-left',
+		cornerRight: 'fc-corner-right',
 		stateHighlight: 'fc-state-highlight',
 		stateDefault: 'fc-state-default',
 		stateActive: 'fc-state-active',
 		stateDisabled: 'fc-state-disabled',
 		stateHover: 'fc-state-hover',
 		stateDown: 'fc-state-down',
-		button: 'fc-button',
-		cornerLeft: 'fc-corner-left',
-		cornerRight: 'fc-corner-right',
-		buttonGroup: 'fc-button-group',
-		tableHeader: 'fc-widget-header',
-		tableContent: 'fc-widget-content'
+
+		popoverHeader: 'fc-widget-header',
+		popoverContent: 'fc-widget-content',
+
+		// day grid
+		headerRow: 'fc-widget-header',
+		dayRow: 'fc-widget-content',
+
+		// list view
+		listView: 'fc-widget-content',
 	},
 
 	baseIconClass: 'fc-icon',