Skip to content

Commit 466ba2d

Browse files
committed
update submodule & fixed fullCalendar
1 parent 7f5acb1 commit 466ba2d

85 files changed

Lines changed: 3212 additions & 1948 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
.fc-header-left, .fc-header-center, .fc-header-right {
2+
width: 100%;
3+
display: block;
4+
text-align: center;
5+
}
6+
7+
/* Header
8+
------------------------------------------------------------------------*/
9+
10+
@media (min-width:768px){
11+
.fc-header-left, .fc-header-center, .fc-header-right {
12+
display: table-cell;
13+
}
14+
.fc-header-left {
15+
width: 25%;
16+
text-align: left;
17+
}
18+
19+
.fc-header-center {
20+
text-align: center;
21+
}
22+
23+
.fc-header-right {
24+
width: 25%;
25+
text-align: right;
26+
}
27+
}

dist/assets/js/main.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ function metisCalendar() {
758758
var hdr = {};
759759

760760
if ($(window).width() <= 767) {
761-
hdr = {left: 'title', center: '', right: 'prev,today,month,agendaWeek,agendaDay,next'};
761+
hdr = {left: 'title', center: 'month,agendaWeek,agendaDay', right: 'prev,today,next'};
762762
} else {
763763
hdr = {left: '', center: 'title', right: 'prev,today,month,agendaWeek,agendaDay,next'};
764764
}
@@ -815,8 +815,8 @@ function metisCalendar() {
815815
$('#calendar').fullCalendar({
816816
header: hdr,
817817
buttonText: {
818-
prev: '<i class="icon-chevron-left"></i>',
819-
next: '<i class="icon-chevron-right"></i>'
818+
prev: '<i class="fa fa-chevron-left"></i>',
819+
next: '<i class="fa fa-chevron-right"></i>'
820820
},
821821
editable: true,
822822
droppable: true, // this allows things to be dropped onto the calendar !!!

dist/assets/js/main.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/lib/animate/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"name": "animate.css",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"main": "./animate.css"
55
}

dist/assets/lib/autosize/autosize.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "autosize",
33
"title": "Autosize",
44
"description": "Automatically adjust textarea height based on user input.",
5-
"version": "1.18.0",
5+
"version": "1.18.1",
66
"dependencies": {
77
"jquery": ">=1.7"
88
},

dist/assets/lib/autosize/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery-autosize",
33
"description": "Automatically adjust textarea height based on user input.",
4-
"version": "1.18.0",
4+
"version": "1.18.1",
55
"dependencies": {
66
"jquery": ">=1.7"
77
},

dist/assets/lib/autosize/jquery.autosize.js

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
/*!
2-
Autosize v1.18.0 - 2013-10-20
2+
Autosize v1.18.1 - 2013-11-05
33
Automatically adjust textarea height based on user input.
44
(c) 2013 Jack Moore - http://www.jacklmoore.com/autosize
55
license: http://www.opensource.org/licenses/mit-license.php
66
*/
7-
(function (factory) {
8-
if (typeof define === 'function' && define.amd) {
9-
// AMD. Register as an anonymous module.
10-
define(['jquery'], factory);
11-
} else {
12-
// Browser globals: jQuery or jQuery-like library, such as Zepto
13-
factory(window.jQuery || window.$);
14-
}
15-
}(function ($) {
7+
(function ($) {
168
var
179
defaults = {
1810
className: 'autosizejs',
@@ -21,7 +13,7 @@
2113
resizeDelay: 10
2214
},
2315

24-
// border:0 is unnecessary, but avoids a bug in FireFox on OSX
16+
// border:0 is unnecessary, but avoids a bug in Firefox on OSX
2517
copy = '<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; padding: 0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',
2618

2719
// line-height is conditionally included because IE7/IE8/old Opera do not return the correct value.
@@ -255,4 +247,4 @@
255247
adjust();
256248
});
257249
};
258-
}));
250+
}(window.jQuery || window.$)); // jQuery or jQuery-like library, such as Zepto

dist/assets/lib/autosize/jquery.autosize.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/lib/autosize/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery-autosize",
33
"description": "Automatically adjust textarea height based on user input.",
4-
"version": "1.18.0",
4+
"version": "1.18.1",
55
"dependencies": {},
66
"keywords": [
77
"form",

dist/assets/lib/autosize/readme.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ Small jQuery plugin to allow dynamic resizing of textarea height, so that it gro
44

55
## Changelog
66

7-
### v1.18.0 - 2013/10/20
8-
* Fixed error that was being thrown in FireFox 3.x. Fixes #112
7+
### v1.18.1 - 2013/11/5
98
* Removed AMD support. Fixes #109 Ref #56.
109

10+
### v1.18.0 - 2013/10/20
11+
* Fixed error that was being thrown in Firefox 3.x. Fixes #112
12+
1113
### v1.17.8 - 2013/9/7
1214
* Minor change to not append the mirror element when the plugin is applied to an empty jQuery collection
1315

@@ -18,10 +20,10 @@ Small jQuery plugin to allow dynamic resizing of textarea height, so that it gro
1820
* Fixed a potential issue introduced in 1.17.4 that causes an 'NS_ERROR_FAILURE' error in Firefox.
1921

2022
### v1.17.5 - 2013/8/23
21-
* Fixed oversight in 1.17.4 that caused FireFox fix not to be applied.
23+
* Fixed oversight in 1.17.4 that caused Firefox fix not to be applied.
2224

2325
### v1.17.4 - 2013/8/22
24-
* Improved speed of editing large blocks of text in FireFox.
26+
* Improved speed of editing large blocks of text in Firefox.
2527

2628
### v1.17.3 - 2013/8/2013
2729
* Resolved an issue that was causing slowing down initialization for large blocks of text in Chrome.
@@ -144,7 +146,7 @@ Small jQuery plugin to allow dynamic resizing of textarea height, so that it gro
144146
$('#myTextArea').trigger('autosize');
145147

146148
### v1.5 - 2011/12/7
147-
* fixed a regression in detecting FireFox support
149+
* fixed a regression in detecting Firefox support
148150

149151
### v1.4 - 2011/11/22
150152
* added branching to exclude old browsers (FF3- & Safari4-)

0 commit comments

Comments
 (0)