Skip to content

Commit

Permalink
Packaging cleanup to JCU Web Framework
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjb committed May 24, 2016
1 parent 5e72777 commit 4283d4c
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 15 deletions.
5 changes: 2 additions & 3 deletions Gruntfile.js
Expand Up @@ -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' +
Expand Down
3 changes: 3 additions & 0 deletions README.md
Expand Up @@ -37,6 +37,9 @@ 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

Expand Down
21 changes: 21 additions & 0 deletions 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.
13 changes: 7 additions & 6 deletions package.json
@@ -1,7 +1,8 @@
{
"name": "jcu",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"description": "The HTML, CSS, and JS framework for building responsive, mobile-first web projects with University styling",
"version": "4.0.0-alpha.2",
"private": true,
"keywords": [
"css",
"sass",
Expand All @@ -11,8 +12,8 @@
"framework",
"web"
],
"homepage": "http://getbootstrap.com",
"author": "Twitter, Inc.",
"homepage": "https://web.jcu.io",
"author": "James Cook University",
"scripts": {
"change-version": "node grunt/change-version.js",
"test": "grunt test"
Expand All @@ -22,12 +23,12 @@
"main": "./dist/js/npm",
"repository": {
"type": "git",
"url": "https://github.com/twbs/bootstrap.git"
"url": "https://github.com/jcu/web-framework.git"
},
"bugs": {
"url": "https://github.com/twbs/bootstrap/issues"
"url": "https://github.com/jcu/web-framework/issues"
},
"license": "MIT",
"license": "UNLICENSED",
"devDependencies": {
"autoprefixer": "^6.0.3",
"babel-eslint": "^4.1.3",
Expand Down
6 changes: 0 additions & 6 deletions scss/bootstrap.scss
@@ -1,9 +1,3 @@
/*!
* Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

// Core variables and mixins
@import "variables";
@import "mixins";
Expand Down
5 changes: 5 additions & 0 deletions scss/jcu.scss
@@ -1,3 +1,8 @@
/*!
* JCU Web Framework v4.0.0-alpha.2 (https://web.jcu.io)
* Copyright 2016 James Cook University.
*/

// Core variables, customise core theme
@import "jcu/variables";

Expand Down

0 comments on commit 4283d4c

Please sign in to comment.