Skip to content

Commit e074ed7

Browse files
Fix Issues:
- #18 - #17 - #11 - #5
1 parent b5fb8be commit e074ed7

6 files changed

Lines changed: 69 additions & 46 deletions

File tree

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# [Material Kit - Free Bootstrap UI Kit](http://www.creative-tim.com/product/material-kit)
1+
# [Material Kit - Free Bootstrap UI Kit](http://demos.creative-tim.com/material-kit/index.html)
2+
3+
![alt text](http://s3.amazonaws.com/creativetim_bucket/products/38/original/opt_mk_thumbnail.jpg "Material Kit Free")
24

35
Material Kit is a Free Bootstrap UI Kit with a fresh, new design inspired by Google's material design. You asked for it, so we built it. It's a great pleasure to introduce to you the material concepts in an easy to use and beautiful set of components. Along with the restyling of the Bootstrap elements, you will find three fully-coded example pages, to help you design your next project.
46

@@ -11,14 +13,13 @@ Material Kit is based on the Github Repo from Fez (http://fezvrasta.github.io/bo
1113
## Links:
1214

1315
+ [Live Preview](http://demos.creative-tim.com/material-kit/index.html)
14-
+ [Rails Gem](https://github.com/UiReady/material_kit/)
15-
+ Material Kit PRO - coming soon (from $39)
16+
+ [Material Kit PRO](http://demos.creative-tim.com/material-kit-pro/presentation.html)
1617

1718
## Quick start
1819

1920
Quick start options:
2021

21-
- [Download from Github](https://github.com/timcreative/material-kit/releases/tag/v1.0).
22+
- [Download from Github](https://github.com/timcreative/material-kit/releases/tag/v1.0.1).
2223
- [Download from Creative Tim](http://www.creative-tim.com/product/material-kit).
2324
- Clone the repo: `git clone https://github.com/timcreative/material-kit.git`.
2425

assets/css/demo.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,12 @@
236236
width: 960px;
237237
}
238238
}
239-
239+
@media (max-width: 991px){
240+
.fixed-section.affix{
241+
position: relative;
242+
margin-bottom: 100px;
243+
}
244+
}
240245
@media (max-width: 768px){
241246
.btn, .btn-morphing{
242247
margin-bottom: 10px;

assets/css/material-kit.css

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,9 @@ fieldset[disabled] .form-group.is-focused .checkbox label {
616616
.checkbox .checkbox-material {
617617
vertical-align: middle;
618618
position: relative;
619-
top: 3px;
619+
top: 1px;
620620
padding-right: 5px;
621+
display: inline-block;
621622
}
622623
.checkbox .checkbox-material:before {
623624
display: block;
@@ -631,6 +632,7 @@ fieldset[disabled] .form-group.is-focused .checkbox label {
631632
z-index: 1;
632633
opacity: 0;
633634
margin: 0;
635+
top: 0;
634636
transform: scale3d(2.3, 2.3, 1);
635637
}
636638
.checkbox .checkbox-material .check {
@@ -2055,20 +2057,6 @@ legend {
20552057
.dropdown-menu {
20562058
border: 0;
20572059
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
2058-
-webkit-transition: all 150ms linear;
2059-
-moz-transition: all 150ms linear;
2060-
-o-transition: all 150ms linear;
2061-
-ms-transition: all 150ms linear;
2062-
transition: all 150ms linear;
2063-
margin-top: -20px;
2064-
opacity: 0;
2065-
visibility: hidden;
2066-
display: block;
2067-
}
2068-
.open .dropdown-menu {
2069-
opacity: 1;
2070-
visibility: visible;
2071-
margin-top: 1px;
20722060
}
20732061
.dropdown-menu .divider {
20742062
background-color: rgba(0, 0, 0, 0.12);
@@ -2100,6 +2088,24 @@ legend {
21002088
margin: 5px 0;
21012089
}
21022090

2091+
@media (min-width: 992px) {
2092+
.dropdown .dropdown-menu {
2093+
-webkit-transition: all 150ms linear;
2094+
-moz-transition: all 150ms linear;
2095+
-o-transition: all 150ms linear;
2096+
-ms-transition: all 150ms linear;
2097+
transition: all 150ms linear;
2098+
margin-top: -20px;
2099+
opacity: 0;
2100+
visibility: hidden;
2101+
display: block;
2102+
}
2103+
.dropdown.open .dropdown-menu {
2104+
opacity: 1;
2105+
visibility: visible;
2106+
margin-top: 1px;
2107+
}
2108+
}
21032109
.alert {
21042110
border: 0;
21052111
border-radius: 0;

assets/sass/material-kit/_checkboxes.scss

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,24 @@
2525
.checkbox-material {
2626
vertical-align: middle;
2727
position: relative;
28-
top: 3px;
28+
top: 1px;
2929
padding-right: 5px;
30+
display: inline-block;
3031

3132
&:before {
32-
display: block;
33-
position: absolute;
34-
left: 0;
35-
content: "";
36-
background-color: rgba(0,0,0,.84);
37-
height: $mdb-checkbox-size;
38-
width: $mdb-checkbox-size;
39-
border-radius: 100%;
40-
z-index: 1;
41-
opacity: 0;
42-
margin: 0;
43-
transform: scale3d(2.3, 2.3, 1);
33+
display: block;
34+
position: absolute;
35+
left: 0;
36+
content: "";
37+
background-color: rgba(0,0,0,.84);
38+
height: $mdb-checkbox-size;
39+
width: $mdb-checkbox-size;
40+
border-radius: 100%;
41+
z-index: 1;
42+
opacity: 0;
43+
margin: 0;
44+
top: 0;
45+
transform: scale3d(2.3, 2.3, 1);
4446
}
4547

4648
.check {

assets/sass/material-kit/_dropdown.scss

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,6 @@
22
border: 0;
33
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
44

5-
@include transition($fast-transition-time, $transition-linear);
6-
margin-top: -20px;
7-
opacity: 0;
8-
visibility: hidden;
9-
display: block;
10-
11-
.open &{
12-
opacity: 1;
13-
visibility: visible;
14-
margin-top: 1px;
15-
}
16-
175
.divider {
186
background-color: rgba(0, 0, 0, .12);
197
}
@@ -47,3 +35,24 @@
4735
margin: 5px 0;
4836
}
4937
}
38+
39+
@media (min-width: $screen-md-min){
40+
.dropdown{
41+
.dropdown-menu{
42+
@include transition($fast-transition-time, $transition-linear);
43+
margin-top: -20px;
44+
opacity: 0;
45+
visibility: hidden;
46+
display: block;
47+
}
48+
49+
&.open{
50+
.dropdown-menu{
51+
opacity: 1;
52+
visibility: visible;
53+
margin-top: 1px;
54+
}
55+
}
56+
}
57+
58+
}

components-documentation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ <h2>Navbar </h2>
867867
</div><!-- end navbar -->
868868

869869
<p class="space-top">
870-
Besides all this customisation, we have an extra navbar. <code>.navbar-transparent</code> is a special class that you can to use if you want the navbar to be transparent and then turn to color after scrolling 260px using the class <code>.navbar-color-on-scroll</code>. We recommend that the part of your page that has the transparent navbar contains something non-cluttered, like an image. If you want to see a nice example in details, check <a href="navbar-transparent.html">this page</a> out.
870+
Besides all this customisation, we have an extra navbar. <code>.navbar-transparent</code> is a special class that you can to use if you want the navbar to be transparent and then turn to color after scrolling 260px using the class <code>.navbar-color-on-scroll</code>. We recommend that the part of your page that has the transparent navbar contains something non-cluttered, like an image. If you want to see a nice example in details, check <a href="examples/profile-page.html" target="_blank">the Profile Page</a>.
871871
</p>
872872

873873
</div>

0 commit comments

Comments
 (0)