mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2025-07-27 08:29:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from FezVrasta/master

Browse Source 
Syncing with Master Fork
This commit is contained in:
Grady Duncan 2015-02-12 20:47:28 -05:00
commit 2d8c30fb01
5 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -1,6 +1,6 @@
## Playground ## Playground
Use this pen to test and deveop new features of Material Design for Bootstrap: Use this pen to test and develop new features of Material Design for Bootstrap:
http://codepen.io/FezVrasta/pen/ihmea http://codepen.io/FezVrasta/pen/ihmea

4
bootstrap-elements.html
View File

@ -4,7 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Bootstrap Material</title> <title>Bootstrap Material</title>
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
<link href="dist/css/ripples.min.css" rel="stylesheet"> <link href="dist/css/ripples.min.css" rel="stylesheet">
<link href="dist/css/material-wfont.min.css" rel="stylesheet"> <link href="dist/css/material-wfont.min.css" rel="stylesheet">
<link href="//fezvrasta.github.io/snackbarjs/dist/snackbar.min.css" rel="stylesheet"> <link href="//fezvrasta.github.io/snackbarjs/dist/snackbar.min.css" rel="stylesheet">
@ -2264,7 +2264,7 @@
<br> <br>
<script src="//code.jquery.com/jquery-1.10.2.min.js"></script> <script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
<script> <script>
(function(){ (function(){

4
dist/test.html vendored
View File

@ -2,7 +2,7 @@
<head> <head>
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
<link href="css/ripples.min.css" rel="stylesheet"> <link href="css/ripples.min.css" rel="stylesheet">
<link href="css/material-wfont.min.css" rel="stylesheet"> <link href="css/material-wfont.min.css" rel="stylesheet">
@ -32,7 +32,7 @@
<!-- Your site ends --> <!-- Your site ends -->
<script src="//code.jquery.com/jquery-1.10.2.min.js"></script> <script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
<script src="js/ripples.min.js"></script> <script src="js/ripples.min.js"></script>
<script src="js/material.min.js"></script> <script src="js/material.min.js"></script>

55
index.html
View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Twitter Bootstrap --> <!-- Twitter Bootstrap -->
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet"> <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
<!-- Material Design for Bootstrap --> <!-- Material Design for Bootstrap -->
<link href="dist/css/material-wfont.min.css" rel="stylesheet"> <link href="dist/css/material-wfont.min.css" rel="stylesheet">
@ -184,6 +184,49 @@
<p>Would you like to use this theme for commercial projects? Visit <a href="http://www.mywebexpression.com">MyWebExpression</a> and contact me using the form on the bottom of the page. Thanks!</p> <p>Would you like to use this theme for commercial projects? Visit <a href="http://www.mywebexpression.com">MyWebExpression</a> and contact me using the form on the bottom of the page. Thanks!</p>
<br> <br>
<div class="cbwrapper">
<script async
type="text/javascript"
src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=fezvrastagithubiobootstrapmateri"
id="_carbonads_js">
</script>
<div id="fakecb">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.<br>This is the only AD on the entire website.<br><br>Thanks!</div>
</div>
<style>
.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;
}
</style>
<br> <br>
<p>You can get this theme downloading the source from Bower:</p> <p>You can get this theme downloading the source from Bower:</p>
<pre><code>bower install bootstrap-material-design</code></pre> <pre><code>bower install bootstrap-material-design</code></pre>
@ -277,8 +320,10 @@
font-weight: 400; font-weight: 400;
} }
#checkbox .sample2 .text { #checkbox .sample2 {
padding: 10px 0; padding: 10px 0;
}
#checkbox .sample2 .text {
display: inline-block; display: inline-block;
} }
#checkbox .sample2 .checkbox { #checkbox .sample2 .checkbox {
@ -392,6 +437,10 @@
<input type="email" class="form-control floating-label" placeholder="email"> <input type="email" class="form-control floating-label" placeholder="email">
<input type="number" class="form-control floating-label" placeholder="number"> <input type="number" class="form-control floating-label" placeholder="number">
<h2>Disabled</h2>
<input disabled type="text" class="form-control floating-label" placeholder="email">
<input disabled type="text" class="form-control floating-label" placeholder="number">
<h2>Hints</h2> <h2>Hints</h2>
<input type="text" class="form-control floating-label" data-hint="Write here something cool" placeholder="label"> <input type="text" class="form-control floating-label" data-hint="Write here something cool" placeholder="label">
<input type="email" class="form-control floating-label" data-hint="A valid email should contain an @ symbol" placeholder="label"> <input type="email" class="form-control floating-label" data-hint="A valid email should contain an @ symbol" placeholder="label">
@ -1366,7 +1415,7 @@
</script> </script>
<!-- Twitter Bootstrap --> <!-- Twitter Bootstrap -->
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/js/bootstrap.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.2/js/bootstrap.min.js"></script>
<!-- Material Design for Bootstrap --> <!-- Material Design for Bootstrap -->
<script src="dist/js/material.min.js"></script> <script src="dist/js/material.min.js"></script>

18
less/_togglebutton.less
View File

@ -7,13 +7,13 @@
font-weight: 400; font-weight: 400;
cursor: pointer; cursor: pointer;
// Hide original checkbox // Hide original checkbox
input[type=checkbox]:first-child { input[type=checkbox]:first-of-type {
opacity: 0; opacity: 0;
width: 0; width: 0;
height:0; height:0;
} }
// Switch bg on // Switch bg on
input[type=checkbox]:first-child:checked + .toggle { input[type=checkbox]:first-of-type:checked + .toggle {
background-color: rgba(0, 149, 135, 0.5); background-color: rgba(0, 149, 135, 0.5);
// Handle on // Handle on
&:after { &:after {
@ -22,7 +22,7 @@
} }
// Switch bg off and disabled // Switch bg off and disabled
.toggle, .toggle,
input[type=checkbox][disabled]:first-child + .toggle { input[type=checkbox][disabled]:first-of-type + .toggle {
content: ""; content: "";
display: inline-block; display: inline-block;
width: 30px; width: 30px;
@ -48,20 +48,20 @@
transition: left 0.3s ease, background 0.3s ease, box-shadow 0.1s ease; transition: left 0.3s ease, background 0.3s ease, box-shadow 0.1s ease;
} }
// Handle disabled // Handle disabled
input[type=checkbox][disabled]:first-child + .toggle:after, input[type=checkbox][disabled]:first-of-type + .toggle:after,
input[type=checkbox][disabled]:checked:first-child + .toggle:after{ input[type=checkbox][disabled]:checked:first-of-type + .toggle:after{
background-color: #BDBDBD; background-color: #BDBDBD;
} }
// Ripple on // Ripple on
input[type=checkbox]:first-child:checked ~ .toggle:active:after { input[type=checkbox]:first-of-type:checked ~ .toggle:active:after {
box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px rgba(0, 149, 135, 0.1); box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px rgba(0, 149, 135, 0.1);
} }
// Ripple off and disabled // Ripple off and disabled
input[type=checkbox]:first-child ~ .toggle:active:after, input[type=checkbox]:first-of-type ~ .toggle:active:after,
input[type=checkbox][disabled]:first-child ~ .toggle:active:after { input[type=checkbox][disabled]:first-of-type ~ .toggle:active:after {
box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px rgba(0, 0, 0, 0.1);
} }
input[type=checkbox]:first-child:checked + .toggle:after { input[type=checkbox]:first-of-type:checked + .toggle:after {
left: 15px; left: 15px;
} }
} }