Skip to content

Commit 5217b12

Browse files
committed
add plugins
1 parent 881f7e1 commit 5217b12

File tree

475 files changed

+153121
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

475 files changed

+153121
-87
lines changed

umaterial/app/js/utils.js

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

umaterial/app/modules/dashboard.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ UMaterialApp
176176
return {
177177
restrict: 'A',
178178
link: function (scope, element) {
179-
$ocLazyLoad.load({insertBefore:'link:eq(0)',files:['vendors/bower_components/fullcalendar/dist/fullcalendar.min.js',{ type: 'css', path: 'vendors/bower_components/fullcalendar/dist/fullcalendar.css'}]}).then(function () {
179+
$ocLazyLoad.load({insertBefore:'link:eq(0)',files:['plugins/bower_components/moment/min/moment.min.js','plugins/bower_components/fullcalendar/dist/fullcalendar.min.js',{ type: 'css', path: 'plugins/bower_components/fullcalendar/dist/fullcalendar.css'}]}).then(function () {
180180
setTimeout(function () {
181181
element.fullCalendar({
182182
contentHeight: 'auto',
@@ -244,7 +244,7 @@ UMaterialApp
244244
link: function (scope, element) {
245245

246246
$ocLazyLoad.load([
247-
'vendors/bower_components/sparklines/index.js']).then(function () {
247+
'plugins/bower_components/sparklines/index.js']).then(function () {
248248
function sparkLineLine(selector, values, width, height, lineColor, fillColor, lineWidth, maxSpotColor, minSpotColor, spotColor, spotRadius, hSpotColor, hLineColor) {
249249
$(selector).sparkline(values, {
250250
type: 'line',

umaterial/dist/css/UMaterial.css

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4457,6 +4457,38 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
44574457
border-color: #fff;
44584458
cursor: not-allowed;
44594459
}
4460+
.pagination-lg > li > a,
4461+
.pagination-lg > li > span {
4462+
padding: 10px 16px;
4463+
font-size: 18px;
4464+
line-height: 1.3333333;
4465+
}
4466+
.pagination-lg > li:first-child > a,
4467+
.pagination-lg > li:first-child > span {
4468+
border-bottom-left-radius: 2px;
4469+
border-top-left-radius: 2px;
4470+
}
4471+
.pagination-lg > li:last-child > a,
4472+
.pagination-lg > li:last-child > span {
4473+
border-bottom-right-radius: 2px;
4474+
border-top-right-radius: 2px;
4475+
}
4476+
.pagination-sm > li > a,
4477+
.pagination-sm > li > span {
4478+
padding: 5px 10px;
4479+
font-size: 12px;
4480+
line-height: 1.5;
4481+
}
4482+
.pagination-sm > li:first-child > a,
4483+
.pagination-sm > li:first-child > span {
4484+
border-bottom-left-radius: 2px;
4485+
border-top-left-radius: 2px;
4486+
}
4487+
.pagination-sm > li:last-child > a,
4488+
.pagination-sm > li:last-child > span {
4489+
border-bottom-right-radius: 2px;
4490+
border-top-right-radius: 2px;
4491+
}
44604492
.pager {
44614493
padding-left: 0;
44624494
margin: 20px 0;
@@ -4501,7 +4533,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
45014533
font-size: 75%;
45024534
font-weight: bold;
45034535
line-height: 1;
4504-
color: rgba(0, 0, 0, 0.3);
4536+
color: #fff;
45054537
text-align: center;
45064538
white-space: nowrap;
45074539
vertical-align: baseline;

umaterial/dist/css/UMaterial.min.css

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

umaterial/dist/css/libs.css

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

0 commit comments

Comments
 (0)