Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Buttons 2 #43

Closed
wants to merge 147 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
cbdf14d
Initial scaffolding and reorg
alexwolfe Aug 24, 2014
cf40754
Update to the options file
alexwolfe Aug 24, 2014
0b17ce5
base cleanup
alexwolfe Aug 24, 2014
26ffb6b
added something new
alexwolfe Aug 25, 2014
8b01b10
Updated base button file
Aug 25, 2014
be03c2d
Update to base
Aug 25, 2014
4dd9e3f
Added more base styles, border buttons
Aug 26, 2014
50c7c97
grunt build now working
Aug 26, 2014
6d70cfc
demo partially working
Aug 26, 2014
c8d2a70
demo getting closer
Aug 26, 2014
ac26f8a
fixed loop
Aug 26, 2014
fe3904c
small naming update
Aug 26, 2014
f86ad55
Base type treatment
alexwolfe Aug 26, 2014
d2af003
Update to border file and base
Aug 26, 2014
0334f1d
zero out shape styles
alexwolfe Aug 30, 2014
8a2a10b
Added Grunt Watch
alexwolfe Aug 30, 2014
2e862ed
Added raised buttons
alexwolfe Aug 30, 2014
953e50d
touchups for raised buttons
alexwolfe Aug 30, 2014
ffcf7c4
3d buttons first pass
alexwolfe Aug 30, 2014
713c501
more touch ups
alexwolfe Aug 31, 2014
1fe059d
Update to colors and raised type active state
alexwolfe Sep 1, 2014
6058f2b
Initial refactor of glowing buttons
alexwolfe Sep 1, 2014
10634c7
First pass at dropdown cleanup
alexwolfe Sep 1, 2014
9c084f4
button wrapper effect
alexwolfe Sep 1, 2014
a0a85b2
button groups now working
alexwolfe Sep 1, 2014
b18efda
demo page working group buttons updated
alexwolfe Sep 1, 2014
cc49142
Grunt Build Process Complete
alexwolfe Sep 2, 2014
5dfac64
copy js files too for styleguide
alexwolfe Sep 2, 2014
2860a68
Updates
alexwolfe Sep 2, 2014
1ba7526
minification
alexwolfe Sep 2, 2014
0d57d06
small fix
alexwolfe Sep 2, 2014
a13de59
Scaffolding for styleguide
alexwolfe Sep 3, 2014
14f64b9
minor changes
alexwolfe Sep 3, 2014
239c047
upgraded font awesome to 4.2
alexwolfe Sep 5, 2014
9e32e36
more cleanup
alexwolfe Sep 5, 2014
a320aa8
More css styles and auto code generator
alexwolfe Sep 6, 2014
91a4c31
Code box preview
alexwolfe Sep 7, 2014
ee9ab51
Updated the sizes & circles
alexwolfe Sep 7, 2014
c9cacad
circle buttons update
alexwolfe Sep 7, 2014
22b116b
iphone image
alexwolfe Sep 7, 2014
551a466
More updates to mobile example
alexwolfe Sep 7, 2014
1faeadf
more updates
alexwolfe Sep 7, 2014
606567b
refactor of sizes & shapes using hash maps
alexwolfe Sep 8, 2014
ba6ebc7
couple minor updates for circle
alexwolfe Sep 8, 2014
f771e47
borderless mobile buttons added
alexwolfe Sep 8, 2014
3e0fccc
minor tweak
alexwolfe Sep 8, 2014
3edef8a
square shape added
alexwolfe Sep 8, 2014
35264d3
box and square
alexwolfe Sep 8, 2014
4d17784
button groups now support dropdowns
alexwolfe Sep 11, 2014
0097fa4
latest refactor
alexwolfe Sep 13, 2014
6f31bf5
more refactor
alexwolfe Sep 13, 2014
d601267
cleanup package.json
Sep 13, 2014
dc34cf7
Updated README
Sep 13, 2014
bbd866b
Forgot to document grunt tasks.
Sep 13, 2014
ed4c14e
Formatting glitch fixed
Sep 13, 2014
d960211
Formatting glitch take two
Sep 13, 2014
4d79fe8
Mailchimp form unstyled. Subscribers returned to the unicorn-ui-.com …
Sep 13, 2014
ebff205
Some accessibility fixes
Sep 14, 2014
312ae2a
Update to 3d buttons
alexwolfe Sep 14, 2014
b3c611e
update 3d buttons
alexwolfe Sep 14, 2014
d080769
more styleguide cleanup
alexwolfe Sep 15, 2014
9019aa4
buttons cleanup cont
alexwolfe Sep 15, 2014
ebcc273
sass 3.2 version compatability
Sep 18, 2014
52ba6ee
More accessibility improvements
Sep 19, 2014
5c36c83
Buttons Accessibility recommendations content
Sep 19, 2014
199939c
WIP - qunit sauce labs
Sep 23, 2014
e1858a0
latest changes
alexwolfe Sep 24, 2014
351c6e3
Merge branch 'buttons-2' of https://github.com/alexwolfe/Buttons into…
alexwolfe Sep 24, 2014
6a1d232
some cleanup
alexwolfe Sep 27, 2014
f5696f3
added license
alexwolfe Sep 27, 2014
e6dcb46
small license update
alexwolfe Sep 27, 2014
2b909f8
Adds window.global_test_results to saucelabs test
Sep 27, 2014
6f09794
Trimming newlines in prettyprint javascript
Sep 27, 2014
2a1056b
Accessibility section. Fixed setup buttons prettyprint formatting
Sep 27, 2014
52c880e
latest build
Sep 27, 2014
764156e
add license to js
alexwolfe Sep 27, 2014
e7f6bca
update to compile files and FF autoprefix support
alexwolfe Sep 27, 2014
3522841
Update to options
alexwolfe Sep 28, 2014
9c9c569
Finished updating options
alexwolfe Sep 28, 2014
4233e41
update to options
alexwolfe Sep 28, 2014
f19134c
update package.json
alexwolfe Sep 28, 2014
bcc1787
fixed recursive grunt loop
alexwolfe Sep 28, 2014
cc0b0bd
dropdown and base button updated
alexwolfe Sep 28, 2014
9942593
fixed framework reset conflict for hover
alexwolfe Sep 28, 2014
a71cde0
active, and is-active class states added
alexwolfe Sep 28, 2014
72b4072
more updates
alexwolfe Sep 28, 2014
c9f4b72
base button updates
alexwolfe Sep 28, 2014
8bfaa94
update for dropdowns
alexwolfe Sep 28, 2014
0b036e6
refactor of dropdown module
alexwolfe Sep 29, 2014
325666f
Forgot to add varas :(
Sep 29, 2014
5f7bc63
First stab at wiring up Travis CI
Sep 30, 2014
64fdf62
dependencies always
Sep 30, 2014
d06a234
Invalid json
Sep 30, 2014
f641dff
Merge pull request #37 from roblevintennis/buttons-2
roblevintennis Sep 30, 2014
25b29bc
connect travis with saucelabs
Sep 30, 2014
4f382f4
Update to raised and dropdowns
alexwolfe Sep 30, 2014
338314c
cleanup
alexwolfe Sep 30, 2014
40901c1
Some real tests
Sep 30, 2014
6bceea0
Update README.md
roblevintennis Oct 1, 2014
78c5867
fixed test path in gruntfile
Oct 1, 2014
91398d9
dropdowns now only use default colors
alexwolfe Oct 1, 2014
bb4ffc6
Update README.md
roblevintennis Oct 1, 2014
068c790
Removed button dropdown references in README
Oct 2, 2014
6a2d1c0
Some README TLC
Oct 2, 2014
86c47ca
Just a bit of margin on the various types of buttons
Oct 2, 2014
e9bcfc3
logo & colors
alexwolfe Oct 4, 2014
23e3125
More logo work
alexwolfe Oct 4, 2014
95106a3
hero
alexwolfe Oct 4, 2014
21c9ef0
hero fixes
alexwolfe Oct 4, 2014
c5d4c5e
more touch ups
alexwolfe Oct 4, 2014
f27bfab
Long Shadows
Oct 4, 2014
8baa5e9
Moved long shadow buttons down
Oct 4, 2014
b361a07
Long shadow box (applies to button itself)
Oct 4, 2014
5fa2d5a
First pass at arrows
alexwolfe Oct 4, 2014
2fa8b89
Merge branch 'buttons-2' of https://github.com/alexwolfe/Buttons into…
alexwolfe Oct 4, 2014
898e1fc
small fix
alexwolfe Oct 4, 2014
36190f2
unicorn-ui Bump
Oct 23, 2014
802db35
Setup and Mobile styles
Oct 25, 2014
25f155d
update to setup mobile styles
Oct 25, 2014
ca2c80c
update to nav for mobile
Oct 25, 2014
7a6ef8a
added transition guide
Oct 25, 2014
b12c5b3
Added Showcase, Playground coming soon, etc.
Oct 31, 2014
ce12034
dropbox link dl=1 fix
Oct 31, 2014
2d2e48f
annoying markdown link fix
Oct 31, 2014
6ad7f83
More readme updates
Oct 31, 2014
56d06db
Remove bitdeli
Nov 2, 2014
c33fe53
styleguide is now showcase
Nov 2, 2014
c0fa3ed
grunt copy:main
Nov 2, 2014
413a4ec
showcase-dist
Nov 2, 2014
344fa6f
Remove the sourcemap
Nov 2, 2014
0f2cb1f
README
Oct 21, 2014
b67126f
replace alexwolfe with unicorn-ui
Oct 21, 2014
fbe4e11
Update README.md
roblevintennis Oct 21, 2014
1f679e6
Corrects URLs and verbiage
Nov 2, 2014
105c445
Move tests up to top under title
Nov 2, 2014
33be465
line break
Nov 2, 2014
1d56262
Setup installation instructions use Buttons 2.0
Nov 2, 2014
ce3aacd
Correct link to no longer existing buttons zip now to buttons.css
Nov 3, 2014
c0226d0
Add Github button next to download in hero. Fixes broken Grunt copy t…
Nov 9, 2014
c7f68dc
Update to 1.11.1 jquery and using googleapis cdn
Nov 9, 2014
7bbd703
updated jquery and font awesome includes in readme
Nov 9, 2014
6c7c06f
Removes the sourcemap property which blows up old sass
Nov 10, 2014
82bb779
Fixes some sass errors
Nov 10, 2014
c32acae
Adds social buttons to bottom flyup. Add top nav
Nov 10, 2014
d65512a
Alignments on social buttons and opt in
Nov 10, 2014
2a8ce90
upgrade jquery to 1.11.1
Nov 12, 2014
7da28ba
phone changes and last tweaks
Nov 12, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.sass-cache
.DS_Store
*.psd
node_modules
node_modules
showcase/css/showcase.css.map
showcase-dist
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
language: node_js
node_js:
- 0.10
before_script:
- npm install -g grunt-cli

env:
global:
- secure: UpriWPnu18P/BWtqzKCCSta9921Z2947bTuniQoDc/ywFrC1Kpix4BL98fT3IB/8z4B3S+vXLbe+3qSeltjX2tNtYCY0JLkS9gijXrYLp7buphkBMdMPdTmEFM66iTwy2YD71XCqrh7fViuE5uMR4MHKRq3RCBeXrsQO8YcKUig=
- secure: HKlIRHrUj3uTOstiY8BLWAZqpiUXOaS6DhP0IIUCJ6JLWoFGm91l9sr2mR+sRcRdQ13oMTV0rXEZQ3uMJrTpxNv5jt7/QFpwi1m62RkyUwqTWCmPgduQ9HKqPKkw4xA+UXRHqv+I2sLFCamts9OFErqPTEWMJDKEfilLOqmsrUE=
277 changes: 277 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
module.exports = function (grunt) {
/**
* Load Grunt Npm Modules
*
*/
grunt.loadNpmTasks('grunt-autoprefixer');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-saucelabs');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-includes');

/**
* Grunt Configuration
*
*/
grunt.initConfig({

/*
* Template Includes
*
*/

includes: {
build: {
cwd: 'showcase/pages',
src: ['*.html' ],
dest: 'showcase/',
options: {
includePath: 'showcase/includes'
}
}
},


/*
* Sass Compilation
*
*/

sass: {
all: {
files: {
'tmp/css/buttons.css': 'scss/buttons.scss',
'tmp/css/showcase.css': 'showcase/scss/showcase.scss'
}
}
},


/*
* Vendor Prefixing
*
*/

autoprefixer: {
options: {
browsers: ['last 3 versions', 'safari 5', 'ie 8', 'ie 9', 'Firefox >= 20']
},
all: {
expand: true,
flatten: true,
src: 'tmp/css/*.css',
dest: 'tmp/css'
}
},


/*
* Minify files
*
*/

cssmin: {
add_banner: {
options: {
banner: '/* Buttons */',
keepSpecialComments: 1
},
files: {
'tmp/css/buttons.min.css': ['tmp/css/buttons.css']
}
}
},

/*
* Copy files
*
*/

copy: {
css_library: {
files: [{
expand: true,
cwd: 'tmp/css',
src: ['**/*', '!showcase.css', '!showcase.css.map'],
dest: 'css'
}]
},
css_showcase: {
files: [{
expand: true,
cwd: 'tmp/css',
src: ['**/*', '!buttons.min.css', '!buttons.css.map'],
dest: 'showcase/css'
}]
},
js_showcase: {
files: [{
expand: true,
cwd: 'js',
src: ['**/*'],
dest: 'showcase/js'
}]
},
showcase_dist: {
files: [{
expand: true,
cwd: 'showcase',
src: ['*.html', 'css/**/*', 'fonts/**/*', 'images/**/*', 'js/**/*'],
dest: 'showcase-dist'
}]
}
},


/*
* Clean tmp folders
*
*/

clean: {
dev: {
src: ["tmp"]
},
build: {
src: ["showcase-dist"]
}
},


/*
* Launch local server
*
*/

connect: {
livereload: {
options: {
port: 8000,
livereload: 35729, // change this to '0.0.0.0' to access the server from outside
hostname: 'localhost',
base: 'showcase',
open: true
}
},
sauce: {
options: {
port: 9999,
hostname: 'localhost',
base: '',
}
}
},


/*
* Watch for changes
*
*/

watch: {
scripts: {
files: ['js/**/*.js'],
tasks: ['copy:main:js_showcase', 'clean:dev']
},
sass: {
files: ['scss/**/*.scss', 'showcase/scss/**/*.scss'],
tasks: ['sass', 'autoprefixer', 'copy:css_showcase', 'copy:css_library', 'clean:dev']
},
includes: {
files: ['showcase/includes/**/*.html', 'showcase/pages/**/*.html'],
tasks: ['includes']
},
livereload: {
options: {
livereload: '<%= connect.livereload.options.livereload %>'
},
files: [
'scss/**/*.scss',
'css/**/*.css',
'js/**/*',
'showcase/**/*'
]
}
},


/*
* QUnit
*
*/

qunit: {
options: {
urls:[
'http://localhost:9999/js/tests/*.html'
]
}
},

/*
* Saucelabs
* Requires environment variables set e.g. export SAUCE_USERNAME=XX; export SAUCE_ACCESS_KEY=XX
*
*/
'saucelabs-qunit': { //DO NOT CHANGE NAME
all: {
options: {
build: process.env.TRAVIS_JOB_ID,
concurrency: 3,
tunnelTimeout: 5,
urls: ['http://localhost:9999/tests/index.html'],
testname: 'Buttons Sauce Unit Tests',
browsers: [
{
browserName: 'safari',
version: '6',
platform: 'OS X 10.8'
},
{
browserName: 'firefox',
version: '25',
platform: 'OS X 10.6'
},
{
browserName: 'chrome',
version: '31',
platform: 'Windows 8.1'
}
]
}
}
}
});


/**
* Grunt Helper Tasks
*
*/

grunt.registerTask('test', 'qunit');
grunt.registerTask('sauceserver', 'connect:sauce');
grunt.registerTask('sauce', 'saucelabs-qunit');
var testSubtasks = ['test'];
if (process.env.SAUCE_ACCESS_KEY !== undefined) {
testSubtasks.push('sauceserver');
testSubtasks.push('sauce');
}
grunt.registerTask('copyMain', ['copy:css_library', 'copy:css_showcase', 'copy:js_showcase']);


/**
* Grunt Core Build Tasks
*
*/

grunt.registerTask('default', ['sass', 'autoprefixer', 'cssmin', 'copyMain', 'clean:dev']);
grunt.registerTask('dev', ['includes', 'sass', 'autoprefixer', 'cssmin', 'copyMain', 'clean:dev', 'connect', 'watch']);
grunt.registerTask('dist', ['clean:build', 'includes', 'sass', 'autoprefixer', 'cssmin', 'copyMain', 'copy:showcase_dist', 'clean:dev']);
grunt.registerTask('tests', testSubtasks);
};
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Buttons

Copyright 2012-2014 Alex Wolfe and Rob Levin

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Loading