Commit Graph

301 Commits

Author SHA1 Message Date
Fez Vrasta
3b281b1ac5 Merge pull request #109 from jorjordandan/develop
Change fonts, button radius, and btn-fab style to match google guides.
2014-10-11 09:02:25 +02:00
Jordan Davis
1e6716650a change font, buttons, fab style to match google guides 2014-10-10 23:34:29 -07:00
Jordan Davis
eb116a89b6 change font to Roboto, change border radius and fab style to reflect google guidelines 2014-10-10 23:22:15 -07:00
shockwork
16af0a6f76 fixes #106 - also fixes the jshint errors from prior commit 2014-10-10 10:34:36 +02:00
FezVrasta
6416d7c6c0 added ghat badge 2014-10-10 09:55:06 +02:00
shockwork
c4336133d9 fixes #94 - ripple background color 2014-10-10 00:48:13 +02:00
FezVrasta
9a1de8d3e4 improved support for Meteor.js (#103) 2014-10-08 14:52:08 +02:00
FezVrasta
7f0ce5cbd7 updated contributing 2014-10-08 08:59:20 +02:00
Fez Vrasta
6715a6ff23 Merge pull request #100 from aegoroff/master
Material fonts folder can be adjusted using varialbe
2014-10-08 08:57:04 +02:00
Fez Vrasta
0050e2a447 Merge pull request #101 from liliakai/patch-1
Fix typos in README.md
2014-10-08 08:55:19 +02:00
FezVrasta
4448deed16 ripples.js is now part of the core 2014-10-08 08:41:42 +02:00
liliakai
c907af3c8c Update README.md 2014-10-07 15:09:42 -07:00
liliakai
9760c5b0f9 Update README.md 2014-10-07 15:08:27 -07:00
egoroff
2886370422 Material fonts folder can be adjusted using varialbe 2014-10-08 00:52:32 +04:00
FezVrasta
6d7ab733ce organized some icons 2014-10-07 10:06:14 +02:00
Shockwork
eda62e83ca Merge pull request #96 from izifortune/default-sass
added support for !default for the sass variables
2014-10-06 19:19:41 +02:00
Fabrizio Fortunato
fb9d89ef91 added support for !default for the sass variables 2014-10-06 18:14:27 +02:00
Fez Vrasta
9038ce4615 Merge pull request #95 from nelsonomuto/master
Updating Readme docs with developer section and build status icon
2014-10-06 17:08:05 +02:00
Nelson Omuto
440d76baa0 Merge branch 'master' of github.com:FezVrasta/bootstrap-material-design 2014-10-06 10:51:42 -04:00
Nelson Omuto
5d4bda249b fixes #90, adding documentation to clarify development workflow to readme 2014-10-06 10:49:22 -04:00
Nelson Omuto
517cfcd28b fixes #81 adding build status emblem to readme 2014-10-06 10:41:44 -04:00
FezVrasta
db43be835e added some focus effect on some buttons 2014-10-06 16:09:25 +02:00
FezVrasta
c5810dce33 fix for #42 2014-10-06 10:07:58 +02:00
FezVrasta
af4551eaa9 Merge remote-tracking branch 'origin/master' 2014-10-06 09:53:28 +02:00
FezVrasta
6a7368788a grunt 2014-10-06 09:52:51 +02:00
FezVrasta
98f86feb4f Merge remote-tracking branch 'origin/develop'
Conflicts:
	dist/css/material-wfont.min.css
	dist/css/material.min.css
	template/material/css/material-wfont.min.css
	template/material/css/material.min.css
2014-10-06 09:52:19 +02:00
FezVrasta
0e1e46abda fix #88 2014-10-06 09:50:09 +02:00
Fez Vrasta
91ee36ec0f Merge pull request #91 from icyflame/patch-2
Added links and fixed grammar
2014-10-06 09:31:58 +02:00
Siddharth Kannan
48a202283e Added links and fixed grammar
Added link to the Google Material Design Guideline document.

Fixed the Grammar of the first few lines in the README.md file.
2014-10-06 12:50:25 +05:30
FezVrasta
cc408f951b grunt less 2014-10-06 09:11:51 +02:00
Fez Vrasta
9534338b59 Merge pull request #86 from pmarti/master
Use roboto condensed, not roboto
2014-10-06 09:05:02 +02:00
Fez Vrasta
a720200ab4 Merge pull request #89 from dandv/patch-2
Fix *all* typos and improve the English description
2014-10-06 09:03:24 +02:00
Dan Dascalescu
abf6929984 Fix *all* typos and improve the English description 2014-10-05 21:12:05 -07:00
Pablo Marti
919cb6ccab Use roboto condensed, not roboto
We're @import'ing Roboto Condensed but using plain Roboto
in our font-face declarations.
2014-10-06 09:57:00 +07:00
Nelson Omuto
2dfda6e6ba Merge remote-tracking branch 'upstream/master' 2014-10-05 17:29:13 -04:00
Nelson Omuto
ce05c8d985 jshint double-quotes error 2014-10-05 17:27:50 -04:00
FezVrasta
926f89ef22 new checkbox style, fix #53 TODO: fix ripple 2014-10-05 17:37:10 +02:00
FezVrasta
a2f7afb8be fixed version 2014-10-05 12:13:46 +02:00
shockwork
d3fa14516c Merge branch 'develop' 2014-10-05 11:30:45 +02:00
shockwork
3b14c47d5e Merge branch 'develop' of https://github.com/FezVrasta/bootstrap-material-design into develop 2014-10-05 11:28:22 +02:00
shockwork
e5aa3da98e jshint no longer checks *.min.js, pre master merge 2014-10-05 11:26:50 +02:00
FezVrasta
8c8b620e39 added ignore files list 2014-10-05 11:22:39 +02:00
FezVrasta
bb96ae26f0 added multiple main files 2014-10-05 11:13:09 +02:00
FezVrasta
ceff715ff0 support for editorconfig 2014-10-05 10:20:47 +02:00
FezVrasta
dc1cecdb23 refactor of example template to reflect dist changes 2014-10-05 09:41:29 +02:00
FezVrasta
5eafbe1a70 refactor of the dist files 2014-10-05 09:32:48 +02:00
FezVrasta
004d5ad20a fixed quotes 2014-10-05 09:00:13 +02:00
FezVrasta
30d93841c8 fixed quotes 2014-10-05 08:57:23 +02:00
FezVrasta
04168b27a5 Merge remote-tracking branch 'nelsonomuto/master' into develop 2014-10-05 08:55:39 +02:00
Nelson Omuto
6c24c30222 fixes #81: integrating with Travis CI 2014-10-04 20:16:13 -04:00