Commit Graph

89 Commits

Author SHA1 Message Date
FezVrasta
8c40b4cb2f Merge branch 'develop'
Conflicts:
	Gruntfile.js
	dist/js/material.min.js
	dist/js/ripples.min.js
	less/_buttons.less
	template/material/js/material.min.js
	template/material/js/ripples.min.js
2014-10-28 11:45:38 +01:00
FezVrasta
93e8a87722 fix selectize 2014-10-28 11:34:39 +01:00
FezVrasta
b38df236fa fix for #139 2014-10-28 10:16:47 +01:00
FezVrasta
e0fefd2b3c fix #140 2014-10-28 10:12:49 +01:00
FezVrasta
a9d6b5fbb9 fixed #145 2014-10-28 09:40:58 +01:00
FezVrasta
94bf1a0871 fix for #150 2014-10-28 09:10:40 +01:00
FezVrasta
9b6792bb59 fixed #131 2014-10-19 20:11:31 +02:00
FezVrasta
7d6f817301 fix for #110 2014-10-18 16:19:08 +02:00
FezVrasta
ec97fa0022 removed .import extension from styles 2014-10-18 16:17:31 +02:00
FezVrasta
656cec3044 Merge remote-tracking branch 'origin/master'
Conflicts:
	bower.json
	package.json
2014-10-18 15:20:14 +02:00
FezVrasta
7cea1f36ef Merge branch 'develop'
Conflicts:
	bower.json
2014-10-18 15:18:22 +02:00
FezVrasta
0073d644f8 old icons replaced with official ones, NO BACKWARD COMPATIBILITY! 2014-10-18 15:14:24 +02:00
FezVrasta
ba19ed4627 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
ec78f00d18 restyle of dropdown menu 2014-10-17 12:48:38 +02:00
Phuc Nguyen
ebdf2f0c3f Merge upstream/develop into card 2014-10-13 18:01:22 +07:00
Phuc Nguyen
cce1969521 Fix issue with ripple effect on card image 2014-10-13 17:53:55 +07:00
Phuc Nguyen
1b5be39cc9 Adjust border radius to 2px 2014-10-13 16:51:37 +07:00
Phuc Nguyen
3979088759 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
Phuc Nguyen
b8b6a86247 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
1a80e1b083 Add styling for cards (first draft) 2014-10-12 17:28:11 +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
9a1de8d3e4 improved support for Meteor.js (#103) 2014-10-08 14:52:08 +02:00
egoroff
2886370422 Material fonts folder can be adjusted using varialbe 2014-10-08 00:52:32 +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
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
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
FezVrasta
926f89ef22 new checkbox style, fix #53 TODO: fix ripple 2014-10-05 17:37:10 +02:00
FezVrasta
5eafbe1a70 refactor of the dist files 2014-10-05 09:32:48 +02:00
Nelson Omuto
9de6322bf1 fixed livereload, using default 35729 port 2014-10-03 16:58:06 -04:00
Nelson Omuto
5249da3197 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
FezVrasta
3d259ddc6a added support for selectize.js 2014-10-03 15:15:42 +02:00
FezVrasta
f397af8796 refactor to follow the way SASS is organized 2014-10-03 15:00:58 +02:00
FezVrasta
4b1f0641fe fix #67 2014-10-03 09:46:24 +02:00
FezVrasta
4e810295b5 security fix 2014-10-02 11:36:05 +02:00
FezVrasta
81447b5a68 Merge remote-tracking branch 'origin/master' 2014-10-01 09:45:26 +02:00
colder
b2eefc97ec make checkbox animate quickly when not hover.
it's not a perfect method. need improve.
by the way. add 'Thumbs.db' and '.DS_Store' to .gitignore.
2014-10-01 13:57:11 +08:00
FezVrasta
7e6e4e4cf0 minor fix on checkboxes animation 2014-09-30 13:57:49 +02:00
FezVrasta
e4dde578ac fix #47 2014-09-30 10:18:38 +02:00
FezVrasta
952660bb36 Merge remote-tracking branch 'origin/master' 2014-09-30 10:08:29 +02:00
FezVrasta
bc58c96dec fixed troubles with "non-click" on browsers different by Chrome, it has still lot of problems... 2014-09-30 10:07:59 +02:00
James Brewer
11a1c45ff7 Navbar text needs more margin to align vertically in navbar. 2014-09-29 16:01:19 -07:00
FezVrasta
d6b15454b2 fixed problem with nouislider... 2014-09-29 10:22:56 +02:00
FezVrasta
19f3118302 fix #33 2014-09-29 10:15:45 +02:00
FezVrasta
72620c20f1 fix for #32 2014-09-29 09:36:47 +02:00
FezVrasta
a6017956ed fix #30 2014-09-29 09:25:10 +02:00
FezVrasta
b04edea0d4 fix for #34 2014-09-29 09:19:20 +02:00
Federico Zivolo
55b6c77b7c last time I touch wells, I promise. 2014-09-23 16:21:01 +02:00
Federico Zivolo
333ab974d2 improved nested wells support 2014-09-23 14:45:24 +02:00