sidebar fix, footer fix, remove css libs - add bower libs, other fixes

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",
+    "font-awesome": "fontawesome#~4.4.0",
+    "fullcalendar": "~2.4.0",
     "highlight": "~8.8.0",
-    "jquery.easing": "~1.3.1",
+    "jquery": "~2.1.4",
     "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.easing": "~1.3.1",
     "jquery.easy-pie-chart": "~2.1.6",
-    "fullcalendar": "~2.4.0",
-    "Chart.js": "~1.0.2",
-    "amcharts-stock": "*",
-    "angular-ui-sortable": "~0.13.4"
+    "leaflet": "~0.7.5",
+    "moment": "~2.10.6"
   }
 }

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/'));

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';

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;
   }
 }

src/app/pages/dashboard/widgets/todo/todo.html

@@ -4,18 +4,10 @@
     <i class="mark" ng-click="changeColor(item)"></i>
     <label class="todo-checkbox custom-checkbox custom-input-success">
       <input type="checkbox" ng-model="isChecked">
-      <span></span>
+      <span class="cut-with-dots">{{ item.text }}</span>
     </label>
 
-    <span class="todo-text cut-with-dots nowrap">
-      <span ng-show="!item.edit" ng-click="item.edit = true">{{ item.text }}</span>
-      <input type="text"
-             ng-class="{'vis-hidden': !item.edit}"
-             ng-model="item.text"
-             ng-blur="item.edit = false"
-             auto-focus="item.edit"
-             ng-keydown="blurOnEnter($event, item)">
-    </span>
+    <!--<span class="todo-text cut-with-dots nowrap">{{ item.text }}</span>-->
     <i class="remove-todo ion-ios-close-empty" ng-click="item.deleted = true"></i>
   </li>
 </ul>

src/app/pages/profile/_profile.scss

@@ -213,3 +213,11 @@ a.sn-link {
   padding-left: 12px;
 }
 
+.profile-page {
+  .form-group {
+    label {
+      line-height: 34px;
+    }
+  }
+}
+

src/app/pages/profile/profile.html

@@ -1,7 +1,7 @@
 <div class="widgets">
   <div class="widgets-block">
     <div class="panel panel-default invisible" zoom-in>
-      <div class="panel-body content-panel">
+      <div class="panel-body content-panel profile-page">
 
         <div class="progress-info">Your profile is 70% Complete</div>
         <div class="progress">
@@ -144,12 +144,12 @@ <h3 class="with-line">Social Profiles</h3>
           <div class="col-md-3 col-sm-4" ng-repeat="item in socialProfiles">
 
             <a class="sn-link" href ng-click="showModal()" ng-if="!item.href">
-              <i class="socicon socicon-facebook"></i>
+              <i class="socicon {{ item.icon }}"></i>
               <span>{{ item.name }}</span>
             </a>
 
             <a class="sn-link connected" href="{{ item.href }}" target="_blank" ng-if="item.href">
-              <i class="socicon socicon-facebook"></i>
+              <i class="socicon {{ item.icon }}"></i>
               <span>{{ item.name }}</span>
               <em class="ion-ios-close-empty sn-link-close" ng-mousedown="unconnect(item)"></em>
             </a>

src/assets/css/_variables.scss

@@ -28,7 +28,7 @@ $stackoverflow-color: #2F96E8;
 $dribble-color: #F26798;
 $behace-color: #0093FA;
 
-$panel-bg: #f4f4f4;
+$panel-bg: #f8f8f8;
 $panel-bg-hover: #fff;
 
 $disabled: #bdbdbd;