Compare commits

...

8 Commits
master ... demo

Author SHA1 Message Date
DESKTOP-Q2JDODV\Admin a3ab4306b7 chore: apply latest changes for header and footer 2021-06-29 18:51:16 +03:00
DESKTOP-Q2JDODV\Admin c5536da7c8 chore: rollaback the base url 2021-06-29 18:32:25 +03:00
DESKTOP-Q2JDODV\Admin f849bffc5e chore: add include scss files 2021-06-29 18:26:59 +03:00
DESKTOP-Q2JDODV\Admin 56084b58c4 chore: change the baseUrl for test 2021-06-28 16:17:07 +03:00
DESKTOP-Q2JDODV\Admin 34af98638e chore: remove unused files, rename the github action 2021-06-28 16:02:32 +03:00
DESKTOP-Q2JDODV\Admin 4bdde48a8f chore: change the account name 2021-06-28 15:40:32 +03:00
DESKTOP-Q2JDODV\Admin 522f2f0c38 chore: update the gulp command 2021-06-28 15:24:32 +03:00
DESKTOP-Q2JDODV\Admin a746a313ee chore: add azureCliDeploy 2021-06-28 14:20:39 +03:00
11 changed files with 123 additions and 6 deletions

View File

@ -0,0 +1,40 @@
name: Deploy to demo-mint (azure storage)
on:
push:
branches:
- demo
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 10.x
uses: actions/setup-node@v1
with:
node-version: '10.x'
- uses: actions/checkout@v2
with:
ref: demo
- name: npm install, 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 bluradminmint --debug
# Azure logout
- name: logout
run: |
az logout
if: always()

View File

@ -1,5 +1,5 @@
{
"baseUrl": "/blur-admin/",
"baseUrl": "/blur-admin-mint/",
"locals": {
"url": "http://localhost:8080",
"name": "The Wintersmith's blog",

View File

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

View File

@ -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>

View File

@ -52,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>
@ -87,4 +91,4 @@
<!-- endbuild -->
</body>
</html>
</html>

18
src/sass/app/_index.scss Normal file
View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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