Commit Graph

375 Commits

Author SHA1 Message Date
FezVrasta
dbbf4e7bd2 Merge remote-tracking branch 'origin/master'
Conflicts:
	bower.json
	package.json
2014-10-18 15:20:14 +02:00
FezVrasta
548683eb27 Merge branch 'develop'
Conflicts:
	bower.json
2014-10-18 15:18:22 +02:00
FezVrasta
073f830246 old icons replaced with official ones, NO BACKWARD COMPATIBILITY! 2014-10-18 15:14:24 +02:00
FezVrasta
69d1affad0 updated verison number 2014-10-17 13:23:24 +02:00
FezVrasta
3a92b3b471 Merge branch 'develop'
Conflicts:
	dist/css/material-wfont.css
	dist/css/material-wfont.min.css
	dist/css/material.css
	dist/css/material.min.css
	less/material.less
	template/material/css/material-wfont.css
	template/material/css/material-wfont.min.css
	template/material/css/material.css
	template/material/css/material.min.css
2014-10-17 13:00:13 +02:00
FezVrasta
ecae6e9629 restyle of dropdown menu 2014-10-17 12:48:38 +02:00
FezVrasta
497f09546e disabled test 2014-10-17 09:58:15 +02:00
FezVrasta
0ab8189e3f disabled test 2014-10-17 09:56:05 +02:00
FezVrasta
bb0c2cb1cc updated licensed companies 2014-10-16 09:34:41 +02:00
FezVrasta
6ec026fe91 updated licensed companies' list 2014-10-16 09:31:50 +02:00
Fez Vrasta
6ddd300bcf Merge pull request #113 from npvn/card
Add styling for cards (first draft)
2014-10-15 12:13:03 +02:00
Phuc Nguyen
140347a464 Merge upstream/develop into card 2014-10-13 18:01:22 +07:00
Phuc Nguyen
2401f11ac5 Fix issue with ripple effect on card image 2014-10-13 17:53:55 +07:00
Phuc Nguyen
a01c08ad84 Trying to fix issue with ripple effect on card image 2014-10-13 16:58:48 +07:00
Phuc Nguyen
9b8404ab8d Adjust border radius to 2px 2014-10-13 16:51:37 +07:00
Fez Vrasta
f795d250a6 Merge pull request #118 from npvn/dialog
Improve styling for dialogs
2014-10-13 11:02:47 +02:00
FezVrasta
2a610b1cfe added support for mobile devices to ripples.js 2014-10-13 10:50:34 +02:00
Phuc Nguyen
a45d1a982b Improve styling for dialogs
- More padding
- Deeper shadow
- Add rounded corners
- A pull-left flat button can be added
2014-10-13 15:12:05 +07:00
FezVrasta
7af50af643 improved ripples.js 2014-10-13 09:43:23 +02:00
Fez Vrasta
b9349a551e Merge pull request #114 from npvn/button
Improve button styles
2014-10-13 09:22:14 +02:00
Phuc Nguyen
b756497000 Improve button styles
- Reorganize styles
 - Add colors for flat buttons
 - Add style for disabled buttons
 - Other minor improvements
2014-10-12 20:46:56 +07:00
Phuc Nguyen
881513c029 Add styling for cards (first draft) 2014-10-12 17:28:11 +07:00
Fez Vrasta
650385d619 Merge pull request #112 from npvn/develop
Add null check for $ripple
2014-10-12 11:42:49 +02:00
Phuc Nguyen
dc62c72de3 Add null check for $ripple 2014-10-12 15:42:56 +07:00
Fez Vrasta
139a9e4e71 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
fb895789fe change font, buttons, fab style to match google guides 2014-10-10 23:34:29 -07:00
Jordan Davis
a1552e592f change font to Roboto, change border radius and fab style to reflect google guidelines 2014-10-10 23:22:15 -07:00
shockwork
958e4a827c fixes #106 - also fixes the jshint errors from prior commit 2014-10-10 10:34:36 +02:00
FezVrasta
396e386d2e added ghat badge 2014-10-10 09:55:06 +02:00
shockwork
2450dbdc78 fixes #94 - ripple background color 2014-10-10 00:48:13 +02:00
FezVrasta
085590ea67 improved support for Meteor.js (#103) 2014-10-08 14:52:08 +02:00
FezVrasta
eff2ccb266 updated contributing 2014-10-08 08:59:20 +02:00
Fez Vrasta
db25ecd607 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
45f44f7adc Merge pull request #101 from liliakai/patch-1
Fix typos in README.md
2014-10-08 08:55:19 +02:00
FezVrasta
12c74401aa ripples.js is now part of the core 2014-10-08 08:41:42 +02:00
liliakai
b504d13d5b Update README.md 2014-10-07 15:09:42 -07:00
liliakai
280debb376 Update README.md 2014-10-07 15:08:27 -07:00
egoroff
a55a81795a Material fonts folder can be adjusted using varialbe 2014-10-08 00:52:32 +04:00
FezVrasta
84c953a1ee organized some icons 2014-10-07 10:06:14 +02:00
Shockwork
fea7818300 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
e9bce78641 added support for !default for the sass variables 2014-10-06 18:14:27 +02:00
Fez Vrasta
2e62a8b297 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
4c845b1d14 Merge branch 'master' of github.com:FezVrasta/bootstrap-material-design 2014-10-06 10:51:42 -04:00
Nelson Omuto
f61f951508 fixes #90, adding documentation to clarify development workflow to readme 2014-10-06 10:49:22 -04:00
Nelson Omuto
40d5bb8155 fixes #81 adding build status emblem to readme 2014-10-06 10:41:44 -04:00
FezVrasta
53ff7c3073 added some focus effect on some buttons 2014-10-06 16:09:25 +02:00
FezVrasta
a54e9ca7e6 fix for #42 2014-10-06 10:07:58 +02:00
FezVrasta
5c0b558ec8 Merge remote-tracking branch 'origin/master' 2014-10-06 09:53:28 +02:00
FezVrasta
1969ccb329 grunt 2014-10-06 09:52:51 +02:00
FezVrasta
d35be71523 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