Commit Graph

199 Commits

Author SHA1 Message Date
Ian Serlin
f955393f13 allows .btn* classes to be specified in any order and still receive proper hover state colors 2015-01-02 15:04:01 -08:00
Edmond Lau
5211de142a the default button doesn't get the right font color 2014-12-26 18:00:36 -05:00
Edmond Lau
a289ee8147 fixed a bracket typo bug in _buttons 2014-12-26 18:00:18 -05:00
FezVrasta
379ea620f3 Merge remote-tracking branch 'origin/master' 2014-12-26 19:12:48 +01:00
FezVrasta
cc1a0b67cd Merge branch 'korgan00#master'
Conflicts:
	index.html
2014-12-26 18:43:31 +01:00
FezVrasta
0095f43c22 merging material colors 2014-12-26 18:42:06 +01:00
phoeagon
0e2aa4b823 Floating Action Button should float higher than Raised Button (See http://www.google.com/design/spec/what-is-material/objects-in-3d-space.html#objects-in-3d-space-elevation) 2014-12-26 13:03:07 +08:00
Korgan
9b605fee49 explanation added 2014-12-19 20:22:11 +01:00
Korgan
e5c656d694 placeholder working correctly 2014-12-19 20:13:22 +01:00
Korgan
32490815e6 fix and added 'inverse' color 2014-12-19 19:33:21 +01:00
Korgan
52dbc8d1f6 new generic mixin 2014-12-19 19:32:44 +01:00
FezVrasta
595a08ae66 fix for #294 2014-12-18 13:59:34 +01:00
FezVrasta
28d37f40ae fix for #258 2014-12-18 10:54:36 +01:00
FezVrasta
9d72a971e4 btn-raised have a subtler shadow 2014-12-16 11:13:49 +01:00
FezVrasta
0c12c1fc85 Merge branch 'korgan00#material-colors-implementation'
Conflicts:
	dist/css/ripples.css
	dist/css/ripples.css.map
	dist/css/ripples.min.css
	dist/css/ripples.min.css.map
	less/_colors.less
2014-12-13 12:36:26 +01:00
FezVrasta
381b972f1c fixed active and disabled elements of navbar 2014-12-13 12:32:27 +01:00
FezVrasta
cb2472f5cf some improvement on navbars 2014-12-13 12:26:25 +01:00
FezVrasta
7882fddb29 ripples are now subtler 2014-12-10 20:36:31 +01:00
Korgan
f1bac0b4b9 All colors mixed 2014-12-06 02:45:14 +01:00
FezVrasta
e13ed0f9ab main colors now refer the proper variable 2014-12-05 09:53:20 +01:00
Korgan
28c0728c35 material colors aproximation 2014-12-05 03:35:32 +01:00
FezVrasta
52e073a3c5 ensure new line at end of compiled files 2014-12-04 14:00:01 +01:00
FezVrasta
e6e2712ed0 now Roboto is loaded from system if present (discussion at #260) 2014-12-04 12:06:03 +01:00
FezVrasta
d5aeba4ecf fixed list of material colors 2014-12-04 11:19:42 +01:00
FezVrasta
27b6af7126 added updated list of material colors 2014-12-04 11:18:08 +01:00
FezVrasta
f2212e157e fixed #262 2014-12-04 10:42:54 +01:00
FezVrasta
74f2c5fddb fixed well - part 2... 2014-12-03 12:18:34 +01:00
FezVrasta
1b9dc6ac82 fixed well 2014-12-03 12:17:01 +01:00
FezVrasta
c0281c21cd fixed modal backdrop 2014-12-03 10:30:08 +01:00
FezVrasta
84544a4ca1 fixed border on tap 2014-12-03 10:05:07 +01:00
FezVrasta
4224c5cfc2 fixed #255 2014-12-02 09:15:18 +01:00
FezVrasta
4903016acc fixed #253 2014-12-02 09:05:46 +01:00
FezVrasta
e1349c01d0 new demo page landed and added material-blue to colors 2014-12-01 15:43:41 +01:00
FezVrasta
d304f232bb improved dropdown.js support 2014-12-01 15:07:55 +01:00
FezVrasta
a72b62b2d0 updated primary color according to default color of the specs 2014-12-01 13:58:52 +01:00
FezVrasta
2f21ce5be3 fixed some toggle button behavior 2014-12-01 13:45:11 +01:00
FezVrasta
84ff0247c6 implemented toggle buttons #248 2014-12-01 13:29:34 +01:00
FezVrasta
d1c75c7321 fixed #244 and #239 2014-12-01 11:59:48 +01:00
FezVrasta
f7e1e44e64 improved mobile compatibility 2014-11-28 09:35:17 +01:00
FezVrasta
ae6381cc02 fixed opacity of ripples and added xbrowser compatibility 2014-11-27 09:47:55 +01:00
FezVrasta
8e5ed52d39 @davideschiera fixed #237 2014-11-27 09:45:54 +01:00
FezVrasta
3879ccb08f fixed #222 and changed indenting to 2 2014-11-26 13:04:13 +01:00
FezVrasta
432e5c6b0a fixed #204 2014-11-26 12:53:20 +01:00
FezVrasta
fc0fed6eab Ripples.js rewritten with jQuery + added JS maps 2014-11-26 12:42:41 +01:00
FezVrasta
ad6365bd0d fix #216 2014-11-26 10:25:05 +01:00
FezVrasta
ab447fb5ce styled panels, improved shadows 2014-11-12 16:46:52 +01:00
FezVrasta
305b4ea378 added support for hints under inputs on focus 2014-11-12 13:22:17 +01:00
FezVrasta
3bad268ab5 fixes for #182 and #41 2014-11-12 12:22:00 +01:00
FezVrasta
6442241285 fix for #154 2014-11-12 11:51:00 +01:00
Marcin Antczak
21890397c6 Fix navbar-inverse background hard coded to indigo 2014-11-10 14:47:19 +01:00
FezVrasta
0c6f8f3e9d Merge branch 'develop'
Conflicts:
	README.md
	bower.json
	dist/css/material-wfont.css
	dist/css/material.css
	dist/js/material.js
	dist/js/material.min.js
	dist/js/ripples.js
	package.json
	sass/_animations.scss
2014-10-31 09:59:31 +01:00
FezVrasta
9299bda187 fix #125 2014-10-31 09:55:14 +01:00
FezVrasta
fe27e7e67a fixes #142 2014-10-31 09:40:37 +01:00
FezVrasta
d6c73f5c68 removed references of the old less compiler 2014-10-31 09:27:35 +01:00
FezVrasta
931d61f248 remove unused files 2014-10-31 09:26:54 +01:00
Rougin Gutib
57b9a8cb74 Removed "margin-top: 13px" to properly align "navbar-toggle" with "navbar-brand" 2014-10-31 13:47:20 +08:00
FezVrasta
1d180d63c4 fix for #64 2014-10-30 09:54:50 +01:00
FezVrasta
6e4bb11198 fix for #127 2014-10-30 09:49:56 +01:00
FezVrasta
c127e50fd2 fixed checkbox ripple 2014-10-30 09:34:53 +01:00
FezVrasta
1af660e5d3 changed default color for inputs 2014-10-30 09:23:54 +01:00
FezVrasta
f345dabacf 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
f7426bc2bd fix selectize 2014-10-28 11:34:39 +01:00
FezVrasta
2183188d1e fix for #139 2014-10-28 10:16:47 +01:00
FezVrasta
cdf9ebdb18 fix #140 2014-10-28 10:12:49 +01:00
FezVrasta
cb8389595f fixed #145 2014-10-28 09:40:58 +01:00
FezVrasta
e1998ebf32 fix for #150 2014-10-28 09:10:40 +01:00
FezVrasta
f78ff5e33e fixed #131 2014-10-19 20:11:31 +02:00
FezVrasta
5535e56ec0 fix for #110 2014-10-18 16:19:08 +02:00
FezVrasta
2c66ff3770 removed .import extension from styles 2014-10-18 16:17:31 +02:00
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
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
9b8404ab8d Adjust border radius to 2px 2014-10-13 16:51:37 +07: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
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
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
085590ea67 improved support for Meteor.js (#103) 2014-10-08 14:52:08 +02:00
egoroff
a55a81795a Material fonts folder can be adjusted using varialbe 2014-10-08 00:52:32 +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
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
Pablo Marti
981a517b9a 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
640027abe3 new checkbox style, fix #53 TODO: fix ripple 2014-10-05 17:37:10 +02:00
FezVrasta
41c94a218a refactor of the dist files 2014-10-05 09:32:48 +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
FezVrasta
351aded5ba added support for selectize.js 2014-10-03 15:15:42 +02:00
FezVrasta
9b54709ade refactor to follow the way SASS is organized 2014-10-03 15:00:58 +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
FezVrasta
4d9bda3d66 Merge remote-tracking branch 'origin/master' 2014-10-01 09:45:26 +02:00
colder
7a6aaec9f2 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
e4ad7d750e minor fix on checkboxes animation 2014-09-30 13:57:49 +02:00
FezVrasta
176022b793 fix #47 2014-09-30 10:18:38 +02:00