.github/workflows/azureCliDeployBlur.yml

@@ -1,40 +0,0 @@
-name: Deploy to demo-blur (azure storage)
-
-on:
-  push:
-    branches:
-      - demo-blur
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 4.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: '10.x'
-      - uses: actions/checkout@v2
-        with:
-          ref: demo-blur
-      - name: npm install, gulp, build
-        run: |
-          npm install
-          gulp build
-
-      # Azure CLI Upload to storage
-      - uses: azure/login@v1
-        with:
-          creds: ${{ secrets.AZURE_RBAC_CREDENTIALS }}
-      - name: Upload to blob storage
-        uses: azure/CLI@v1
-        with:
-          azcliversion: 2.0.72
-          inlineScript: |
-            az storage blob upload-batch -d '$web' -s release --account-name bluradmin --debug
-
-      # Azure logout
-      - name: logout
-        run: |
-          az logout
-        if: always()

gulp/build.js

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

gulp/styles.js

@@ -2,7 +2,6 @@
 
 var path = require('path');
 var gulp = require('gulp');
-var sass = require('gulp-sass');
 var conf = require('./conf');
 
 var browserSync = require('browser-sync');
@@ -35,6 +34,7 @@ var buildStyles = function () {
 
   var injectFiles = gulp.src([
     path.join(conf.paths.src, '/sass/**/_*.scss'),
+    '!' + path.join(conf.paths.src, '/sass/theme/conf/**/*.scss'),
     '!' + path.join(conf.paths.src, '/sass/404.scss'),
     '!' + path.join(conf.paths.src, '/sass/auth.scss')
   ], {read: false});
@@ -58,7 +58,6 @@ var buildStyles = function () {
     .pipe($.sass(sassOptions)).on('error', conf.errorHandler('Sass'))
     .pipe($.autoprefixer()).on('error', conf.errorHandler('Autoprefixer'))
     .pipe($.sourcemaps.write())
-    .pipe(sass({outputStyle: 'compressed'}))
     .pipe(gulp.dest(path.join(conf.paths.tmp, '/serve/app/')));
 };
 

src/app/theme/components/pageTop/pageTop.html

@@ -7,11 +7,6 @@
     <input id="searchInput" type="text" placeholder="Search for...">
   </div>
 
-  <div class="question-section">
-    Have questions?
-    <a href="mailto:contact@akveo.com">contact@akveo.com</a>
-  </div>
-
   <div class="user-profile clearfix">
     <div class="al-user-profile" uib-dropdown>
       <a uib-dropdown-toggle class="profile-toggle-link">

src/app/theme/theme.config.js

@@ -11,15 +11,15 @@
   /** @ngInject */
   function config(baConfigProvider, colorHelper, $provide) {
     $provide.decorator('$uiViewScroll', uiViewScrollDecorator);
-    baConfigProvider.changeTheme({blur: true});
+    //baConfigProvider.changeTheme({blur: true});
-
+    //
-    baConfigProvider.changeColors({
+    //baConfigProvider.changeColors({
-     default: 'rgba(#000000, 0.2)',
+    //  default: 'rgba(#000000, 0.2)',
-     defaultText: '#ffffff',
+    //  defaultText: '#ffffff',
-     dashboard: {
+    //  dashboard: {
-       white: '#ffffff',
+    //    white: '#ffffff',
-     },
+    //  },
-    });
+    //});
   }
 
   /** @ngInject */

src/index.html

@@ -52,11 +52,7 @@
   <footer class="al-footer clearfix">
     <div class="al-footer-right">Created with <i class="ion-heart"></i></div>
     <div class="al-footer-main clearfix">
-      <div class="al-copy">
+      <div class="al-copy">Blur Admin 2016</div>
-        ©
-        <a href="https://akveo.com" target="_blank">Akveo</a>
-        2016
-      </div>
       <ul class="al-share clearfix">
         <li><i class="socicon socicon-facebook"></i></li>
         <li><i class="socicon socicon-twitter"></i></li>

src/sass/app/_index.scss

@@ -1,18 +0,0 @@
-@import 'alerts';
-@import 'buttonsPage';
-@import 'chartsPage';
-@import 'dashboard';
-@import 'email';
-@import 'form';
-@import 'grid';
-@import 'iconsPage';
-@import 'modalNotifications';
-@import 'modals';
-@import 'notifications';
-@import 'profile';
-@import 'slider';
-@import 'table';
-@import 'tabsPage';
-@import 'tplSkinPanel';
-@import 'tree';
-@import 'typography';

src/sass/common.scss

@@ -1,3 +1,3 @@
 @import 'theme/conf/mixins';
-@import 'theme/conf/colorScheme/blur';
+@import 'theme/conf/colorScheme/mint';
 @import 'theme/conf/variables';

src/sass/main.scss

@@ -1,15 +1,4 @@
 @import 'common';
 
-@import 'theme/bootstrap-overrides/panel';
-@import 'theme/bootstrap-overrides/tabs';
-
-@import 'theme/components/index';
-
-@import 'theme/dashboard/index';
-
-@import 'theme/index';
-
-@import 'app/index';
-
 // injector
 // endinjector

src/sass/theme/_index.scss

@@ -1,9 +0,0 @@
-@import 'blur-admin-theme';
-@import 'buttons';
-@import 'datePicker';
-@import 'icons';
-@import 'layout';
-@import 'preloader';
-@import 'socicon';
-@import 'table';
-@import 'tree';

src/sass/theme/components/_index.scss

@@ -1,9 +0,0 @@
-@import 'accordion';
-@import 'backTop';
-@import 'baWizard';
-@import 'contentTop';
-@import 'msgCenter';
-@import 'pageTop';
-@import 'progressRound';
-@import 'sidebar';
-@import 'widgets';

src/sass/theme/components/_pageTop.scss

@@ -28,16 +28,6 @@ a.al-logo {
   }
 }
 
-.question-section {
-  position: absolute;
-  right: 200px;
-  top: 0;
-  height: 66px;
-  line-height: 66px;
-  color: #fff;
-  font-weight: 300;
-}
-
 .user-profile {
   float: right;
   min-width: 230px;

src/sass/theme/dashboard/_index.scss

@@ -1,10 +0,0 @@
-@import 'amChart';
-@import 'amChartMap';
-@import 'blurFeed';
-@import 'calendar';
-@import 'pieCharts';
-@import 'popularApp';
-@import 'timeline';
-@import 'todo';
-@import 'trafficChart';
-@import 'weather';