Skip to content

Commit

Permalink
v1.0.1
Browse files Browse the repository at this point in the history
v1.0.1
  • Loading branch information
xidedix authored Oct 11, 2017
2 parents 4ef7669 + 85fe941 commit 0fb9c92
Show file tree
Hide file tree
Showing 106 changed files with 30,046 additions and 30,396 deletions.
90 changes: 27 additions & 63 deletions AJAX_Full_Project_GULP/css/style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* CoreUI - Open Source Bootstrap Admin Template
* @version v1.0.0
* @version v1.0.1
* @link http://coreui.io
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
* @license MIT
Expand Down Expand Up @@ -6957,11 +6957,12 @@ base-chart.chart {
left: 0; }

.app-footer {
min-height: 50px;
display: flex;
padding: 0 1rem;
line-height: 50px;
color: #151b1e;
background: #f0f3f5;
flex-wrap: wrap;
align-items: center;
border-top: 1px solid #c2cfd6; }

.row.row-equal {
Expand Down Expand Up @@ -7193,8 +7194,8 @@ base-chart.chart {

.app-header.navbar {
position: relative;
flex-direction: row;
height: 55px;
flex-direction: row;
padding: 0;
margin: 0;
background-color: #fff;
Expand Down Expand Up @@ -7286,11 +7287,13 @@ base-chart.chart {
.navbar-divider {
background-color: rgba(0, 0, 0, 0.075); }

.brand-minimized .app-header.navbar .navbar-brand {
width: 50px;
background-color: #fff;
background-image: url("../img/logo-symbol.png");
background-size: 24px; }
@media (min-width: 992px) {
.brand-minimized .app-header.navbar .navbar-brand {
width: 50px;
background-color: #fff;
background-image: url("../img/logo-symbol.png");
background-size: 24px;
border-bottom: 1px solid #c2cfd6; } }

.progress-xs {
height: 4px; }
Expand Down Expand Up @@ -7359,8 +7362,8 @@ base-chart.chart {
border-width: 1px 2px; }
.sidebar .nav {
width: 200px;
flex-direction: column;
min-height: 100%; }
min-height: 100%;
flex-direction: column; }
.sidebar .nav-title {
padding: 0.75rem 1rem;
font-size: 11px;
Expand Down Expand Up @@ -8359,8 +8362,8 @@ base-chart.chart {
app-dashboard,
app-root {
display: flex;
flex-direction: column;
min-height: 100vh; }
min-height: 100vh;
flex-direction: column; }

.app-header {
flex: 0 0 55px; }
Expand All @@ -8371,11 +8374,11 @@ app-root {
.app-body {
display: flex;
flex-direction: row;
flex-grow: 1;
overflow-x: hidden; }
overflow-x: hidden;
flex-grow: 1; }
.app-body .main {
flex: 1;
min-width: 0; }
min-width: 0;
flex: 1; }
.app-body .sidebar {
flex: 0 0 200px;
order: -1; }
Expand Down Expand Up @@ -8524,16 +8527,20 @@ app-root {
margin-left: -77.5px; }
.app-body {
margin-top: 55px; }
.sidebar {
.sidebar,
.sidebar-fixed .sidebar {
position: fixed;
z-index: 1019;
width: 220px;
height: 100%;
margin-left: -220px; }
.sidebar .sidebar-nav,
.sidebar .nav {
.sidebar .nav,
.sidebar-fixed .sidebar .sidebar-nav,
.sidebar-fixed .sidebar .nav {
width: 220px !important; }
.sidebar .sidebar-minimizer {
.sidebar .sidebar-minimizer,
.sidebar-fixed .sidebar .sidebar-minimizer {
display: none; }
.main, .app-footer {
margin-left: 0 !important; }
Expand Down Expand Up @@ -8770,46 +8777,3 @@ hr.transparent {
float: left; }
*[dir="rtl"] .callout-default {
border-right-color: #536c79; }

.chart-legend,
.bar-legend,
.line-legend,
.pie-legend,
.radar-legend,
.polararea-legend,
.doughnut-legend {
list-style-type: none;
margin-top: 5px;
text-align: center;
-webkit-padding-start: 0;
-moz-padding-start: 0;
padding-left: 0; }

.chart-legend li,
.bar-legend li,
.line-legend li,
.pie-legend li,
.radar-legend li,
.polararea-legend li,
.doughnut-legend li {
display: inline-block;
white-space: nowrap;
position: relative;
margin-bottom: 4px;
padding: 2px 8px 2px 28px;
font-size: smaller;
cursor: default; }

.chart-legend li span,
.bar-legend li span,
.line-legend li span,
.pie-legend li span,
.radar-legend li span,
.polararea-legend li span,
.doughnut-legend li span {
display: block;
position: absolute;
left: 0;
top: 0;
width: 20px;
height: 20px; }
4 changes: 2 additions & 2 deletions AJAX_Full_Project_GULP/css/style.min.css

Large diffs are not rendered by default.

21 changes: 17 additions & 4 deletions AJAX_Full_Project_GULP/gulp-tasks/build-dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ var vendorsJS = [
'node_modules/bootstrap/dist/js/bootstrap.min.js',
'node_modules/bootstrap-daterangepicker/daterangepicker.js',
'node_modules/chart.js/dist/Chart.min.js',
'node_modules/codemirror/lib/codemirror.js',
'node_modules/codemirror/mode/markdown/markdown.js',
'node_modules/codemirror/mode/xml/xml.js',
'node_modules/datatables.net/js/jquery.dataTables.js',
'node_modules/datatables.net-bs/js/dataTables.bootstrap.js',
'node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js',
'node_modules/fullcalendar/dist/fullcalendar.min.js',
'node_modules/fullcalendar/dist/gcal.min.js',
'node_modules/gaugeJS/dist/gauge.min.js',
Expand All @@ -43,9 +46,14 @@ var vendorsJS = [
]

var vendorsCSS = [
'node_modules/codemirror/lib/codemirror.css',
'node_modules/datatables.net-bs4/css/dataTables.bootstrap4.css',
'node_modules/font-awesome/css/font-awesome.min.css',
'node_modules/font-awesome/css/font-awesome.css.map',
'node_modules/simple-line-icons/css/simple-line-icons.css'
'node_modules/ladda/dist/ladda-themeless.min.css',
'node_modules/quill/dist/quill.snow.css',
'node_modules/simple-line-icons/css/simple-line-icons.css',
'node_modules/spinkit/css/spinkit.css'
]

var vendorsFonts = [
Expand Down Expand Up @@ -101,7 +109,7 @@ gulp.task('copy:vendorsFonts', function() {

gulp.task('replace:node_modules', function(){
return gulp.src([
'./dist/*.html',
'./dist/**/*.html',
'./dist/**/*.js',
], {base: './'})
.pipe(replace(/node_modules+.+(\/[a-z0-9][^/]*\.js+(\'|\"))/ig, 'vendors/js$1'))
Expand Down Expand Up @@ -148,6 +156,11 @@ gulp.task('copy:html', function() {
.pipe(gulp.dest(paths.dist+'/'));
});

gulp.task('copy:vendors', function() {
return gulp.src('./vendors/**/*')
.pipe(gulp.dest(paths.dist+'/vendors/'));
});

gulp.task('build:dist', function(callback) {
runSequence('clean:dist', 'copy:css', 'copy:img', 'copy:js', 'copy:views', 'copy:html', 'vendors', callback);
runSequence('clean:dist', 'copy:css', 'copy:img', 'copy:js', 'copy:views', 'copy:html', 'copy:vendors', 'vendors', callback);
});
31 changes: 31 additions & 0 deletions AJAX_Full_Project_GULP/gulp-tasks/vendors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use strict';

var gulp = require('gulp');
var del = require('del');
var rename = require("gulp-rename");
var runSequence = require('run-sequence');
var sass = require('gulp-sass');

var paths = gulp.paths;
var vendors = './scss/vendors/';

gulp.task('compile-vendors:clean', function () {
return del([
'./vendors/css/**'
]);
});

gulp.task('compile-vendors:sass', function () {
return gulp.src('./scss/vendors/**/*.scss')
.pipe(sass().on('error', sass.logError))
.pipe(rename({dirname: ''}))
.pipe(gulp.dest('./vendors/css/'))
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
.pipe(rename({suffix: '.min'}))
.pipe(rename({dirname: ''}))
.pipe(gulp.dest('./vendors/css/'));
});

gulp.task('compile-vendors', function(callback) {
runSequence('compile-vendors:clean', 'compile-vendors:sass', callback);
});
4 changes: 2 additions & 2 deletions AJAX_Full_Project_GULP/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ gulp.task('serve:lite', function() {

});

gulp.task('sass', function () {
gulp.task('sass', ['compile-vendors'], function() {
return gulp.src('./scss/style.scss')
.pipe(sass())
.pipe(gulp.dest('./css'))
.pipe(browserSync.stream());
});

gulp.task('sass:watch', function () {
gulp.task('sass:watch', function() {
gulp.watch('./scss/**/*.scss');
});

Expand Down
Loading

0 comments on commit 0fb9c92

Please sign in to comment.