Skip to content

Commit 0fb9c92

Browse files
authored
v1.0.1
v1.0.1
2 parents 4ef7669 + 85fe941 commit 0fb9c92

File tree

106 files changed

+30046
-30396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+30046
-30396
lines changed

AJAX_Full_Project_GULP/css/style.css

+27-63
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.0
3+
* @version v1.0.1
44
* @link http://coreui.io
55
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
66
* @license MIT
@@ -6957,11 +6957,12 @@ base-chart.chart {
69576957
left: 0; }
69586958

69596959
.app-footer {
6960-
min-height: 50px;
6960+
display: flex;
69616961
padding: 0 1rem;
6962-
line-height: 50px;
69636962
color: #151b1e;
69646963
background: #f0f3f5;
6964+
flex-wrap: wrap;
6965+
align-items: center;
69656966
border-top: 1px solid #c2cfd6; }
69666967

69676968
.row.row-equal {
@@ -7193,8 +7194,8 @@ base-chart.chart {
71937194

71947195
.app-header.navbar {
71957196
position: relative;
7196-
flex-direction: row;
71977197
height: 55px;
7198+
flex-direction: row;
71987199
padding: 0;
71997200
margin: 0;
72007201
background-color: #fff;
@@ -7286,11 +7287,13 @@ base-chart.chart {
72867287
.navbar-divider {
72877288
background-color: rgba(0, 0, 0, 0.075); }
72887289

7289-
.brand-minimized .app-header.navbar .navbar-brand {
7290-
width: 50px;
7291-
background-color: #fff;
7292-
background-image: url("../img/logo-symbol.png");
7293-
background-size: 24px; }
7290+
@media (min-width: 992px) {
7291+
.brand-minimized .app-header.navbar .navbar-brand {
7292+
width: 50px;
7293+
background-color: #fff;
7294+
background-image: url("../img/logo-symbol.png");
7295+
background-size: 24px;
7296+
border-bottom: 1px solid #c2cfd6; } }
72947297

72957298
.progress-xs {
72967299
height: 4px; }
@@ -7359,8 +7362,8 @@ base-chart.chart {
73597362
border-width: 1px 2px; }
73607363
.sidebar .nav {
73617364
width: 200px;
7362-
flex-direction: column;
7363-
min-height: 100%; }
7365+
min-height: 100%;
7366+
flex-direction: column; }
73647367
.sidebar .nav-title {
73657368
padding: 0.75rem 1rem;
73667369
font-size: 11px;
@@ -8359,8 +8362,8 @@ base-chart.chart {
83598362
app-dashboard,
83608363
app-root {
83618364
display: flex;
8362-
flex-direction: column;
8363-
min-height: 100vh; }
8365+
min-height: 100vh;
8366+
flex-direction: column; }
83648367

83658368
.app-header {
83668369
flex: 0 0 55px; }
@@ -8371,11 +8374,11 @@ app-root {
83718374
.app-body {
83728375
display: flex;
83738376
flex-direction: row;
8374-
flex-grow: 1;
8375-
overflow-x: hidden; }
8377+
overflow-x: hidden;
8378+
flex-grow: 1; }
83768379
.app-body .main {
8377-
flex: 1;
8378-
min-width: 0; }
8380+
min-width: 0;
8381+
flex: 1; }
83798382
.app-body .sidebar {
83808383
flex: 0 0 200px;
83818384
order: -1; }
@@ -8524,16 +8527,20 @@ app-root {
85248527
margin-left: -77.5px; }
85258528
.app-body {
85268529
margin-top: 55px; }
8527-
.sidebar {
8530+
.sidebar,
8531+
.sidebar-fixed .sidebar {
85288532
position: fixed;
85298533
z-index: 1019;
85308534
width: 220px;
85318535
height: 100%;
85328536
margin-left: -220px; }
85338537
.sidebar .sidebar-nav,
8534-
.sidebar .nav {
8538+
.sidebar .nav,
8539+
.sidebar-fixed .sidebar .sidebar-nav,
8540+
.sidebar-fixed .sidebar .nav {
85358541
width: 220px !important; }
8536-
.sidebar .sidebar-minimizer {
8542+
.sidebar .sidebar-minimizer,
8543+
.sidebar-fixed .sidebar .sidebar-minimizer {
85378544
display: none; }
85388545
.main, .app-footer {
85398546
margin-left: 0 !important; }
@@ -8770,46 +8777,3 @@ hr.transparent {
87708777
float: left; }
87718778
*[dir="rtl"] .callout-default {
87728779
border-right-color: #536c79; }
8773-
8774-
.chart-legend,
8775-
.bar-legend,
8776-
.line-legend,
8777-
.pie-legend,
8778-
.radar-legend,
8779-
.polararea-legend,
8780-
.doughnut-legend {
8781-
list-style-type: none;
8782-
margin-top: 5px;
8783-
text-align: center;
8784-
-webkit-padding-start: 0;
8785-
-moz-padding-start: 0;
8786-
padding-left: 0; }
8787-
8788-
.chart-legend li,
8789-
.bar-legend li,
8790-
.line-legend li,
8791-
.pie-legend li,
8792-
.radar-legend li,
8793-
.polararea-legend li,
8794-
.doughnut-legend li {
8795-
display: inline-block;
8796-
white-space: nowrap;
8797-
position: relative;
8798-
margin-bottom: 4px;
8799-
padding: 2px 8px 2px 28px;
8800-
font-size: smaller;
8801-
cursor: default; }
8802-
8803-
.chart-legend li span,
8804-
.bar-legend li span,
8805-
.line-legend li span,
8806-
.pie-legend li span,
8807-
.radar-legend li span,
8808-
.polararea-legend li span,
8809-
.doughnut-legend li span {
8810-
display: block;
8811-
position: absolute;
8812-
left: 0;
8813-
top: 0;
8814-
width: 20px;
8815-
height: 20px; }

AJAX_Full_Project_GULP/css/style.min.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AJAX_Full_Project_GULP/gulp-tasks/build-dist.js

+17-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ var vendorsJS = [
1919
'node_modules/bootstrap/dist/js/bootstrap.min.js',
2020
'node_modules/bootstrap-daterangepicker/daterangepicker.js',
2121
'node_modules/chart.js/dist/Chart.min.js',
22+
'node_modules/codemirror/lib/codemirror.js',
23+
'node_modules/codemirror/mode/markdown/markdown.js',
24+
'node_modules/codemirror/mode/xml/xml.js',
2225
'node_modules/datatables.net/js/jquery.dataTables.js',
23-
'node_modules/datatables.net-bs/js/dataTables.bootstrap.js',
26+
'node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js',
2427
'node_modules/fullcalendar/dist/fullcalendar.min.js',
2528
'node_modules/fullcalendar/dist/gcal.min.js',
2629
'node_modules/gaugeJS/dist/gauge.min.js',
@@ -43,9 +46,14 @@ var vendorsJS = [
4346
]
4447

4548
var vendorsCSS = [
49+
'node_modules/codemirror/lib/codemirror.css',
50+
'node_modules/datatables.net-bs4/css/dataTables.bootstrap4.css',
4651
'node_modules/font-awesome/css/font-awesome.min.css',
4752
'node_modules/font-awesome/css/font-awesome.css.map',
48-
'node_modules/simple-line-icons/css/simple-line-icons.css'
53+
'node_modules/ladda/dist/ladda-themeless.min.css',
54+
'node_modules/quill/dist/quill.snow.css',
55+
'node_modules/simple-line-icons/css/simple-line-icons.css',
56+
'node_modules/spinkit/css/spinkit.css'
4957
]
5058

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

102110
gulp.task('replace:node_modules', function(){
103111
return gulp.src([
104-
'./dist/*.html',
112+
'./dist/**/*.html',
105113
'./dist/**/*.js',
106114
], {base: './'})
107115
.pipe(replace(/node_modules+.+(\/[a-z0-9][^/]*\.js+(\'|\"))/ig, 'vendors/js$1'))
@@ -148,6 +156,11 @@ gulp.task('copy:html', function() {
148156
.pipe(gulp.dest(paths.dist+'/'));
149157
});
150158

159+
gulp.task('copy:vendors', function() {
160+
return gulp.src('./vendors/**/*')
161+
.pipe(gulp.dest(paths.dist+'/vendors/'));
162+
});
163+
151164
gulp.task('build:dist', function(callback) {
152-
runSequence('clean:dist', 'copy:css', 'copy:img', 'copy:js', 'copy:views', 'copy:html', 'vendors', callback);
165+
runSequence('clean:dist', 'copy:css', 'copy:img', 'copy:js', 'copy:views', 'copy:html', 'copy:vendors', 'vendors', callback);
153166
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
'use strict';
2+
3+
var gulp = require('gulp');
4+
var del = require('del');
5+
var rename = require("gulp-rename");
6+
var runSequence = require('run-sequence');
7+
var sass = require('gulp-sass');
8+
9+
var paths = gulp.paths;
10+
var vendors = './scss/vendors/';
11+
12+
gulp.task('compile-vendors:clean', function () {
13+
return del([
14+
'./vendors/css/**'
15+
]);
16+
});
17+
18+
gulp.task('compile-vendors:sass', function () {
19+
return gulp.src('./scss/vendors/**/*.scss')
20+
.pipe(sass().on('error', sass.logError))
21+
.pipe(rename({dirname: ''}))
22+
.pipe(gulp.dest('./vendors/css/'))
23+
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
24+
.pipe(rename({suffix: '.min'}))
25+
.pipe(rename({dirname: ''}))
26+
.pipe(gulp.dest('./vendors/css/'));
27+
});
28+
29+
gulp.task('compile-vendors', function(callback) {
30+
runSequence('compile-vendors:clean', 'compile-vendors:sass', callback);
31+
});

AJAX_Full_Project_GULP/gulpfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ gulp.task('serve:lite', function() {
4242

4343
});
4444

45-
gulp.task('sass', function () {
45+
gulp.task('sass', ['compile-vendors'], function() {
4646
return gulp.src('./scss/style.scss')
4747
.pipe(sass())
4848
.pipe(gulp.dest('./css'))
4949
.pipe(browserSync.stream());
5050
});
5151

52-
gulp.task('sass:watch', function () {
52+
gulp.task('sass:watch', function() {
5353
gulp.watch('./scss/**/*.scss');
5454
});
5555

0 commit comments

Comments
 (0)