Commit Graph

38 Commits

Author SHA1 Message Date
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
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
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
Phuc Nguyen
dc62c72de3 Add null check for $ripple 2014-10-12 15:42:56 +07: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
shockwork
2450dbdc78 fixes #94 - ripple background color 2014-10-10 00:48:13 +02: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
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
FezVrasta
56246f96a1 grunt less 2014-10-06 09:11:51 +02:00
FezVrasta
640027abe3 new checkbox style, fix #53 TODO: fix ripple 2014-10-05 17:37:10 +02:00
shockwork
7d56a5a462 jshint no longer checks *.min.js, pre master merge 2014-10-05 11:26:50 +02:00
FezVrasta
4964878091 refactor of example template to reflect dist changes 2014-10-05 09:41:29 +02:00
FezVrasta
41c94a218a refactor of the dist files 2014-10-05 09:32:48 +02:00
FezVrasta
fc4b8f2da2 Merge remote-tracking branch 'nelsonomuto/master' into develop 2014-10-05 08:55:39 +02:00
FezVrasta
d09279fdb0 fix #76 2014-10-04 08:43:25 +02:00
Nelson Omuto
1d2145beb0 fixed livereload, using default 35729 port 2014-10-03 16:58:06 -04:00
Nelson Omuto
720479cb1e reverted jshint rules, cleaned up source where it was failing. updating build process errors. TODO: fix livereload 2014-10-03 16:46:56 -04:00
Nelson Omuto
82aae6fbf0 fixing jshint issues, modifying to allow for some not too strict jshint rules, adding grunt newer dependency. 2014-10-03 16:13:48 -04:00
Nelson Omuto
a71fc7de74 updating grunt with load grunt tasks 2014-10-03 11:13:28 -04:00
FezVrasta
351aded5ba added support for selectize.js 2014-10-03 15:15:42 +02:00
FezVrasta
8f955cb453 fix ripples detection 2014-10-03 13:03:59 +02:00
shockwork
666ec3b040 .. run grunt 2014-10-03 12:54:47 +02:00
FezVrasta
13fa12366a fix #67 2014-10-03 09:46:24 +02:00
FezVrasta
8cc954a887 security fix 2014-10-02 11:36:05 +02:00
icyflame
fd93d74711 Added the template folder.
The index.html file works.

Copying the template folder, or using the structure of this folder, a new project can be started.

This file includes the compiled CSS and the material JS file, alongwith the ripples CSS and JS files.
2014-10-01 12:36:25 +05:30