From 8204789400ec86f8d0204b4ee5560b72cd3d4b74 Mon Sep 17 00:00:00 2001 From: David Haynes Date: Fri, 8 Feb 2019 14:54:37 -0500 Subject: [PATCH] Version bump all around --- CHANGELOG.md | 6 ++ package.json | 2 +- src/html/index.html | 151 +++++++++++++++++++++++++++------------ src/scss/masonstrap.scss | 6 +- 4 files changed, 115 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8038355d..b8435a7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [4.2.1] - 2019-02-08 + +## Added + +- Version bump to 4.2.1 + ## [4.1.1] - 2018-06-10 ## Added diff --git a/package.json b/package.json index ae083b5b..e8177322 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "masonstrap", - "version": "4.1.1", + "version": "4.2.1", "description": "Easily style any web project with Mason branding", "repository": "git@git.gmu.edu:srct/masonstrap.git", "author": "Mason SRCT", diff --git a/src/html/index.html b/src/html/index.html index 2b153019..0ebc25ea 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -1,73 +1,117 @@ - - - + + - + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + Masonstrap 4 • Home - - + + @@ -97,8 +141,7 @@

Features:

@@ -117,7 +162,9 @@
JS
- 
<script src="https://srct.gmu.io/masonstrap/js/masonstrap.min.js"></script>
+ 
<script src="https://srct.gmu.io/masonstrap/js/masonstrap.min.js"></script>
@@ -127,21 +174,32 @@
- A project of - GMU + A project of + GMU SRCT - | Freely Licensed under - MIT | - v4.1.1 + + | Freely Licensed under + MIT + | + v4.2.1
-
+
A project of - GMU + GMU SRCT
@@ -150,11 +208,12 @@ MIT
- v4.1.1 + v4.2.1 +
- diff --git a/src/scss/masonstrap.scss b/src/scss/masonstrap.scss index 4d2e4a43..aa78f692 100644 --- a/src/scss/masonstrap.scss +++ b/src/scss/masonstrap.scss @@ -1,5 +1,5 @@ /*! - * Masonstrap 4.1.1 + * Masonstrap 4.2.1 * * author: Mason SRCT (https://srct.gmu.edu) * source code: (https://git.gmu.edu/srct/masonstrap) @@ -9,9 +9,9 @@ // Masonstrap custom functions @import "_functions"; // Load in variable overwrites -@import '_variables'; +@import "_variables"; // Load in bootstrap 4 -@import '../../node_modules/bootstrap/scss/bootstrap'; +@import "../../node_modules/bootstrap/scss/bootstrap"; // Masonstrap custom mixins @import "_mixins"; // Masonstrap custom overwrites -- GitLab