Fez Vrasta
|
83951921ba
|
Merge pull request #158 from studio3104/filenamemismatch
fixed the change of wrong extension
|
2014-10-28 20:14:14 +01:00 |
|
studio3104
|
c2ef56815a
|
fixed the change of wrong extension
|
2014-10-29 03:48:17 +09: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
|
bde4c22659
|
updated version
|
2014-10-28 11:43:37 +01:00 |
|
FezVrasta
|
f7426bc2bd
|
fix selectize
|
2014-10-28 11:34:39 +01:00 |
|
FezVrasta
|
a1d00bb35a
|
fix #134
|
2014-10-28 10:21:00 +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
|
7585f95121
|
fix for #133
|
2014-10-28 08:59:01 +01:00 |
|
FezVrasta
|
07783f3a81
|
related to #148
|
2014-10-28 08:45:33 +01:00 |
|
FezVrasta
|
f78ff5e33e
|
fixed #131
|
2014-10-19 20:11:31 +02:00 |
|
FezVrasta
|
00014d51d3
|
updated doc
|
2014-10-19 19:49:34 +02:00 |
|
FezVrasta
|
a8eafcaaa0
|
re-implemented arrive.js
|
2014-10-19 19:38:31 +02:00 |
|
FezVrasta
|
c26d5e3ce1
|
refactor of Material.js
|
2014-10-18 18:12:02 +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
|
8f957ff9b1
|
fixed behavior of floating labels
|
2014-10-18 16:05:05 +02:00 |
|
FezVrasta
|
2dfcc2d21f
|
Fix by @mikenovikov for #129
|
2014-10-18 15:45:04 +02:00 |
|
FezVrasta
|
a41c20067b
|
Merge branch 'develop'
|
2014-10-18 15:36:07 +02:00 |
|
FezVrasta
|
09e9532404
|
updates to index
|
2014-10-18 15:32:30 +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
|
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 |
|