Verified Commit 5bba2fd6 authored by David Haynes's avatar David Haynes 🙆

Clone down Bootstrap 4 & begin cleaning

- docs changes
- index.html cleanup & completion beginning
parent fd8c39a3
Pipeline #2067 passed with stages
in 1 minute and 29 seconds
# Masonstrap 4 (Beta 3)
# Masonstrap 4
[![build status](https://git.gmu.edu/srct/masonstrap/badges/master/build.svg)](https://git.gmu.edu/srct/masonstrap/commits/master) [![Gitlab license](https://img.shields.io/badge/license-MIT-blue.svg)](https://git.gmu.edu/srct/masonstrap/raw/master/LICENSE)
......
......@@ -16,48 +16,38 @@ const minify = require('gulp-minify');
const src = './src'
const dest = './build'
// Move fonts to build/fonts
gulp.task('fonts', () => {
let brands = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-brands-400.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
let regular = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-regular-400.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
let solid = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-solid-900.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
return merge(brands, regular, solid).pipe(connect.reload())
});
// Move html to build/html
gulp.task('html', () => gulp.src(src + '/html/*.html').pipe(connect.reload())
gulp.task('html', () => gulp.src(src + '/html/*.html')
.pipe(connect.reload())
.pipe(gulp.dest(dest))
);
// Optimize images and move them to build/img
gulp.task('img', () => gulp.src(src + '/img/*').pipe(connect.reload())
.pipe(imagemin())
.pipe(gulp.dest(dest + '/img/'))
gulp.task('img', () => gulp.src(src + '/img/*')
.pipe(connect.reload())
.pipe(imagemin())
.pipe(gulp.dest(dest + '/img/'))
);
// Build masonstrap.min.js
gulp.task('js', () => gulp.src(['./node_modules/jquery/dist/jquery.min.js', './node_modules/bootstrap/dist/js/bootstrap.bundle.min.js', src + '/js/*.js'])
.pipe(concat('masonstrap.js'))
.pipe(minify({ext: ".min.js"}))
.pipe(gulp.dest(dest + '/js/')));
.pipe(concat('masonstrap.js'))
.pipe(minify({ext: ".min.js"}))
.pipe(gulp.dest(dest + '/js/'))
);
// Compile, autoprefix, minify scss with sourcemaps
gulp.task('sass', () => gulp.src(src + '/scss/*.scss').pipe(connect.reload())
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
.pipe(postcss([autoprefixer()]))
.pipe(sourcemaps.write())
.pipe(gulp.dest(dest + '/css/'))
.pipe(uglifycss())
.pipe(rename({extname: ".min.css"}))
.pipe(gulp.dest(dest + '/css/')
));
gulp.task('sass', () => gulp.src(src + '/scss/*.scss')
.pipe(connect.reload())
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
.pipe(postcss([autoprefixer()]))
.pipe(sourcemaps.write())
.pipe(gulp.dest(dest + '/css/'))
.pipe(uglifycss())
.pipe(rename({extname: ".min.css"}))
.pipe(gulp.dest(dest + '/css/'))
);
// Run task whenever associated files change
gulp.task('watch', () => {
......@@ -77,7 +67,7 @@ gulp.task('http', () => {
});
// Run all tasks
gulp.task('build', ['sass', 'html', 'img', 'js', 'fonts']);
gulp.task('build', ['sass', 'html', 'img', 'js']);
// By default, run all tasks and then rebuild on changes
gulp.task('default', ['http', 'build', 'watch']);
\ No newline at end of file
......@@ -37,45 +37,40 @@
<!-- Navbar -->
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<a class="navbar-brand d-flex mx-auto" href="./index.html">
<img src="./img/SRCT_square.svg" width="30" height="30" class="d-inline-block align-top" alt="SRCT Masonstrap">
&nbsp;Masonstrap&nbsp;
</a>
<div class="container">
<a class="navbar-brand d-flex mx-auto mr-2" href="./index.html">
<img src="./img/SRCT_square.svg" width="30" height="30" class="d-inline-block align-top mr-2" alt="SRCT Masonstrap">
Masonstrap 4
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup"
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item">
<a class="nav-link" href="./demo.html">Demo</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Source Files
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="./css/masonstrap.css">masonstrap.css</a>
</div>
</li>
</ul>
<a class="btn accent-btn-outline" href="https://git.gmu.edu/srct/masonstrap/-/jobs/artifacts/master/download?job=build">Download</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup"
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Source Files
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<h6 class="dropdown-header">CSS</h6>
<a class="dropdown-item" href="./css/masonstrap.css">masonstrap.css</a>
<a class="dropdown-item" href="./css/masonstrap.min.css">masonstrap.min.css</a>
<div class="dropdown-divider"></div>
<h6 class="dropdown-header">JS</h6>
<a class="dropdown-item" href="./js/masonstrap.js">masonstrap.js</a>
<a class="dropdown-item" href="./js/masonstrap.min.js">masonstrap.min.js</a>
</div>
</li>
</ul>
<a class="btn accent-btn-outline" href="https://git.gmu.edu/srct/masonstrap/-/jobs/artifacts/master/download?job=build">Download</a>
</div>
</div>
</nav>
<body style="">
<div class="container" style="padding-top: 5rem;">
<h1>
<span class="fa-stack">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fas fa-paint-brush fa-stack-1x fa-inverse"></i>
</span> Masonstrap
</h1>
<hr />
</body>
<!-- load in external js -->
<script src="./js/masonstrap.min.js"></script>
......
// Masonstrap 4.0 Variables
// Global External Packages Settings -------------------------------------------
$fa-font-path: "../fonts";
// Global Bootstrap Options Overrides ------------------------------------------
......
/*!
* Masonstrap 4.0 Beta 3
* Masonstrap 4.0
*
* author: Mason SRCT (https://srct.gmu.edu)
* source code: (https://git.gmu.edu/srct/masonstrap)
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment