From 1097b5f34bfe679e378faf27da722e49e49aa387 Mon Sep 17 00:00:00 2001 From: Nasta Date: Fri, 18 Sep 2015 21:59:32 +0300 Subject: [PATCH] sidebar fix, footer fix, remove css libs - add bower libs, other fixes --- bower.json | 31 +- gulpfile.js | 27 +- src/app/components/sidebar/sidebar.js | 2 +- .../pages/dashboard/widgets/todo/_todo.scss | 21 +- .../pages/dashboard/widgets/todo/todo.html | 12 +- src/app/pages/profile/_profile.scss | 8 + src/app/pages/profile/profile.html | 6 +- src/assets/css/_variables.scss | 2 +- src/assets/css/fonts/FontAwesome.otf | Bin 93888 -> 0 bytes src/assets/css/fonts/fontawesome-webfont.eot | Bin 60767 -> 0 bytes src/assets/css/fonts/fontawesome-webfont.svg | 565 --- src/assets/css/fonts/fontawesome-webfont.ttf | Bin 122092 -> 0 bytes src/assets/css/fonts/fontawesome-webfont.woff | Bin 71508 -> 0 bytes .../css/fonts/fontawesome-webfont.woff2 | Bin 56780 -> 0 bytes .../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 229 -- .../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 0 bytes src/assets/css/fonts/ionicons.eot | Bin 120724 -> 0 bytes src/assets/css/fonts/ionicons.svg | 2230 ----------- src/assets/css/fonts/ionicons.ttf | Bin 188508 -> 0 bytes src/assets/css/fonts/ionicons.woff | Bin 67904 -> 0 bytes src/assets/css/lib/animate.css | 3272 ----------------- src/assets/css/lib/bootstrap-select.min.css | 6 - src/assets/css/lib/bootstrap-switch.min.css | 22 - src/assets/css/lib/bootstrap-tagsinput.css | 55 - src/assets/css/lib/bootstrap.min.css | 5 - src/assets/css/lib/font-awesome.min.css | 4 - src/assets/css/lib/ionicons.min.css | 11 - src/index.html | 2 +- 30 files changed, 60 insertions(+), 6450 deletions(-) delete mode 100644 src/assets/css/fonts/FontAwesome.otf delete mode 100644 src/assets/css/fonts/fontawesome-webfont.eot delete mode 100644 src/assets/css/fonts/fontawesome-webfont.svg delete mode 100644 src/assets/css/fonts/fontawesome-webfont.ttf delete mode 100644 src/assets/css/fonts/fontawesome-webfont.woff delete mode 100644 src/assets/css/fonts/fontawesome-webfont.woff2 delete mode 100644 src/assets/css/fonts/glyphicons-halflings-regular.eot delete mode 100644 src/assets/css/fonts/glyphicons-halflings-regular.svg delete mode 100644 src/assets/css/fonts/glyphicons-halflings-regular.ttf delete mode 100644 src/assets/css/fonts/glyphicons-halflings-regular.woff delete mode 100644 src/assets/css/fonts/ionicons.eot delete mode 100644 src/assets/css/fonts/ionicons.svg delete mode 100644 src/assets/css/fonts/ionicons.ttf delete mode 100644 src/assets/css/fonts/ionicons.woff delete mode 100644 src/assets/css/lib/animate.css delete mode 100644 src/assets/css/lib/bootstrap-select.min.css delete mode 100644 src/assets/css/lib/bootstrap-switch.min.css delete mode 100644 src/assets/css/lib/bootstrap-tagsinput.css delete mode 100644 src/assets/css/lib/bootstrap.min.css delete mode 100644 src/assets/css/lib/font-awesome.min.css delete mode 100644 src/assets/css/lib/ionicons.min.css diff --git a/bower.json b/bower.json index c15066f..f609ba8 100644 --- a/bower.json +++ b/bower.json @@ -15,25 +15,28 @@ "tests" ], "dependencies": { - "jquery": "~2.1.4", + "Chart.js": "~1.0.2", + "Ionicons": "ionicons#~2.0.1", + "amcharts": "~3.15.2", + "amcharts-stock": "*", + "ammap": "~3.14.5", + "angular": "~1.4.6", "angular-route": "~1.4.6", + "angular-toastr": "~1.5.0", + "angular-ui-sortable": "~0.13.4", + "animate.css": "~3.4.0", "bootstrap": "~3.3.5", "bootstrap-select": "~1.7.3", "bootstrap-switch": "~3.3.2", "bootstrap-tagsinput": "~0.5.0", - "highlight": "~8.8.0", - "jquery.easing": "~1.3.1", - "jquery-ui": "~1.11.4", - "moment": "~2.10.6", - "amcharts": "~3.15.2", - "angular": "~1.4.6", - "ammap": "~3.14.5", - "leaflet": "~0.7.5", - "angular-toastr": "~1.5.0", - "jquery.easy-pie-chart": "~2.1.6", + "font-awesome": "fontawesome#~4.4.0", "fullcalendar": "~2.4.0", - "Chart.js": "~1.0.2", - "amcharts-stock": "*", - "angular-ui-sortable": "~0.13.4" + "highlight": "~8.8.0", + "jquery": "~2.1.4", + "jquery-ui": "~1.11.4", + "jquery.easing": "~1.3.1", + "jquery.easy-pie-chart": "~2.1.6", + "leaflet": "~0.7.5", + "moment": "~2.10.6" } } diff --git a/gulpfile.js b/gulpfile.js index 0fbcf2d..8ff17e1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,8 +12,10 @@ var eventStream = require('event-stream'); var templateCache = require('gulp-angular-templatecache'); var minifyHTML = require('gulp-minify-html'); +var bootstrapCssSrc = 'bower_components/bootstrap/dist/css/bootstrap.min.css'; + gulp.task('minify-404-css', function () { - var vendorFiles = gulp.src('src/assets/css/lib/bootstrap.min.css'); + var vendorFiles = gulp.src(bootstrapCssSrc); var appFiles = gulp.src('src/assets/css/404.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError)); return eventStream.concat(vendorFiles, appFiles) @@ -24,7 +26,7 @@ gulp.task('minify-404-css', function () { }); gulp.task('minify-auth-css', function () { - var vendorFiles = gulp.src('src/assets/css/lib/bootstrap.min.css'); + var vendorFiles = gulp.src(bootstrapCssSrc); var appFiles = gulp.src('src/assets/css/auth.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError)); return eventStream.concat(vendorFiles, appFiles) @@ -35,7 +37,15 @@ gulp.task('minify-auth-css', function () { }); gulp.task('minify-css', ['minify-404-css', 'minify-auth-css'], function () { - var vendorFiles = gulp.src('src/assets/css/lib/*.css'); + var vendorFiles = gulp.src([ + bootstrapCssSrc, + 'bower_components/bootstrap-select/dist/css/bootstrap-select.min.css', + 'bower_components/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.min.css', + 'bower_components/bootstrap-tagsinput/dist/bootstrap-tagsinput.css', + 'bower_components/Ionicons/css/ionicons.min.css', + 'bower_components/font-awesome/css/font-awesome.min.css', + 'bower_components/animate.css/animate.min.css' + ]); var appFiles = gulp.src('src/assets/css/main.scss').pipe(sass({ style: 'compressed' }).on('error', sass.logError)); return eventStream.concat(vendorFiles, appFiles) @@ -107,20 +117,25 @@ gulp.task('js', function () { }); gulp.task('font', function () { - var fontSrc = 'src/assets/css/fonts/*'; + var fontSrc = [ + 'src/assets/css/fonts/*', + 'bower_components/bootstrap/fonts/*', + 'bower_components/font-awesome/fonts/*', + 'bower_components/Ionicons/fonts/*', + ]; var fontDst = 'release/fonts/'; gulp.src(fontSrc).pipe(gulp.dest(fontDst)); }); -gulp.task('templateCache', function() { +gulp.task('templateCache', function () { return gulp.src('src/app/**/*.html') .pipe(minifyHTML({ conditionals: true, spare: true, empty: true })) .pipe(templateCache({ root: 'app/', module: 'BlurAdmin' })) .pipe(gulp.dest('release/js')); }); -gulp.task('html', function(){ +gulp.task('html', function () { return gulp.src('src/*.html') .pipe(minifyHTML({ conditionals: true, spare: true, empty: true })) .pipe(gulp.dest('release/')); diff --git a/src/app/components/sidebar/sidebar.js b/src/app/components/sidebar/sidebar.js index 69d932c..08af755 100644 --- a/src/app/components/sidebar/sidebar.js +++ b/src/app/components/sidebar/sidebar.js @@ -6,7 +6,7 @@ blurAdminApp.directive('sidebar', function () { templateUrl: 'app/components/sidebar/sidebar.html', controller: ['$scope', '$element', '$window', '$timeout', '$location', function ($scope, $element, $window, $timeout, $location) { - var resWidthCollapseSidebar = 1200; + var resWidthCollapseSidebar = 1120; var resWidthHideSidebar = 500; var body = $('body'); var collapsedClass = 'collapsed-sidebar'; diff --git a/src/app/pages/dashboard/widgets/todo/_todo.scss b/src/app/pages/dashboard/widgets/todo/_todo.scss index e927ea6..857dc72 100644 --- a/src/app/pages/dashboard/widgets/todo/_todo.scss +++ b/src/app/pages/dashboard/widgets/todo/_todo.scss @@ -16,6 +16,7 @@ ul.todo-list { position: relative; border: 1px solid $input-border; cursor: grab; + height: 42px; &.ui-sortable-helper { background: #ffffff; } @@ -82,23 +83,13 @@ ul.todo-list { } } -.todo-checkbox { - position: absolute; -} - -.todo-text { - padding-left: 25px; +label.todo-checkbox { width: 100%; padding-right: 25px; - cursor: text; + min-height: 16px; + cursor: pointer; span { - display: block; - } - input { - border: none; - background: transparent; - outline: none; - padding: 0; - width: 100%; + white-space: nowrap; + height: 16px; } } \ No newline at end of file diff --git a/src/app/pages/dashboard/widgets/todo/todo.html b/src/app/pages/dashboard/widgets/todo/todo.html index b1ddcb7..2cd0b14 100644 --- a/src/app/pages/dashboard/widgets/todo/todo.html +++ b/src/app/pages/dashboard/widgets/todo/todo.html @@ -4,18 +4,10 @@ - - {{ item.text }} - - + \ No newline at end of file diff --git a/src/app/pages/profile/_profile.scss b/src/app/pages/profile/_profile.scss index 9ea464b..4d5739b 100644 --- a/src/app/pages/profile/_profile.scss +++ b/src/app/pages/profile/_profile.scss @@ -213,3 +213,11 @@ a.sn-link { padding-left: 12px; } +.profile-page { + .form-group { + label { + line-height: 34px; + } + } +} + diff --git a/src/app/pages/profile/profile.html b/src/app/pages/profile/profile.html index 345a055..219ebd9 100644 --- a/src/app/pages/profile/profile.html +++ b/src/app/pages/profile/profile.html @@ -1,7 +1,7 @@