Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
b621aa4
Check in Bower components
robbiemanson Oct 6, 2015
4dec908
Change instances of 'Primer' to 'Origin' and update repo in config
robbiemanson Oct 6, 2015
3d67bc4
WIP: first Origin candidate
robbiemanson Oct 7, 2015
dcd0339
Add Gemfile and update docs
robbiemanson Oct 7, 2015
7f6e776
Set `baseurl` to `/origin` to work around GitHub Pages URL structures
robbiemanson Oct 7, 2015
3869eb8
Change CNAME entry
robbiemanson Oct 7, 2015
df91221
Change CNAME and update version number in Jekyll config
robbiemanson Oct 7, 2015
127dc2c
Remove CNAME file and update docs
robbiemanson Oct 7, 2015
36ae756
Improve documentation and begin deleting Primer-specific docs
robbiemanson Oct 7, 2015
c19c8e3
Update /about page
robbiemanson Oct 7, 2015
258a233
Update menu items and documentation
robbiemanson Oct 8, 2015
56fdf60
Update details of npm and Bower files
robbiemanson Oct 8, 2015
9413568
Improve docs and repo structure
robbiemanson Oct 8, 2015
2e4a7fb
Documentation improvements
robbiemanson Oct 8, 2015
a908877
Delete unneeded contribution and maintenance docs for now
robbiemanson Oct 8, 2015
15248fe
Update npm package details and add `.npmignore` rules
robbiemanson Oct 8, 2015
b4a308e
Remove unneeded npm module dependencies
robbiemanson Oct 8, 2015
2b41e99
Remove `.bowercc` because we want Bower components installed at root
robbiemanson Oct 8, 2015
0195cf5
Update version numbers
robbiemanson Oct 8, 2015
583f7a8
Add note about updating version number in `_config.yml`
robbiemanson Oct 8, 2015
11f0af1
Make `fa-css-utilities` a regular dependency and update version numbers
robbiemanson Oct 8, 2015
82b304c
Reorganise file structure to ease setup
robbiemanson Oct 8, 2015
4debea6
Bump version numbers
robbiemanson Oct 8, 2015
bb333bb
Restructure into local and global directories and update docs
robbiemanson Oct 8, 2015
f8fa0cc
Fix docs and update version numbers
robbiemanson Oct 8, 2015
9bd576e
Merge branch 'rearrange-to-global-and-local-files'
robbiemanson Oct 8, 2015
b97ee30
Remove duplicate npm dependencies and update docs
robbiemanson Oct 8, 2015
37cbec0
Add 'Base styles' section
robbiemanson Oct 9, 2015
7d98177
Put documentation files into directories and remove old Bower components
robbiemanson Oct 9, 2015
194a010
Add candidate `Button` component
robbiemanson Oct 9, 2015
e505f8a
Update Button docs
robbiemanson Oct 9, 2015
9d6269a
Update Button docs
robbiemanson Oct 9, 2015
491e6a4
Improve installation instructions
robbiemanson Oct 9, 2015
e83e3ca
Fix broken link in docs
robbiemanson Oct 9, 2015
799f1b9
Increase contrast of secondary button labels and shadows
robbiemanson Oct 9, 2015
ce09381
Bump version numbers
robbiemanson Oct 9, 2015
6133eda
Fixed broken homepage links and improved docs
robbiemanson Oct 9, 2015
6043dc9
Fix broken homepage link
robbiemanson Oct 9, 2015
a3c8b27
Docs improvements
robbiemanson Oct 9, 2015
2392f34
Update installation details with step for copying /fonts
robbiemanson Oct 9, 2015
9cda4b7
Add Source Sans Pro license file
robbiemanson Oct 9, 2015
1a68a96
Add doc details of local development
robbiemanson Oct 9, 2015
6bdc410
Add Browsersync as dependency and include Grunt task
robbiemanson Oct 12, 2015
516ccb3
Improve documentation
robbiemanson Oct 12, 2015
9e94570
Split `text-color` and `background-color` into two sections
robbiemanson Oct 12, 2015
8c5a3ea
Remove Bower package file
robbiemanson Oct 12, 2015
fb0c7e0
Bump version numbers
robbiemanson Oct 12, 2015
8abbaad
Merge branch 'install-browsersync'
robbiemanson Oct 12, 2015
a73f1de
Fix docs typo
robbiemanson Oct 12, 2015
2cc4f23
Remove Hound
robbiemanson Oct 12, 2015
d848449
Add component nav placeholders
robbiemanson Oct 12, 2015
39f338a
Add bower gem
Oct 13, 2015
3257d63
Update readme with Chruby stuff
Oct 13, 2015
fda5be7
Reintroduce bower.json to ensure Primer dependencies are included
robbiemanson Oct 13, 2015
d771067
Update readme in correct order and delete comment from docs.scss
Oct 13, 2015
517d0fa
Remove Bower from Gemfile and update install setup instructions
robbiemanson Oct 13, 2015
e3bd163
Merge remote-tracking branch 'origin/master'
robbiemanson Oct 13, 2015
31036be
Change `jekyll serve` to `bundle exec jekyll serve`
robbiemanson Oct 14, 2015
70a9ffd
Update to v1.6.0 of `fa-css-utilities`
robbiemanson Oct 14, 2015
4d67080
Improvements to contribution documentation
robbiemanson Oct 14, 2015
106d221
Bump version number
robbiemanson Oct 14, 2015
5799232
Change Jekyll port to 4001 to prevent conflicts with other apps
robbiemanson Oct 15, 2015
cc9b20f
Change default Grunt task to only start browserSync
robbiemanson Oct 15, 2015
02d7e02
Update docs
robbiemanson Oct 15, 2015
6c6ec7a
Add new FAQ and Naming Conventions pages
robbiemanson Oct 20, 2015
af12607
Add a `.Navbar` component and bump the version number
paddyduke Oct 20, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ vendor/
.ruby-version
_site/
node_modules/
bower_components/
12 changes: 0 additions & 12 deletions .hound.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.bundle/config
bower_components/
bin/
_config.yml
.DS_Store
docs/
Gemfile
Gemfile.lock
.git/
.gitignore
Gruntfile.js
.hound.yml
vendor/
.sass-cache/
.ruby-version
node_modules/
.sass-cache/
.scss-lint.yml
_site/
79 changes: 0 additions & 79 deletions CONTRIBUTING.md

This file was deleted.

11 changes: 11 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
source 'https://rubygems.org'

require 'json'
require 'open-uri'
versions = JSON.parse(open('https://pages.github.com/versions.json').read)

gem 'github-pages', versions['github-pages']

gem 'jekyll'
gem 'rouge'
gem 'sass'
141 changes: 141 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.2.4)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
blankslate (2.1.2.4)
bower (0.0.5)
multi_json
classifier-reborn (2.0.3)
fast-stemmer (~> 1.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
colorator (0.1)
ethon (0.8.0)
ffi (>= 1.3.0)
execjs (2.6.0)
fast-stemmer (1.0.2)
ffi (1.9.10)
gemoji (2.1.0)
github-pages (39)
RedCloth (= 4.2.9)
github-pages-health-check (~> 0.2)
jekyll (= 2.4.0)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.3.1)
jekyll-mentions (= 0.2.1)
jekyll-redirect-from (= 0.8.0)
jekyll-sass-converter (= 1.3.0)
jekyll-sitemap (= 0.8.1)
jemoji (= 0.5.0)
kramdown (= 1.5.0)
liquid (= 2.6.2)
maruku (= 0.7.0)
mercenary (~> 0.3)
pygments.rb (= 0.6.3)
rdiscount (= 2.1.7)
redcarpet (= 3.3.2)
terminal-table (~> 1.4)
github-pages-health-check (0.5.3)
addressable (~> 2.3)
net-dns (~> 0.8)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
html-pipeline (1.9.0)
activesupport (>= 2)
nokogiri (~> 1.4)
i18n (0.7.0)
jekyll (2.4.0)
classifier-reborn (~> 2.0)
colorator (~> 0.1)
jekyll-coffeescript (~> 1.0)
jekyll-gist (~> 1.0)
jekyll-paginate (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 2.6.1)
mercenary (~> 0.3.3)
pygments.rb (~> 0.6.0)
redcarpet (~> 3.1)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-feed (0.3.1)
jekyll-gist (1.3.4)
jekyll-mentions (0.2.1)
html-pipeline (~> 1.9.0)
jekyll (~> 2.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.8.0)
jekyll (>= 2.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-sitemap (0.8.1)
jekyll-watch (1.3.0)
listen (~> 3.0)
jemoji (0.5.0)
gemoji (~> 2.0)
html-pipeline (~> 1.9)
jekyll (>= 2.0)
json (1.8.3)
kramdown (1.5.0)
liquid (2.6.2)
listen (3.0.3)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
maruku (0.7.0)
mercenary (0.3.5)
mini_portile (0.6.2)
minitest (5.8.1)
multi_json (1.11.2)
net-dns (0.8.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.11)
public_suffix (1.5.1)
pygments.rb (0.6.3)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.2.0)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdiscount (2.1.7)
redcarpet (3.3.2)
rouge (1.10.1)
safe_yaml (1.0.4)
sass (3.4.18)
terminal-table (1.5.2)
thread_safe (0.3.5)
toml (0.1.2)
parslet (~> 1.5.0)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
yajl-ruby (1.2.1)

PLATFORMS
ruby

DEPENDENCIES
bower
github-pages (= 39)
jekyll
json
rouge
sass

BUNDLED WITH
1.10.5
76 changes: 25 additions & 51 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,60 +13,17 @@ module.exports = function(grunt) {
},
dist: {
files: {
'css/primer.css': 'scss/primer.scss'
'assets/css/origin.css': 'assets/scss/origin.scss'
}
}
},

// Handle vendor prefixing
postcss: {
options: {
processors: [
require('autoprefixer-core')({ browsers: ['last 2 versions', 'ie 8', 'ie 9'] })
]
},
dist: {
src: 'css/*.css'
},
docs: {
src: '_site/*.css'
}
},

// Runs CSS reporting
parker: {
options: {
metrics: [
'TotalStylesheets',
'TotalStylesheetSize',
'TotalRules',
'TotalSelectors',
'TotalIdentifiers',
'TotalDeclarations',
'SelectorsPerRule',
'IdentifiersPerSelector',
'SpecificityPerSelector',
'TopSelectorSpecificity',
'TopSelectorSpecificitySelector',
'TotalIdSelectors',
'TotalUniqueColours',
'TotalImportantKeywords',
'TotalMediaQueries'
],
file: "css/.primer-stats.md",
usePackage: true
},
src: [
'css/*.css'
]
},

// Build tooling

watch: {
sass: {
files: ['scss/**/*.scss', 'docs/docs.scss'],
tasks: ['sass', 'postcss', 'parker']
files: ['assets/scss/*.scss', 'assets/scss/**/*.scss', 'assets/scss/**/**/*.scss'],
tasks: ['sass']
}
},

Expand All @@ -78,6 +35,24 @@ module.exports = function(grunt) {
}
},

browserSync: {
dev: {
bsFiles: {
src : [
'_site/*.*',
'_site/**/*.*',
'_site/**/**/*.*',
'_site/**/**/**/*.*',
'_site/**/**/**/**/*.*',
'_site/**/**/**/**/**/*.*'
]
},
options: {
proxy: "localhost:4001/origin/"
}
}
},

buildcontrol: {
options: {
dir: '_site',
Expand All @@ -87,24 +62,23 @@ module.exports = function(grunt) {
},
pages: {
options: {
remote: 'git@github.com:primer/primer.git',
remote: 'git@github.com:fac/origin.git',
branch: 'gh-pages'
}
}
}
});

// Load dependencies
grunt.loadNpmTasks('grunt-postcss');
grunt.loadNpmTasks('grunt-browser-sync');
grunt.loadNpmTasks('grunt-build-control');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-jekyll');
grunt.loadNpmTasks('grunt-parker');
grunt.loadNpmTasks('grunt-sass');

// Generate and format the CSS
grunt.registerTask('default', ['sass', 'jekyll', 'postcss', 'parker']);
grunt.registerTask('default', ['browserSync']);

// Publish to GitHub
grunt.registerTask('publish', ['jekyll', 'postcss:docs', 'buildcontrol:pages']);
grunt.registerTask('publish', ['jekyll', 'buildcontrol:pages']);
};
Loading