Commit Graph

518 Commits

Author SHA1 Message Date
FezVrasta
266b2374bb Merge branch 'master' into gh-pages
Conflicts:
	meteor/package.js
2015-03-10 13:08:29 +01:00
FezVrasta
2708438daa improved shadows and buttons 2015-03-10 13:01:47 +01:00
FezVrasta
9a1f979ea6 completely fixed meteor 2015-03-10 11:02:17 +01:00
FezVrasta
cbd2ff391a fixed meteor 2015-03-10 10:28:19 +01:00
FezVrasta
80fc8a14b3 added color variations even on toggles' ripple 2015-03-10 10:27:06 +01:00
FezVrasta
50b67d0520 Merge remote-tracking branch 'originssh/master' 2015-03-09 20:57:19 +01:00
FezVrasta
3cf4a656bf btn states and toggles variations 2015-03-09 20:56:57 +01:00
Fez Vrasta
89e9605226 Merge pull request #472 from tyleriguchi/grunt-watch
fix watch task from recursing
2015-03-09 20:27:34 +01:00
FezVrasta
33b164294e improved accessibility (#425) 2015-03-09 18:01:22 +01:00
FezVrasta
c42cd9cf06 fixed tabs 2015-03-09 17:17:02 +01:00
FezVrasta
a4c09ab76e see changes to changelog.md 2015-03-09 17:10:44 +01:00
Fez Vrasta
7d220d4484 Merge pull request #479 from GradyD/modal
Adjusted padding on dialog(modal) to be more inline with standards
2015-03-09 10:48:32 +01:00
Fez Vrasta
b907eb0190 Merge pull request #481 from GradyD/fonts
Embedded RobotoDraft font files for #314
2015-03-09 10:46:11 +01:00
GradyD
f61d3caf16 Embedded RobotoDraft font files for #314. I commented the original line so the refrence to the files can still be found/used if desired. 2015-03-08 20:04:38 -04:00
GradyD
9061f3e16d Adjusted padding on dialog(modal) to be more inline with standards 2015-03-08 17:30:26 -04:00
Grady Duncan
6c79fadc2b Merge pull request #1 from FezVrasta/master
Update Fork
2015-03-08 17:17:16 -04:00
Fez Vrasta
eb001ac0ed Merge pull request #477 from GradyD/dependencies
Added jQuery 1.9.1 and Bootstrap 3.0 as dependencies.
2015-03-08 19:40:49 +01:00
GradyD
870f504141 Added jQuery 1.9.1 and Bootstrap 3.0 as dependencies. To meet requirment for #416 2015-03-08 13:17:43 -04:00
Fez Vrasta
ba6b7304b5 Merge pull request #475 from MatrixZ/selectbox-height
fixes #468
2015-03-07 10:23:27 +01:00
MatrixZ
ad7a12f063 fixes #468 2015-03-06 11:21:25 +05:30
Tyler Iguchi
084b5a1fae fix watch task from recursing 2015-03-04 12:47:53 -08:00
Fez Vrasta
c20e515a0d Merge pull request #466 from MatrixZ/update-dist-folder
dist folder updated
2015-03-03 17:10:35 +01:00
MatrixZ
631aa27922 dist folder updated 2015-03-03 18:04:43 +05:30
Fez Vrasta
67cadd712d Merge pull request #443 from timhovius/navbar-text
Fix navbar-text on smaller screens (< 1199px)
2015-02-27 12:24:22 +01:00
Tim Hovius
9e299c24fd Fixed margin for navbar-text on smaller screens 2015-02-27 12:20:26 +01:00
Fez Vrasta
442ea09727 Merge pull request #461 from timhovius/navbar-dropdown
Fixed dropdown-menu correct colors on active, hover and focus state
2015-02-27 12:15:41 +01:00
Tim Hovius
1adb09c5ae Removed unused code 2015-02-27 12:14:08 +01:00
Tim Hovius
92e41b7fda Fixed dropdown-menu correct colors on active, hover and focus state 2015-02-27 12:09:22 +01:00
Fez Vrasta
694bbf233c Merge pull request #460 from MatrixZ/selectbox-border
fixes #458
2015-02-27 10:06:14 +01:00
Fez Vrasta
84f0e8c89c Merge pull request #444 from timhovius/alert-text-color
Alert text color fix
2015-02-27 09:57:36 +01:00
MatrixZ
c462efc27e fixes #458 2015-02-27 14:22:34 +05:30
Fez Vrasta
9ff02834d7 Merge pull request #459 from FezVrasta/master
updated ghpages
2015-02-27 09:39:00 +01:00
Tim Hovius
da6dd83f40 Alert text color fix 2015-02-23 09:39:08 +01:00
Fez Vrasta
5dd480e408 Merge pull request #421 from joplaal/master
Empty check checkValidity null protection
2015-02-18 15:07:10 +01:00
jplanells
dc9a327a3a Empty check checkValidity null protection
Useful when used against contenteditable divs to avoid exceptions
2015-02-18 13:45:25 +01:00
FezVrasta
71d10163f6 Merge remote-tracking branch 'originssh/master' 2015-02-18 11:22:12 +01:00
FezVrasta
129d099749 fixed #435 2015-02-18 11:22:03 +01:00
Fez Vrasta
6d4e67a5c1 Merge pull request #402 from pglibay/master
Edit typo on CONTRIBUTING.md
2015-02-12 19:08:36 +01:00
Fez Vrasta
a3d9889ea1 Merge pull request #422 from phillc/master
Change togglebutton's first-child to first-of-type
2015-02-12 19:06:51 +01:00
Fez Vrasta
a15296fc53 Merge pull request #426 from coliff/patch-1
Update bootstrap-elements.html
2015-02-12 19:06:31 +01:00
Fez Vrasta
5eab76465b Merge pull request #427 from coliff/patch-2
Update index.html
2015-02-12 19:06:22 +01:00
Fez Vrasta
dd58a44bf5 Merge pull request #428 from coliff/patch-3
Update test.html
2015-02-12 19:06:07 +01:00
Christian
f2c8010ce7 Update test.html
Update CDN links to latest version of Bootstrap (3.3.2)
2015-02-12 18:25:27 +09:00
Christian
1153462063 Update index.html
Update CDN link to latest version of Bootstrap (3.3.2).
2015-02-12 18:23:59 +09:00
Christian
83bd41af67 Update bootstrap-elements.html
Update to latest version of Bootstrap (3.3.2).
2015-02-12 18:22:43 +09:00
FezVrasta
842f4c9c21 Merge remote-tracking branch 'origin/gh-pages' into gh-pages 2015-02-11 17:10:15 +01:00
FezVrasta
5e6f593ccb Merge remote-tracking branch 'originssh/master' 2015-02-11 17:03:53 +01:00
FezVrasta
01b2b75280 added carbon ad 2015-02-11 17:03:18 +01:00
phillc
a4a7911193 Change togglebutton's first-child to first-of-type 2015-02-10 19:57:50 -05:00
Phillip Glenn Libay
e4aef92670 Edit typo on CONTRIBUTING.md 2015-02-02 14:15:09 +08:00