mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2024-11-26 11:34:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	bower.json
	package.json
This commit is contained in:
FezVrasta 2014-10-18 15:20:14 +02:00
commit dbbf4e7bd2
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -9,3 +9,7 @@ It already includes every needed dependency and is based on the latest version o
## Grunt ## Grunt
**Grunt!** Ok... when you edit something please run `grunt` to compile CSS and copy stuff in the correct folders. Thanks! **Grunt!** Ok... when you edit something please run `grunt` to compile CSS and copy stuff in the correct folders. Thanks!
## Before send a Pull Request
We are developing in the `develop` branch, please send any PR to this branch.

24
README.md
View File

@ -1,11 +1,14 @@
[![build status](https://travis-ci.org/FezVrasta/bootstrap-material-design.svg?branch=master)](https://travis-ci.org/FezVrasta/bootstrap-material-design)
[![ghat status](http://mywebexpression.com:3001/status/initial/badge.png)](http://mywebexpression.com:3001/) (click to chat)
[![banner](demo/imgs/banner.jpg)](#) [![banner](demo/imgs/banner.jpg)](#)
This Bootstrap theme is an easy way to use the new Material Design guidelines by Google in your Bootstrap 3 based application. This Bootstrap theme is an easy way to use the new [Material Design guidelines by Google](http://www.google.com/design/spec/material-design/introduction.html) in your Bootstrap 3 based application.
Just include the theme right after the Bootstrap CSS and include the javascript at the end of your document, everything will be converted to Material Design (paper) style. Just include the theme, after the Bootstrap CSS and include the javascript at the end of your document (Just before the end of the `<body>` tag), and everything will be converted to Material Design (paper) style.
This theme is in early development and is not ready for production. **Note:**This theme is in early development and is not ready for production.
Check out [the demo at this link](http://fezvrasta.github.io/bootstrap-material-design/) (could be not even with the master branch). Check out [the demo at this link](http://fezvrasta.github.io/bootstrap-material-design/) (This demo may not be even with the master branch.)
## How to install ## How to install
@ -25,6 +28,17 @@ so this might not be true before the first stable release.
Navigate to the `template/` folder in this repository, and you will see the `index.html` file, which has the CSS include statements, in the `head` section and the JS includes just before `body` section closes. Navigate to the `template/` folder in this repository, and you will see the `index.html` file, which has the CSS include statements, in the `head` section and the JS includes just before `body` section closes.
You need to copy the `material/` folder to the root of your project, ensuring that all the files in your project can access the files through the relative URL, supplied in the CSS and the JS includes. You need to copy the `material/` folder to the root of your project, ensuring that all the files in your project can access the files through the relative URL, supplied in the CSS and the JS includes.
## Development
We are using grunt to automate the workflow and build process. Ensure you have nodejs installed and grunt-cli installed globally.
After cloning the repo, run `npm install` to ensure you have all dev dependencies.
Run the `grunt build` command to run the tests and compile the less/sass. See Gruntfile.js for details on targets.
Run the `grunt test` command for browser based jasmine unit tests.
Run the `grunt serve` command to build and fire up a http server with live-reload and a watch for development purposes.
## Todo ## Todo
- Morphing icons - Morphing icons
@ -116,7 +130,7 @@ Read more about [noUiSlider here](http://refreshless.com/nouislider/)
### Selectize.js ### Selectize.js
Transform select and multi select inputs in advanced text inputs. Material Design for BS provides a fulle replacement of the plugin's CSS, don't include it so. Transform select and multi select inputs in advanced text inputs. Material Design for BS provides a full replacement of the plugin's CSS, so don't include it.
Read more about [selectize.js](http://brianreavis.github.io/selectize.js/) Read more about [selectize.js](http://brianreavis.github.io/selectize.js/)

6
index.html
View File

@ -56,9 +56,9 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="well infobox"> <div class="well infobox">
<p>Material Design for Bootstrap is a theme for Bootstrap 3 which let you use the new Google Material Design in your favourite front-end framework.</p> <p><em>Material Design for Bootstrap</em> is a theme for Bootstrap 3 which lets you use the new <a href="http://www.google.com/design/spec/material-design/">Google Material Design</a> in your favorite front-end framework.</p>
<p>If you like this project you may support me donating something on Gittip, starring this repository or reporting bugs and ideas in the issue section.</p> <p>If you like this project you can support me by donating something on Gittip, starring this repository, or <a href="https://github.com/FezVrasta/bootstrap-material-design/issues">reporting bugs and ideas</a>.</p>
<p>Read more about Material Design for Bootstrap <a href="https://github.com/FezVrasta/bootstrap-material-design">visiting the Github page</a>.</p> <p>Read more about <em>Material Design for Bootstrap</em> <a href="https://github.com/FezVrasta/bootstrap-material-design">at the Github page</a>.</p>
<a href="https://github.com/FezVrasta/bootstrap-material-design/archive/master.zip" class="btn btn-sup btn-material-pink btn-raised"> <a href="https://github.com/FezVrasta/bootstrap-material-design/archive/master.zip" class="btn btn-sup btn-material-pink btn-raised">
<img src="demo/imgs/download.png" alt="gittip" height=30> <img src="demo/imgs/download.png" alt="gittip" height=30>

2
less/material.less
View File

@ -17,6 +17,7 @@ body {
} }
} }
body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 { body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 {
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 300; font-weight: 300;
@ -25,7 +26,6 @@ body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 {
h5, h6{ h5, h6{
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400; font-weight: 400;
} }
// Well and Jumbotrons // Well and Jumbotrons