6 Commits

Author SHA1 Message Date
ESadouski
55e1c26fee chore(version): update version 2016-12-15 12:50:58 +03:00
ESadouski
24e06af05a fix(datePicker) - fixed datePicker position 2016-12-14 15:00:10 +03:00
ESadouski
6b7ba30e49 fix(path) - fixed progressbar and datepicker path 2016-12-14 14:09:40 +03:00
ESadouski
59573260b7 fix(menu) - fixed dependencies 2016-12-13 15:17:39 +03:00
ESadouski
7bb38dd564 fix(gulp) - fixed gulp build 2016-12-13 15:16:35 +03:00
ESadouski
0b75c2d18f fix(uglify) - rollback uglify 2016-12-10 16:49:08 +03:00
8 changed files with 19 additions and 14 deletions

View File

@@ -1,3 +1,9 @@
v1.3.1 - 15 Dec 2016
--------------------
- Fix gulp build
- Update dependencies
- Fix datepicker position
v1.3.0 - 10 Dec 2016
--------------------
- Update bower dependencies

View File

@@ -1,6 +1,6 @@
{
"name": "blur-admin",
"version": "1.3.0",
"version": "1.3.1",
"homepage": "https://github.com/1itvinka/blur-admin",
"authors": [
"akveo"
@@ -39,16 +39,16 @@
"font-awesome": "fontawesome#~4.4.0",
"fullcalendar": "~3.0.1",
"highlight": "~8.8.0",
"leaflet": "~1.0.2",
"leaflet": "~0.7.5",
"moment": "~2.17.0",
"slimScroll": "jquery-slimscroll#~1.3.6",
"angular-progress-button-styles": "~0.1.0",
"angular-ui-router": "~0.3.2",
"angular-chart.js": "~1.0.3",
"angular-chartist.js": "~3.3.12",
"chartist": "~0.9.5",
"chartist": "0.9.5",
"angular-morris-chart": "~1.1.0",
"ionrangeslider": "~2.1.2",
"ionrangeslider": "2.1.4",
"angular-bootstrap": "~1.3.3",
"angular-animate": "~1.5.8",
"textAngular": "~1.4.6",

View File

@@ -33,9 +33,9 @@ gulp.task('html', ['inject', 'partials'], function () {
addRootSlash: false
};
var htmlFilter = $.filter('*.html', { restore: true });
var jsFilter = $.filter('**/*.js', { restore: true });
var cssFilter = $.filter('**/*.css', { restore: true });
var htmlFilter = $.filter('*.html', { restore: true, dot:true});
var jsFilter = $.filter('**/*.js', { restore: true, dot:true});
var cssFilter = $.filter('**/*.css', { restore: true, dot:true});
var assets;
return gulp.src(path.join(conf.paths.tmp, '/serve/*.html'))

View File

@@ -1,6 +1,6 @@
{
"name": "blur_admin",
"version": "1.3.0",
"version": "1.3.1",
"devDependencies": {
"browser-sync": "~2.18.2",
"browser-sync-spa": "~1.0.3",
@@ -30,7 +30,7 @@
"gulp-sass": "~2.3.2",
"gulp-shell": "^0.5.2",
"gulp-size": "~2.1.0",
"gulp-sourcemaps": "~1.9.1",
"gulp-sourcemaps": "~1.6.0",
"gulp-uglify": "~2.0.0",
"gulp-useref": "~1.3.0",
"gulp-util": "~3.0.6",

View File

@@ -38,7 +38,7 @@
ba-panel
ba-panel-title="Datepicker"
ba-panel-class="with-scroll">
<div ng-include="'app/pages/form/inputs/widgets/datepickers/datepickers.html'"></div>
<div ng-include="'app/pages/form/inputs/widgets/datePickers/datePickers.html'"></div>
</div>
</div>

View File

@@ -1,5 +1,5 @@
<div class="datepicker row">
<div class="col-sm-6" ng-controller="datepickerCtrl">
<div class="col-xlg-6 col-md-12 col-sm-6" ng-controller="datepickerCtrl">
<h4>Inline</h4>
<label>Selected date is: <em>{{dt | date:'fullDate' }}</em></label>
<div class="uib-datepicker-wrap">
@@ -7,7 +7,7 @@
</div>
</div>
<div class="col-sm-6" ng-controller="datepickerpopupCtrl">
<div class="col-xlg-6 col-md-12 col-sm-6" ng-controller="datepickerpopupCtrl">
<h4>Popup</h4>
<label>Selected date is: <em>{{dt | date:'fullDate' }}</em></label>
<p class="input-group">

View File

@@ -29,7 +29,7 @@
if (!opened) {
methods = $uibModal.open({
animation: true,
templateUrl: 'app/pages/ui/modals/progressmodal/progressModal.html',
templateUrl: 'app/pages/ui/modals/progressModal/progressModal.html',
size: 'sm',
keyboard: false,
backdrop: 'static'

View File

@@ -18,7 +18,6 @@
}
.uib-datepicker-wrap {
display:inline-block;
min-height:270px;
}