Skip to content

Commit a2f458d

Browse files
mrholekmrholek
committed
- Fix height and position problems with .fixed-footer
- Fix mobile sidebar height - Fix mobile breadcrumb position with .fixed-breadcrumb - Add new navbar toggler icon - Update old bootstrap classes ex. `hidden-sm-down` - Add gulp-autoprefixer
1 parent 0fb9c92 commit a2f458d

File tree

91 files changed

+4383
-14651
lines changed

Some content is hidden

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

91 files changed

+4383
-14651
lines changed

‎AJAX_Full_Project_GULP/css/font-awesome.css

-2,337
This file was deleted.

‎AJAX_Full_Project_GULP/css/font-awesome.css.map

-7
This file was deleted.

‎AJAX_Full_Project_GULP/css/font-awesome.min.css

-4
This file was deleted.

‎AJAX_Full_Project_GULP/css/simple-line-icons.css

-778
This file was deleted.

‎AJAX_Full_Project_GULP/css/style.css

+960-477
Large diffs are not rendered by default.

‎AJAX_Full_Project_GULP/css/style.min.css

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

‎AJAX_Full_Project_GULP/gulp-tasks/vendors.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ var del = require('del');
55
var rename = require("gulp-rename");
66
var runSequence = require('run-sequence');
77
var sass = require('gulp-sass');
8+
var autoprefixer = require('gulp-autoprefixer');
9+
var cssmin = require('gulp-cssmin')
810

911
var paths = gulp.paths;
1012
var vendors = './scss/vendors/';
@@ -18,9 +20,10 @@ gulp.task('compile-vendors:clean', function () {
1820
gulp.task('compile-vendors:sass', function () {
1921
return gulp.src('./scss/vendors/**/*.scss')
2022
.pipe(sass().on('error', sass.logError))
23+
.pipe(autoprefixer())
2124
.pipe(rename({dirname: ''}))
2225
.pipe(gulp.dest('./vendors/css/'))
23-
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
26+
.pipe(cssmin())
2427
.pipe(rename({suffix: '.min'}))
2528
.pipe(rename({dirname: ''}))
2629
.pipe(gulp.dest('./vendors/css/'));

‎AJAX_Full_Project_GULP/gulpfile.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
var gulp = require('gulp');
44
var browserSync = require('browser-sync').create();
55
var sass = require('gulp-sass');
6+
var autoprefixer = require('gulp-autoprefixer');
67
var cssmin = require('gulp-cssmin')
78
var rename = require('gulp-rename');
89
var runSequence = require('run-sequence');
@@ -45,12 +46,16 @@ gulp.task('serve:lite', function() {
4546
gulp.task('sass', ['compile-vendors'], function() {
4647
return gulp.src('./scss/style.scss')
4748
.pipe(sass())
49+
.pipe(autoprefixer())
50+
.pipe(gulp.dest('./css'))
51+
.pipe(cssmin())
52+
.pipe(rename({suffix: '.min'}))
4853
.pipe(gulp.dest('./css'))
4954
.pipe(browserSync.stream());
5055
});
5156

5257
gulp.task('sass:watch', function() {
53-
gulp.watch('./scss/**/*.scss');
58+
gulp.watch('./scss/**/*.scss', ['sass']);
5459
});
5560

5661
gulp.task('default', ['serve']);

‎AJAX_Full_Project_GULP/index.html

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.1
3+
* @version v1.0.2
44
* @link http://coreui.io
55
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
66
* @license MIT
@@ -55,9 +55,13 @@
5555

5656
<body class="app header-fixed sidebar-fixed aside-menu-fixed aside-menu-hidden">
5757
<header class="app-header navbar">
58-
<button class="navbar-toggler mobile-sidebar-toggler d-lg-none mr-auto" type="button">&#9776;</button>
58+
<button class="navbar-toggler mobile-sidebar-toggler d-lg-none mr-auto" type="button">
59+
<span class="navbar-toggler-icon"></span>
60+
</button>
5961
<a class="navbar-brand" href="#"></a>
60-
<button class="navbar-toggler sidebar-toggler d-md-down-none" type="button">&#9776;</button>
62+
<button class="navbar-toggler sidebar-toggler d-md-down-none" type="button">
63+
<span class="navbar-toggler-icon"></span>
64+
</button>
6165

6266
<ul class="nav navbar-nav d-md-down-none">
6367
<li class="nav-item px-3">
@@ -106,7 +110,9 @@
106110
</div>
107111
</li>
108112
</ul>
109-
<button class="navbar-toggler aside-menu-toggler" type="button">&#9776;</button>
113+
<button class="navbar-toggler aside-menu-toggler" type="button">
114+
<span class="navbar-toggler-icon"></span>
115+
</button>
110116

111117
</header>
112118

‎AJAX_Full_Project_GULP/package.json

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/ajax",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "",
55
"main": "index.html",
66
"dependencies": {
@@ -16,6 +16,7 @@
1616
"browser-sync": "^2.16.0",
1717
"del": "^3.0.0",
1818
"gulp": "^3.9.1",
19+
"gulp-autoprefixer": "^4.0.0",
1920
"gulp-bower-src": "^0.1.0",
2021
"gulp-concat": "^2.6.0",
2122
"gulp-contains": "^1.1.0",
@@ -26,14 +27,22 @@
2627
"gulp-sass": "^3.1.0",
2728
"gulp-search": "^1.0.0",
2829
"gulp-uglify": "^3.0.0",
29-
"gulp-web-dependencies": "^1.1.2",
30-
"main-bower-files": "^2.13.1",
3130
"require-dir": "^0.3.2",
3231
"run-sequence": "^2.1.0"
3332
},
3433
"scripts": {
3534
"test": "echo \"Error: no test specified\" && exit 1"
3635
},
36+
"browserslist": [
37+
"Chrome >= 45",
38+
"Firefox ESR",
39+
"Edge >= 12",
40+
"Explorer >= 10",
41+
"iOS >= 9",
42+
"Safari >= 9",
43+
"Android >= 4.4",
44+
"Opera >= 30"
45+
],
3746
"author": "Łukasz Holeczek",
3847
"url": "http://coreui.io",
3948
"copyright": "Copyright 2016 creativeLabs Łukasz Holeczek",

‎AJAX_Full_Project_GULP/scss/core/_dropdown-menu-right.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
right: auto;
66
}
77
}
8-
}
8+
}

‎AJAX_Full_Project_GULP/scss/core/_footer.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.app-footer {
22
display: flex;
3+
flex-wrap: wrap;
4+
align-items: center;
35
padding: 0 $spacer;
46
color: $footer-color;
57
background: $footer-bg;
6-
flex-wrap: wrap;
7-
align-items: center;
88
@include borders($footer-borders);
99
}

‎AJAX_Full_Project_GULP/scss/core/_layout.scss

+16-16
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
app-dashboard,
1212
app-root {
1313
display: flex;
14-
min-height: 100vh;
1514
flex-direction: column;
15+
min-height: 100vh;
1616
}
1717

1818
.app-header {
@@ -26,12 +26,12 @@ app-root {
2626
.app-body {
2727
display: flex;
2828
flex-direction: row;
29-
overflow-x: hidden;
3029
flex-grow: 1;
30+
overflow-x: hidden;
3131

3232
.main {
33-
min-width: 0;
3433
flex: 1;
34+
min-width: 0;
3535
}
3636

3737
.sidebar {
@@ -269,9 +269,11 @@ app-root {
269269
.footer-fixed {
270270
.app-footer {
271271
position: fixed;
272+
right: 0;
272273
bottom: 0;
274+
left: 0;
273275
z-index: $zindex-sticky;
274-
width: 100%;
276+
height: $footer-height;
275277
}
276278

277279
.app-body {
@@ -328,17 +330,26 @@ app-root {
328330
margin-top: $navbar-height;
329331
}
330332

333+
.breadcrumb-fixed {
334+
.main:nth-child(2) .breadcrumb {
335+
right: auto;
336+
left: auto;
337+
width: 100%;
338+
}
339+
}
340+
331341
.sidebar,
332342
.sidebar-fixed .sidebar {
333343
position: fixed;
334344
z-index: $zindex-sticky - 1;
335345
width: $mobile-sidebar-width;
336-
height: 100%;
346+
// height: 100%;
337347
margin-left: - $mobile-sidebar-width;
338348

339349
.sidebar-nav,
340350
.nav {
341351
width: $mobile-sidebar-width !important;
352+
height: calc(100vh - #{$navbar-height});
342353
}
343354

344355
.sidebar-minimizer {
@@ -364,22 +375,11 @@ app-root {
364375
.sidebar {
365376
width: $mobile-sidebar-width;
366377
margin-left: 0;
367-
368-
.sidebar-nav {
369-
height: calc(100vh - #{$navbar-height});
370-
}
371378
}
372379

373380
.main {
374381
margin-right: - $mobile-sidebar-width !important;
375382
margin-left: $mobile-sidebar-width !important;
376383
}
377384
}
378-
379-
.breadcrumb-fixed {
380-
.main .breadcrumb {
381-
right: 0 !important;
382-
left: 0 !important;
383-
}
384-
}
385385
}

‎AJAX_Full_Project_GULP/scss/core/_navbar.scss

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.app-header.navbar {
22
position: relative;
3-
height: $navbar-height;
43
flex-direction: row;
4+
height: $navbar-height;
55
padding: 0;
66
margin: 0;
77
background-color: $navbar-bg;
@@ -22,7 +22,17 @@
2222
}
2323

2424
.navbar-toggler {
25-
color: $navbar-color;
25+
min-width: 50px;
26+
padding: $navbar-toggler-padding-y 0;
27+
28+
&:hover .navbar-toggler-icon {
29+
background-image: $navbar-toggler-icon-hover;
30+
}
31+
}
32+
33+
.navbar-toggler-icon {
34+
height: 23px;
35+
background-image: $navbar-toggler-icon;
2636
}
2737

2838
.navbar-nav {

‎AJAX_Full_Project_GULP/scss/core/_sidebar.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878

7979
.nav {
8080
@include sidebar-width($sidebar-borders, $sidebar-width);
81-
min-height: 100%;
8281
flex-direction: column;
82+
min-height: 100%;
8383
}
8484

8585
.nav-title {

‎AJAX_Full_Project_GULP/scss/core/_variables.scss

+3
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ $navbar-hover-color: $gray-800 !default;
6969
$navbar-active-color: $gray-800 !default;
7070
$navbar-disabled-color: $gray-300 !default;
7171

72+
$navbar-toggler-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-color}' stroke-width='2.25' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default;
73+
$navbar-toggler-icon-hover: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-hover-color}' stroke-width='2.25' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default;
74+
7275
// Sidebar
7376

7477
$sidebar-width: 200px !default;

‎AJAX_Full_Project_GULP/scss/style.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*!
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.1
3+
* @version v1.0.2
44
* @link http://coreui.io
55
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
66
* @license MIT
77
*/
8+
89
// Override Boostrap variables
910
@import "bootstrap-variables";
1011

‎AJAX_Full_Project_GULP/vendors/css/chart.css

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
.chart-legend,
2+
.bar-legend,
3+
.line-legend,
4+
.pie-legend,
5+
.radar-legend,
6+
.polararea-legend,
7+
.doughnut-legend {
8+
list-style-type: none;
9+
margin-top: 5px;
10+
text-align: center;
11+
-webkit-padding-start: 0;
12+
-moz-padding-start: 0;
13+
padding-left: 0; }
14+
15+
.chart-legend li,
16+
.bar-legend li,
17+
.line-legend li,
18+
.pie-legend li,
19+
.radar-legend li,
20+
.polararea-legend li,
21+
.doughnut-legend li {
22+
display: inline-block;
23+
white-space: nowrap;
24+
position: relative;
25+
margin-bottom: 4px;
26+
padding: 2px 8px 2px 28px;
27+
font-size: smaller;
28+
cursor: default; }
29+
30+
.chart-legend li span,
31+
.bar-legend li span,
32+
.line-legend li span,
33+
.pie-legend li span,
34+
.radar-legend li span,
35+
.polararea-legend li span,
36+
.doughnut-legend li span {
37+
display: block;
38+
position: absolute;
39+
left: 0;
40+
top: 0;
41+
width: 20px;
42+
height: 20px; }

‎AJAX_Full_Project_GULP/vendors/css/chart.min.css

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

‎AJAX_Full_Project_GULP/views/main.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ <h4 class="card-title mb-0">Traffic</h4>
100100
<div class="small text-muted">November 2015</div>
101101
</div>
102102
<!--/.col-->
103-
<div class="col-sm-7 hidden-sm-down">
103+
<div class="col-sm-7 d-none d-md-block">
104104
<button type="button" class="btn btn-primary float-right"><i class="icon-cloud-download"></i></button>
105105
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
106106
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
@@ -132,7 +132,7 @@ <h4 class="card-title mb-0">Traffic</h4>
132132
<div class="progress-bar bg-success" role="progressbar" style="width: 40%" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100"></div>
133133
</div>
134134
</li>
135-
<li class="hidden-sm-down">
135+
<li class="d-none d-md-table-cell">
136136
<div class="text-muted">Unique</div>
137137
<strong>24.093 Users (20%)</strong>
138138
<div class="progress progress-xs mt-2">
@@ -146,14 +146,14 @@ <h4 class="card-title mb-0">Traffic</h4>
146146
<div class="progress-bar bg-warning" role="progressbar" style="width: 60%" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"></div>
147147
</div>
148148
</li>
149-
<li class="hidden-sm-down">
149+
<li class="d-none d-md-table-cell">
150150
<div class="text-muted">New Users</div>
151151
<strong>22.123 Users (80%)</strong>
152152
<div class="progress progress-xs mt-2">
153153
<div class="progress-bar bg-danger" role="progressbar" style="width: 80%" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100"></div>
154154
</div>
155155
</li>
156-
<li class="hidden-sm-down">
156+
<li class="d-none d-md-table-cell">
157157
<div class="text-muted">Bounce Rate</div>
158158
<strong>40.15%</strong>
159159
<div class="progress progress-xs mt-2">

0 commit comments

Comments
 (0)