chore: apply latest changes for header and footer

.github/workflows/azureCliDeployBlur.yml

@@ -0,0 +1,40 @@
+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()

.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: node_js
 
 node_js:
-  - "4"
+  - "8"
 
 addons:
   apt:
@@ -14,9 +14,7 @@ addons:
 
 install:
   - npm config set spin false
-  - npm install -g npm@3
   - npm install -g gulp
-  - npm install -g bower
 
   - npm install
 

docs/contents/articles/091-downloads/index.md

@@ -33,5 +33,6 @@ start chrome --user-data-dir="C:/Chrome dev session" --disable-web-security
 
 ## Links for downloads
 
+[BlurAdmin 1.3.1](/blur-admin/downloads/blur-admin-1.3.1.zip)
 [BlurAdmin 1.2.0](/blur-admin/downloads/blur-admin-1.2.0.zip)
 

docs/templates/layout.jade

@@ -18,7 +18,18 @@ html(lang='en')
       link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900|Anonymous+Pro:400,700,400italic,700italic&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic')
       link(rel='stylesheet', href=contents.css['main.css'].url)
       link(rel='shortcut icon', href=contents.images['favicon.png'].url)
+      | <!-- Google Tag Manager -->
+      | <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+      | new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+      | j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+      | 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+      | })(window,document,'script','dataLayer','GTM-K8MXX5F');</script>
+      | <!-- End Google Tag Manager -->
   body(class=bodyclass)
+    | <!-- Google Tag Manager (noscript) -->
+    | <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-K8MXX5F"
+    | height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    | <!-- End Google Tag Manager (noscript) -->
     div.container
       div.nav-main
         div.wrap
@@ -35,13 +46,9 @@ html(lang='en')
       block content
         h2 Welcome to blur admin!
       footer.wrap
-        div.left Powered by Angular, Bootsrap, Gulp and more...
+        div.left Powered by Angular, Bootstrap, Gulp and more...
         div.right
           | © 2015–2016 Akveo LLC<br />
           | Documentation licensed under #[a(href='https://creativecommons.org/licenses/by/4.0/') CC BY 4.0].
     a(href='https://github.com/akveo/blur-admin')
       img(style='position: fixed; top: 0; right: 0; border: 0; z-index: 1000;',src='https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67',alt='Fork me on GitHub',data-canonical-src='https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png')
-    script.
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q || []).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-      ga('create', 'UA-61945105-3', 'auto');
-      ga('send', 'pageview');

gulp/build.js

@@ -33,9 +33,9 @@ gulp.task('html', ['inject', 'partials'], function () {
     addRootSlash: false
   };
 
-  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 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'))

gulp/styles.js

@@ -2,6 +2,7 @@
 
 var path = require('path');
 var gulp = require('gulp');
+var sass = require('gulp-sass');
 var conf = require('./conf');
 
 var browserSync = require('browser-sync');
@@ -34,7 +35,6 @@ 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,6 +58,7 @@ 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/')));
 };
 

package.json

@@ -2,6 +2,7 @@
   "name": "blur_admin",
   "version": "1.3.1",
   "devDependencies": {
+    "bower": "~1.8.4",
     "browser-sync": "~2.18.2",
     "browser-sync-spa": "~1.0.3",
     "chalk": "~1.1.1",
@@ -27,7 +28,7 @@
     "gulp-replace": "~0.5.4",
     "gulp-rev": "~7.1.2",
     "gulp-rev-replace": "~0.4.2",
-    "gulp-sass": "~2.3.2",
+    "gulp-sass": "^4.0.1",
     "gulp-shell": "^0.5.2",
     "gulp-size": "~2.1.0",
     "gulp-sourcemaps": "~1.6.0",

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

@@ -7,6 +7,11 @@
     <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">
@@ -21,4 +26,4 @@
     </div>
     <msg-center></msg-center>
   </div>
-</div>
+</div>

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.changeColors({
-    //  default: 'rgba(#000000, 0.2)',
-    //  defaultText: '#ffffff',
-    //  dashboard: {
-    //    white: '#ffffff',
-    //  },
-    //});
+    baConfigProvider.changeTheme({blur: true});
+
+    baConfigProvider.changeColors({
+     default: 'rgba(#000000, 0.2)',
+     defaultText: '#ffffff',
+     dashboard: {
+       white: '#ffffff',
+     },
+    });
   }
 
   /** @ngInject */

src/index.html

@@ -1,6 +1,13 @@
 <!DOCTYPE html>
 <html lang="en" ng-app="BlurAdmin">
 <head>
+  <!-- Google Tag Manager -->
+  <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+      new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+  })(window,document,'script','dataLayer','GTM-KT9L237');</script>
+  <!-- End Google Tag Manager -->
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -25,6 +32,10 @@
   <!-- endbuild -->
 </head>
 <body>
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KT9L237"
+                  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
 <div class="body-bg"></div>
 <main ng-if="$pageFinishedLoading" ng-class="{ 'menu-collapsed': $baSidebarService.isMenuCollapsed() }">
 
@@ -41,7 +52,11 @@
   <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">Blur Admin 2016</div>
+      <div class="al-copy">
+        ©
+        <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>
@@ -76,4 +91,4 @@
 <!-- endbuild -->
 
 </body>
-</html>
+</html>

src/sass/app/_index.scss

@@ -0,0 +1,18 @@
+@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/mint';
+@import 'theme/conf/colorScheme/blur';
 @import 'theme/conf/variables';

src/sass/main.scss

@@ -1,4 +1,15 @@
 @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
+// endinjector

src/sass/theme/_index.scss

@@ -0,0 +1,9 @@
+@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

@@ -0,0 +1,9 @@
+@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,6 +28,16 @@ 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

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