Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,17 @@
-Bootstrap uses [GitHub's Releases feature](/~https://github.com/blog/1547-release-your-software) for its changelogs.
+# Changes
 
-See [the Releases section of our GitHub project](/~https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap.
+## 1.0.0 (unreleased)
 
-Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.
+* Correct versioning from being based on Bootstrap to being our own
+* Added changelog
+* Add Landing page and Landing content page examples
+* Add `.opaque` and `.transparent` classes
+* Remove side margin on footer social icons
+* Redirect large icon font size slightly
+* Backport fix for /~https://github.com/twbs/bootstrap/pull/19885 for card deck
+  heights
+* Gradients use 95% opacity by default.
+* `.list-bordered` only applies to immediate children; this fixes nested
+  lists
+* Use theme colours from microsite layout (fixes #10).
+* Initial release based on Bootstrap v4.0.0-alpha2

Gruntfile.js

@@ -39,9 +39,8 @@ module.exports = function (grunt) {
     // Metadata.
     pkg: grunt.file.readJSON('package.json'),
     banner: '/*!\n' +
-            ' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
-            ' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
-            ' * Licensed under MIT (/~https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
+            ' * JCU Web Framework v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
+            ' * Copyright 2015-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
             ' */\n',
     jqueryCheck: 'if (typeof jQuery === \'undefined\') {\n' +
                  '  throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\')\n' +

README.md

@@ -37,13 +37,16 @@ customizer](/~https://github.com/gustavohenke/webhostinghub-glyphs) licensed under
 MIT licensing. [Original font](http://www.webhostinghub.com/glyphs/#howToUse) is
 licensed under the SIL Open Font License.
 
+Bootstrap source code licensed under the MIT Licence, see the
+`bootstrap-LICENSE` file in this repository for details.
+
 
 ## Quick start
 
 Several quick start options are available:
 
-- [Download the latest release.](/~https://github.com/jcu-eresearch/jcu-web-framework/archive/v4.0.0-alpha.2.zip)
-- Clone the repo: `git clone /~https://github.com/jcu-eresearch/jcu-web-framework.git`
+- [Download the latest release.](/~https://github.com/jcu/web-framework/releases)
+- Clone the repo: `git clone /~https://github.com/jcu/web-framework.git`
 
 Read the [online documentation](https://web.jcu.io) for information on the
 framework contents, templates and examples, and more.
@@ -85,9 +88,9 @@ fonts for use in typography and as iconography.
 ## Bugs and feature requests
 
 Found a bug or have a feature request? Search for existing and closed issues on
-our [issue tracker](/~https://github.com/jcu-eresearch/jcu-web-framework/issues).
+our [issue tracker](/~https://github.com/jcu/web-framework/issues).
 If your problem or idea is not addressed yet, [please open a new
-issue](/~https://github.com/jcu-eresearch/jcu-web-framework/issues/new).
+issue](/~https://github.com/jcu/web-framework/issues/new).
 
 
 ## Documentation
@@ -107,9 +110,9 @@ compatibility, Bootstrap is maintained under [the Semantic Versioning
 guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to
 those rules whenever possible.
 
-See [the Releases section of our GitHub
-project](/~https://github.com/jcu-eresearch/jcu-web-framework/releases) for changelogs for each
-release version.
+See [the
+CHANGELOG](/~https://github.com/jcu/web-framework/blob/master/CHANGELOG.md) for
+changes between versions.
 
 ## Developers
 

_config.yml

@@ -24,13 +24,13 @@ gems:
   - jekyll-sitemap
 
 # Custom vars
-current_version:  4.0.0-alpha.2
+current_version:  1.0.0-beta.1
 repo:             /~https://github.com/jcu/web-framework
 slack:            https://bootstrap-slack.herokuapp.com
 
 download:
-  source:         /~https://github.com/jcu/web-framework/archive/v4.0.0-alpha.2.zip
-  dist:           /~https://github.com/jcu/web-framework/releases/download/v4.0.0-alpha.2/jcu-web-framework-4.0.0-alpha.2-dist.zip
+  source:         /~https://github.com/jcu/web-framework/archive/v1.0.0-beta.1.zip
+  dist:           /~https://github.com/jcu/web-framework/releases/download/v1.0.0-beta.1/jcu-web-framework-1.0.0-beta.1-dist.zip
   releases:       /~https://github.com/jcu/web-framework/releases
 
 blog:             http://blog.getbootstrap.com
@@ -39,10 +39,10 @@ themes:           http://themes.getbootstrap.com
 
 cdn:
   # See https://www.srihash.org for info on how to generate the hashes
-  css:            https://cdn.web.jcu.io/4.0.0-alpha.2/css/jcu.min.css
-  css_hash:       "sha384-Npet4Pvh7wzx+b2x7+KUOimgVdxolJzoHf62QYWGGgVDEdch1fpsdHWLMfGzZtfe"
-  js:             https://cdn.web.jcu.io/4.0.0-alpha.2/js/jcu.min.js
-  js_hash:        "sha384-TYTt6lPd3LgArESaCPBLxt/gpeS1QeSeh6lP6sF8RRb+B40YFo2hr2zL5licoEMX"
+  css:            https://cdn.web.jcu.io/1.0.0-beta.1/css/jcu.min.css
+  css_hash:       "sha384-valFRKl+0g0tWrYJQwXPaf4oRFo9hOu7BssvfScVX9wdvvA+NjYtnAFm3sqP7LFy"
+  js:             https://cdn.web.jcu.io/1.0.0-beta.1/js/jcu.min.js
+  js_hash:        "sha384-GXpe6UW5FXR+By2fTo2YeI+yVoY1QGkZdZpppWl3qboYFMqHL7zFEq+X6hRoB1gH"
   jquery:         https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js
   jquery_hash:    "sha384-8gBf6Y4YYq7Jx97PIqmTwLPin4hxIzQw5aDmUg/DDhul9fFpbbLcLh3nTIIDJKhx"
   tether:         https://cdnjs.cloudflare.com/ajax/libs/tether/1.1.1/js/tether.min.js

bootstrap-LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2011-2016 Twitter, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.