diff --git a/index.html b/index.html index f748dad2..8b776a27 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,6 @@ -<<<<<<< HEAD Material Design for Bootstrap @@ -120,6 +119,259 @@ #source-modal h4 { color: black; } + .cbwrapper div { + display: none; + } + .cbwrapper div:nth-child(2) { + display: block; + } + #carbonads, #fakecb { + border: 1px solid #d5d5d5; + font-size: 11px; + line-height: 15px; + overflow: hidden; + width: 340px; + padding: 20px; + margin: auto; + height: 142px; + border-radius: 2px; + } + #carbonads .carbon-img { + float: left; + display: block; + } + #carbonads .carbon-text, #carbonads .carbon-poweredby { + float: left; + width: 150px; + padding: 0 10px 10px 10px; + } + #carbonads .carbon-text:hover, #carbonads .carbon-poweredby:hover { + text-decoration: none; + } + #carbonads .carbon-poweredby { + color: #9D9D9D; + } + /**/ + #paypal .btn { padding: 5px 30px 6px 30px; } + #paypal input { background: transparent; border: 0; } + /**/ + .cbwrapper div { + display: none; + } + .cbwrapper div:nth-child(2) { + display: block; + } + #carbonads, #fakecb { + border: 1px solid #d5d5d5; + font-size: 11px; + line-height: 15px; + overflow: hidden; + width: 340px; + padding: 20px; + margin: auto; + height: 142px; + border-radius: 2px; + } + #carbonads .carbon-img { + float: left; + display: block; + } + #carbonads .carbon-text, #carbonads .carbon-poweredby { + float: left; + width: 150px; + padding: 0 10px 10px 10px; + } + #carbonads .carbon-text:hover, #carbonads .carbon-poweredby:hover { + text-decoration: none; + } + #carbonads .carbon-poweredby { + color: #9D9D9D; + } + + /**/ Custom page + #checkbox .sample1 label { + font-weight: bold; + } + #checkbox .hint { + padding-left: 45px; + padding-top: 20px; + font-weight: 400; + } + #checkbox .sample1 { + padding-bottom: 20px; + } + + #checkbox h2 { + font-size: 18.7199993133545px; + font-weight: bold; + margin-bottom: 30px; + } + + #checkbox .sample2 { + width: 300px; + clear: both; + font-weight: 400; + } + + #checkbox .sample2 { + padding: 10px 0; + } + #checkbox .sample2 .text { + display: inline-block; + } + #checkbox .sample2 .checkbox { + float: right; + } + /**/ + #radio-button h2 { + font-size: 18.7199993133545px; + font-weight: bold; + margin-bottom: 30px; + margin-top: 50px; + } + #radio-button .radio { + margin: 20px 10px; + } + /**/ + #toggle-button h2 { + font-size: 18.7199993133545px; + font-weight: bold; + margin-bottom: 30px; + margin-top: 50px; + } + #toggle-button .togglebutton label { + margin: 20px 10px; + width: 200px; + } + #toggle-button .togglebutton .toggle { + float: right; + } + #input h2 { + padding: 14px; + font-size: 16px; + font-weight: 400; + } + #input .inputs { + width: 80%; + } + #input .form-control-wrapper { + margin: 30px 0; + } + #slider .sample1, #slider .sample2 { + padding: 20px 0; + background-color: #f0f0f0; + margin-bottom: 20px; + } + #slider .sample2 { + height: 150px; + } + #slider .sample2 .slider { + margin: 0 40px; + } + #slider h2 { + padding: 14px; + margin: 0; + font-size: 16px; + font-weight: 400; + } + #slider .slider { + margin: 15px; + } + .icon-preview { + display: inline-block; + padding: 10px; + margin: 10px; + background: #D5D5D5; + border-radius: 3px; + cursor: pointer; + } + #progress-bar h2 { + font-size: 18.7199993133545px; + font-weight: bold; + margin-bottom: 30px; + } + #button h2 { + padding: 14px; + margin: 0; + font-size: 16px; + font-weight: 400; + } + #floating-action-button .btn { + margin: 20px; + } + #floating-action-button h2 { + padding: 14px; + margin: 0; + font-size: 16px; + font-weight: 400; + } + #dropdown h2 { + padding: 14px; + margin: 0; + font-size: 16px; + font-weight: 400; + } + #dropdown .dropdown { + font-size: 30px; + padding: 20px; + } + + #dropdown-menu h2 { + padding: 14px; + margin: 0; + font-size: 16px; + font-weight: 400; + } + #dropdown-menu .sample { + width: 200px; + } + #dropdown-menu .form-group { + margin: 30px 0; + } + + #shadow h2 { + padding: 14px; + margin: 0; + font-size: 16px; + font-weight: 400; + } + #shadow .sample { + width: 100px; + height: 100px; + margin: 16px; + padding: 16px; + display: inline-block; + } + #shadow-sample2 { + display: inline-block; + width: 100px; + height: 100px; + margin: 16px; + padding: 16px; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + + } + #shadow-sample3 { + display: inline-block; + width: 100px; + height: 100px; + margin: 16px; + padding: 16px; + border-radius: 100px; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + } + #dialog h2 { + padding: 14px; + margin: 0; + font-size: 16px; + font-weight: 400; + } @@ -136,299 +388,8 @@

Paper Elements

-======= - - Material Design for Bootstrap - - - - - - - - - - - - - - - - - - - - - - - - - - Fork me on GitHub - -
-
-
-
-

Paper Elements

-
-
-
-
-
-
- -
-
-
-

Material Design for Bootstrap

-

Material Design for Bootstrap is a theme for Bootstrap 3 which lets you use the new Google Material Design in your favorite front-end framework.

-

If you like this project you can support me by donating something on Gratipay, starring this repository, or reporting bugs and ideas.

-

Read more about Material Design for Bootstrap at the Github page.

- -
-

If you want support the development of this project please consider donate something:

- Donate with Gratipay -
- -
- - -
-
- -

Thanks to all the people that donate me weekly on Gratipay and all the ones which has donated on PayPal! You are great guys!

- -
-

Would you like to use this theme for commercial projects? Visit MyWebExpression and contact me using the form on the bottom of the page. Thanks!

- -
-
- -
Seems like you are using AdBlock to hide banners... Carbon ADS are quite nice and don't take much space, you may consider disabling it on this website.
This is the only AD on the entire website.

Thanks!
-
- - -
-

You can get this theme downloading the source from Bower:

- 
bower install bootstrap-material-design
- - -
-
-

Getting Started

-

Download

-
-

Install with NPM - Coming Soon

-

You can also install and manage Material Bootstrap using NPM

- 
npm install
-

Install with Bower

-

You can also install and manage Material Bootstrap using Bower

- 
bower install bootstrap-material-design
-

Install with Meteor

-

You can also install and manage Material Bootstrap using Meteor

- 
meteor add fezvrasta:bootstrap-material-design
-
-

What's included

-
-

Material Bootstrap is downloadable in a two forms. Material.css only supports the primary shades of the material color palette and Material-fullpalette.css supports every shade of the material color palette

-
-
-

Required Frameworks

-
-
-
-
-
- -
-
-

Bootstrap v3.0+

-

This theme extends, styles, and modifies Bootstrap's elements and styles. Without Bootstrap this project will not display correctly. To install Bootstrap please go to Get Bootstrap

-
-
-
-
-
- -
-
-

jQuery 1.9.1+

-

All JavaScript plugins require jQuery to be included.

-
->>>>>>> upstream/master
-<<<<<<< HEAD
@@ -486,40 +447,7 @@
Seems like you are using AdBlock to hide banners... Carbon ADS are quite nice and don't take much space, you may consider disabling it on this website.
This is the only AD on the entire website.

Thanks!
- +

You can get this theme downloading the source from Bower:

@@ -556,7 +484,7 @@

Bootstrap v3.0+

-

This theme extends, styles, and modifies Bootstrap's elements and styles. Without Bootstrap this project will not display correctly. To install Bootstrap please go to Get Bootstrap

+

This theme extends, styles, and modifies Bootstrap's elements and styles. Without Bootstrap this project will not display correctly. To install Bootstrap please go to Get Bootstrap

@@ -575,43 +503,39 @@

Once downloaded, unzip the compressed folder to see the structure of (the compiled) Material Bootstrap. You'll see something like this:

Material/
-=======
-
-

Once downloaded, unzip the compressed folder to see the structure of (the compiled) Material Bootstrap. You'll see something like this:

- - 
Material/
->>>>>>> upstream/master
-├── css/
-│   ├── material.css
-│   ├── material.css.map
-│   ├── material.min.css
-│   ├── material.min.css.map
-│   ├── material-wfont.css
-│   ├── material-wfont.css.map
-│   ├── material-wfont.min.css
-│   ├── material-wfont.min.css.map
-│   ├── ripples
-│   ├── ripples.css.map
-│   ├── ripples.min.css
-│   ├── ripples.min.css.map
-├── js/
-│   ├── material.js
-│   ├── material.min.js
-│   ├── material.min.js.map
-│   ├── ripples.js
-│   ├── ripples.min.js
-│   ├── ripples.min.js.map
-└── fonts/
+
+    ├── css/
+    │   ├── material.css
+    │   ├── material.css.map
+    │   ├── material.min.css
+    │   ├── material.min.css.map
+    │   ├── material-wfont.css
+    │   ├── material-wfont.css.map
+    │   ├── material-wfont.min.css
+    │   ├── material-wfont.min.css.map
+    │   ├── ripples
+    │   ├── ripples.css.map
+    │   ├── ripples.min.css
+    │   ├── ripples.min.css.map
+    ├── js/
+    │   ├── material.js
+    │   ├── material.min.js
+    │   ├── material.min.js.map
+    │   ├── ripples.js
+    │   ├── ripples.min.js
+    │   ├── ripples.min.js.map
+    └── fonts/
     ├── Material-Design-Icons.eot
     ├── Material-Design-Icons.svg
     ├── Material-Design-Icons.ttf
     ├── Material-Design-Icons.woff
     └── ADD REMAINING GOOGLE FONT FILES HERE
-                
-<<<<<<< HEAD
-
+ +

Just copy the compiled CSS and JS files and the font files from the .zip and add them to your site.

-
+ +
+

Once copied you need to initialize the material javascript by adding the following javascript to your site,

$.material.init()
@@ -675,43 +599,8 @@
+ - -

Checkbox

@@ -759,18 +648,6 @@
- -
@@ -801,23 +678,8 @@
- - +

Input

@@ -847,20 +709,7 @@
- - +
@@ -1094,15 +943,7 @@
- - - +

Slider

@@ -1124,63 +965,29 @@

Sliders are powered by noUiSlider

- - +
- + +

Icones

- -
-======= - -

Just copy the compiled CSS and JS files and the font files from the .zip and add them to your site.

-
-

Once copied you need to initialize the material javascript by adding the following javascript to your site,

- 
$.material.init()
- -
-

Checkbox

- - -
-
- -
-

Notify me about updates to apps or games that I've downloaded

-
- - -
-
- -
-

Auto-update apps over wifi only

-
- - -
-
- -
-

Remove all the searches you have ever performed

-
- -

Sound

- - -
-
Touch sounds
-
- -
-
-
-
Screen lock sound
-
- -
-
-
-
Vibrate on touch
-
- -
-
- - - -
-
-

Checkbox

-

Keep Wi-Fi on during sleep

-
-
- -
-
- -
-
- -
-
- - -

Wi-Fi frequency band

-
-
- -
-
- -
-
- ->>>>>>> upstream/master
-