Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add compatibilty with jspm and SystemJS #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 13 additions & 26 deletions dist/ng-flat-datepicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,18 @@
}

.ng-flat-datepicker table caption .ng-flat-datepicker-header-wrapper {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-ms-flex-pack: justify;
justify-content: space-between;
-ms-flex-align: center;
align-items: center;
height: 65px;
color: white;
font-size: 22px;
}

.ng-flat-datepicker table caption .ng-flat-datepicker-header-wrapper .ng-flat-datepicker-header-year {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
padding-top: 1px;
Expand Down Expand Up @@ -118,8 +114,7 @@
user-select: none;
}

.ng-flat-datepicker table tbody tr td.day-item,
.ng-flat-datepicker table tbody tr td.disabled {
.ng-flat-datepicker table tbody tr td.day-item, .ng-flat-datepicker table tbody tr td.disabled {
padding: 0;
height: 37.42857px;
line-height: 37.42857px;
Expand All @@ -128,36 +123,30 @@
color: #8d9ca4;
}

.ng-flat-datepicker table tbody tr td.day-item.day,
.ng-flat-datepicker table tbody tr td.disabled.day {
.ng-flat-datepicker table tbody tr td.day-item.day, .ng-flat-datepicker table tbody tr td.disabled.day {
color: #384146;
}

.ng-flat-datepicker table tbody tr td.day-item.isToday,
.ng-flat-datepicker table tbody tr td.disabled.isToday {
.ng-flat-datepicker table tbody tr td.day-item.isToday, .ng-flat-datepicker table tbody tr td.disabled.isToday {
color: #1b1b1b;
font-weight: 700;
}

.ng-flat-datepicker table tbody tr td.day-item.isSelected,
.ng-flat-datepicker table tbody tr td.disabled.isSelected {
.ng-flat-datepicker table tbody tr td.day-item.isSelected, .ng-flat-datepicker table tbody tr td.disabled.isSelected {
background-color: #0093de;
color: #f5f5f5 !important;
}

.ng-flat-datepicker table tbody tr td.day-item.isInMonth,
.ng-flat-datepicker table tbody tr td.disabled.isInMonth {
.ng-flat-datepicker table tbody tr td.day-item.isInMonth, .ng-flat-datepicker table tbody tr td.disabled.isInMonth {
color: #384146;
}

.ng-flat-datepicker table tbody tr td.day-item.isDisabled,
.ng-flat-datepicker table tbody tr td.disabled.isDisabled {
.ng-flat-datepicker table tbody tr td.day-item.isDisabled, .ng-flat-datepicker table tbody tr td.disabled.isDisabled {
cursor: default;
color: #e2e6e8;
}

.ng-flat-datepicker table tbody tr td.day-item.isDisabled:hover,
.ng-flat-datepicker table tbody tr td.disabled.isDisabled:hover {
.ng-flat-datepicker table tbody tr td.day-item.isDisabled:hover, .ng-flat-datepicker table tbody tr td.disabled.isDisabled:hover {
color: #e2e6e8 !important;
background-color: transparent;
}
Expand All @@ -183,8 +172,7 @@
}

.ng-flat-datepicker-arrow.ng-flat-datepicker-arrow-left svg {
-webkit-transform: rotate(180deg);
transform: rotate(180deg);
transform: rotate(180deg);
}

.ng-flat-datepicker-custom-select-title {
Expand All @@ -197,8 +185,7 @@
cursor: pointer;
}

.ng-flat-datepicker-custom-select-title.selected,
.ng-flat-datepicker-custom-select-title:hover {
.ng-flat-datepicker-custom-select-title.selected, .ng-flat-datepicker-custom-select-title:hover {
border-color: white !important;
}

Expand Down
5 changes: 4 additions & 1 deletion dist/ng-flat-datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* @example <ng-datepicker></ng-datepicker>
*/

ngFlatDatepickerDirective.$inject = ["$templateCache", "$compile", "$document", "datesCalculator"];
angular
.module('ngFlatDatepicker', [])
.directive('ngFlatDatepicker', ngFlatDatepickerDirective);
Expand All @@ -20,6 +21,7 @@
},
link: function(scope, element, attrs, ngModel) {

var moment = window.moment ? window.moment : require('moment');
var template = angular.element($templateCache.get('datepicker.html'));
var dateSelected = '';
var today = moment.utc();
Expand Down Expand Up @@ -204,7 +206,6 @@
}
};
}
ngFlatDatepickerDirective.$inject = ["$templateCache", "$compile", "$document", "datesCalculator"];

})();

Expand All @@ -222,6 +223,8 @@

function datesCalculator () {

var moment = window.moment ? window.moment : require('moment');

/**
* List all years for the select
* @return {[type]} [description]
Expand Down
2 changes: 1 addition & 1 deletion dist/ng-flat-datepicker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading