Skip to content

Commit

Permalink
JCU Bootstrap customisations
Browse files Browse the repository at this point in the history
This customises Bootstrap in numerous ways, particularly by adding
JCU-specific styles and components to the styles and documentation.

Configure baseurl for documentation serving in Stash
  • Loading branch information
davidjb committed Sep 22, 2015
1 parent 81435ad commit 42dbfbc
Show file tree
Hide file tree
Showing 1,148 changed files with 532,813 additions and 495 deletions.
4 changes: 4 additions & 0 deletions .bowerrc
@@ -0,0 +1,4 @@
{
"analytics": false,
"directory": "scss/components"
}
3 changes: 0 additions & 3 deletions Gemfile.lock
Expand Up @@ -81,6 +81,3 @@ DEPENDENCIES
rouge (~> 1.9.1)
sass (~> 3.4.18)
scss_lint (~> 0.41)

BUNDLED WITH
1.10.6
19 changes: 16 additions & 3 deletions Gruntfile.js
Expand Up @@ -259,7 +259,7 @@ module.exports = function (grunt) {
// and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly
compatibility: 'ie9',
keepSpecialComments: '*',
sourceMap: true,
sourceMap: false,
noAdvanced: true
},
core: {
Expand Down Expand Up @@ -301,7 +301,16 @@ module.exports = function (grunt) {
}
},

// TODO Fix this so files are correctly configured
copy: {
components: {
files: [
{expand: true, cwd: 'scss/components/open-sans-fontface', src: ['fonts/**/*'], dest: 'dist/css/'},
{expand: true, cwd: 'scss/components/webhostinghub-glyphs', src: ['font/**/*'], dest: 'dist/'},
{expand: true, cwd: 'scss/components/', src: ['**/*'], dest: 'dist/css/components'},
{expand: true, cwd: '.', src: ['images/**/*'], dest: 'dist/'}
]
},
docs: {
expand: true,
cwd: 'dist/',
Expand Down Expand Up @@ -402,7 +411,7 @@ module.exports = function (grunt) {
},
pages: {
options: {
remote: 'git@github.com:twbs/derpstrap.git',
remote: 'ssh://git@git.jcu.edu.au/webstyle/jcu-web-framework.git',
branch: 'gh-pages'
}
}
Expand Down Expand Up @@ -466,7 +475,7 @@ module.exports = function (grunt) {
// grunt.registerTask('sass-compile', ['sass:core', 'sass:extras', 'sass:docs']);
grunt.registerTask('sass-compile', ['sass:core', 'sass:docs']);

grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'autoprefixer:core', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);
grunt.registerTask('dist-css', ['copy:components', 'sass-compile', 'postcss:core', 'autoprefixer:core', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);

// Full distribution task.
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']);
Expand Down Expand Up @@ -515,4 +524,8 @@ module.exports = function (grunt) {
done();
});
});

// JCU custom tasks
// Publish: builds docs, runs Jekyll, and pushes onto Stash
grunt.registerTask('jcu-publish', ['docs', 'jekyll:github', 'buildcontrol:pages']);
};
7 changes: 4 additions & 3 deletions _config.yml
Expand Up @@ -13,9 +13,10 @@ source: docs
destination: _gh_pages
host: 0.0.0.0
port: 9001
baseurl: ""
baseurl: "/stash/pages/WEBSTYLE/jcu-web-framework/gh-pages/browse"
url: http://getbootstrap.com
encoding: UTF-8
timezone: Australia/Brisbane
exclude: [assets/scss/]

gems:
Expand All @@ -24,9 +25,9 @@ gems:

# Custom vars
current_version: 4.0.0-alpha
repo: https://github.com/twbs/bootstrap
repo: https://git.jcu.edu.au/stash/projects/WEBSTYLE/repos/jcu-web-framework
sass_repo: https://github.com/twbs/bootstrap-sass
slack: https://bootstrap-slack.herokuapp.com
slack: ''

download:
source: https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.zip
Expand Down
14 changes: 9 additions & 5 deletions bower.json
@@ -1,6 +1,6 @@
{
"name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"name": "jcu-web-framework",
"description": "JCU web framework for all applications",
"keywords": [
"css",
"js",
Expand All @@ -11,8 +11,9 @@
"framework",
"web"
],
"homepage": "http://getbootstrap.com",
"license": "MIT",
"homepage": "https://jcu.edu.au",
"license": "proprietary",
"private": true,
"moduleType": "globals",
"main": [
"scss/bootstrap.scss",
Expand All @@ -29,6 +30,9 @@
"test-infra"
],
"dependencies": {
"jquery": "1.9.1 - 2"
"jquery": "1.9.1 - 2",
"open-sans-fontface": "~1.4.2",
"webhostinghub-glyphs": "~0.1.3",
"yamm3": "~1.1.0"
}
}
3 changes: 1 addition & 2 deletions dist/css/bootstrap.min.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/css/bootstrap.min.css.map

This file was deleted.

17 changes: 17 additions & 0 deletions dist/css/components/open-sans-fontface/README.md
@@ -0,0 +1,17 @@
# Open Sans @font-face kit

I split the SASS file, so the developer can decide which fonts and styles she or he really needs.

Installable via [Bower](http://twitter.github.com/bower/):
```
bower install open-sans-fontface
```

## Demo
__Our repository:__ [http://fontfacekit.github.com/open-sans](http://fontfacekit.github.com/open-sans)

__Google Web Fonts:__ [http://www.google.com/fonts/specimen/Open+Sans](http://www.google.com/fonts/specimen/Open+Sans)


## Maintain your own font-face in FontFaceKit
Contact @gustavohenke if you want to maintain your own font-face in this repository.
24 changes: 24 additions & 0 deletions dist/css/components/open-sans-fontface/bower.json
@@ -0,0 +1,24 @@
{
"name": "open-sans-fontface",
"main": [
"./open-sans.css",
"./fonts/**/*"
],
"homepage": "https://github.com/FontFaceKit/open-sans",
"authors": [
"Gustavo Henke <gustavo@injoin.com.br>",
"Martin Domke <martin.domke@gateprotect.com>"
],
"description": "The Open Sans fontface",
"keywords": [
"font"
],
"license": "Apache License version 2.0",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
]
}
Binary file not shown.

0 comments on commit 42dbfbc

Please sign in to comment.