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 |
|
FezVrasta
|
f7b7c0f3da
|
disabled test
|
2014-10-17 09:58:15 +02:00 |
|
FezVrasta
|
e5d3490987
|
disabled test
|
2014-10-17 09:56:05 +02:00 |
|
FezVrasta
|
0d3f4df6f3
|
updated licensed companies
|
2014-10-16 09:34:41 +02:00 |
|
FezVrasta
|
fa96a2249b
|
updated licensed companies' list
|
2014-10-16 09:31:50 +02:00 |
|
Fez Vrasta
|
091562d7ee
|
Merge pull request #113 from npvn/card
Add styling for cards (first draft)
|
2014-10-15 12:13:03 +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
|
8835848f68
|
Trying to fix issue with ripple effect on card image
|
2014-10-13 16:58:48 +07:00 |
|
Phuc Nguyen
|
1b5be39cc9
|
Adjust border radius to 2px
|
2014-10-13 16:51:37 +07:00 |
|
Fez Vrasta
|
e15723b46b
|
Merge pull request #118 from npvn/dialog
Improve styling for dialogs
|
2014-10-13 11:02:47 +02:00 |
|
FezVrasta
|
eeb7cceead
|
added support for mobile devices to ripples.js
|
2014-10-13 10:50:34 +02: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 |
|
FezVrasta
|
d9722a936c
|
improved ripples.js
|
2014-10-13 09:43:23 +02:00 |
|
Fez Vrasta
|
9368546e7c
|
Merge pull request #114 from npvn/button
Improve button styles
|
2014-10-13 09:22:14 +02: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 |
|
Fez Vrasta
|
6a4db9412a
|
Merge pull request #112 from npvn/develop
Add null check for $ripple
|
2014-10-12 11:42:49 +02:00 |
|
Phuc Nguyen
|
4eef5af020
|
Add null check for $ripple
|
2014-10-12 15:42:56 +07:00 |
|
Fez Vrasta
|
3b281b1ac5
|
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
|
1e6716650a
|
change font, buttons, fab style to match google guides
|
2014-10-10 23:34:29 -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
|
6416d7c6c0
|
added ghat badge
|
2014-10-10 09:55:06 +02:00 |
|
shockwork
|
c4336133d9
|
fixes #94 - ripple background color
|
2014-10-10 00:48:13 +02:00 |
|
FezVrasta
|
9a1de8d3e4
|
improved support for Meteor.js (#103)
|
2014-10-08 14:52:08 +02:00 |
|
FezVrasta
|
7f0ce5cbd7
|
updated contributing
|
2014-10-08 08:59:20 +02:00 |
|
Fez Vrasta
|
6715a6ff23
|
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
|
0050e2a447
|
Merge pull request #101 from liliakai/patch-1
Fix typos in README.md
|
2014-10-08 08:55:19 +02:00 |
|
FezVrasta
|
4448deed16
|
ripples.js is now part of the core
|
2014-10-08 08:41:42 +02:00 |
|
liliakai
|
c907af3c8c
|
Update README.md
|
2014-10-07 15:09:42 -07:00 |
|
liliakai
|
9760c5b0f9
|
Update README.md
|
2014-10-07 15:08:27 -07:00 |
|
egoroff
|
2886370422
|
Material fonts folder can be adjusted using varialbe
|
2014-10-08 00:52:32 +04:00 |
|
FezVrasta
|
6d7ab733ce
|
organized some icons
|
2014-10-07 10:06:14 +02:00 |
|
Shockwork
|
eda62e83ca
|
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
|
fb9d89ef91
|
added support for !default for the sass variables
|
2014-10-06 18:14:27 +02:00 |
|
Fez Vrasta
|
9038ce4615
|
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
|
440d76baa0
|
Merge branch 'master' of github.com:FezVrasta/bootstrap-material-design
|
2014-10-06 10:51:42 -04:00 |
|
Nelson Omuto
|
5d4bda249b
|
fixes #90, adding documentation to clarify development workflow to readme
|
2014-10-06 10:49:22 -04:00 |
|
Nelson Omuto
|
517cfcd28b
|
fixes #81 adding build status emblem to readme
|
2014-10-06 10:41:44 -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
|
af4551eaa9
|
Merge remote-tracking branch 'origin/master'
|
2014-10-06 09:53:28 +02:00 |
|
FezVrasta
|
6a7368788a
|
grunt
|
2014-10-06 09:52:51 +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 |
|
FezVrasta
|
0e1e46abda
|
fix #88
|
2014-10-06 09:50:09 +02:00 |
|
Fez Vrasta
|
91ee36ec0f
|
Merge pull request #91 from icyflame/patch-2
Added links and fixed grammar
|
2014-10-06 09:31:58 +02:00 |
|
Siddharth Kannan
|
48a202283e
|
Added links and fixed grammar
Added link to the Google Material Design Guideline document.
Fixed the Grammar of the first few lines in the README.md file.
|
2014-10-06 12:50:25 +05:30 |
|
FezVrasta
|
cc408f951b
|
grunt less
|
2014-10-06 09:11:51 +02:00 |
|