Skip to content

Commit

Permalink
v0.97.2 Release
Browse files Browse the repository at this point in the history
  • Loading branch information
Dogfalo committed Nov 9, 2015
1 parent 418fc46 commit dc869ec
Show file tree
Hide file tree
Showing 15 changed files with 614 additions and 283 deletions.
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/Dogfalo/materialize?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Materialize, a CSS Framework based on material design

### Current Version : v0.97.1
### Current Version : v0.97.2

## Sass Requirements:
- Ruby Sass 3.3+, LibSass 0.6+
Expand All @@ -13,6 +13,16 @@ Materialize, a CSS Framework based on material design
Chrome 35+, Firefox 31+, Safari 7+, IE 10+

## Changelog
- v0.97.2 (Nov 8, 2015)
- Image support inside select
- Optgroup supported in select
- Multiple select added
- Card styling fixes
- Breadcrumbs added
- Scrollable tabs
- Tooltips and dropdowns position themselves more intelligently inside the window
- FAB menu is click-toggleable
- Horizontal FAB support added
- v0.97.1 (Sep 13, 2015)
- Added new range slider with uses noUiSlider to provide powerful options
- Added CSS for Chips
Expand Down
Binary file not shown.
Binary file not shown.
151 changes: 116 additions & 35 deletions dist/css/materialize.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Materialize v0.97.1 (http://materializecss.com)
* Materialize v0.97.2 (http://materializecss.com)
* Copyright 2014-2015 Materialize
* MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
*/
Expand Down Expand Up @@ -1628,6 +1628,8 @@
/*** Buttons ***/
/*** Cards ***/
/*** Collapsible ***/
/*** Chips ***/
/*** Date Picker ***/
/*** Dropdown ***/
/*** Fonts ***/
/*** Forms ***/
Expand Down Expand Up @@ -2073,7 +2075,8 @@ img.responsive-img, video.responsive-video {
cursor: default;
color: #999; }
.pagination li i {
font-size: 2rem; }
font-size: 2.2rem;
vertical-align: middle; }
.pagination li.pages ul li {
display: inline-block;
float: none; }
Expand All @@ -2088,6 +2091,25 @@ img.responsive-img, video.responsive-video {
overflow: hidden;
white-space: nowrap; } }

.breadcrumb {
font-size: 18px;
color: rgba(255, 255, 255, 0.7); }
.breadcrumb:before {
content: '\E5CC';
color: rgba(255, 255, 255, 0.7);
vertical-align: top;
display: inline-block;
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 25px;
margin: 0 10px 0 8px;
-webkit-font-smoothing: antialiased; }
.breadcrumb:first-child:before {
display: none; }
.breadcrumb:last-child {
color: #fff; }

.parallax-container {
position: relative;
overflow: hidden;
Expand Down Expand Up @@ -2373,11 +2395,8 @@ nav ul a span.badge {
.video-container {
position: relative;
padding-bottom: 56.25%;
padding-top: 30px;
height: 0;
overflow: hidden; }
.video-container.no-controls {
padding-top: 0; }
.video-container iframe, .video-container object, .video-container embed {
position: absolute;
top: 0;
Expand Down Expand Up @@ -5554,46 +5573,36 @@ small {

.card {
position: relative;
overflow: hidden;
margin: 0.5rem 0 1rem 0;
background-color: #fff;
transition: box-shadow .25s;
border-radius: 2px; }
.card .card-title {
color: #fff;
font-size: 24px;
font-weight: 300; }
.card .card-title.activator {
cursor: pointer; }
.card.small, .card.medium, .card.large {
position: relative; }
.card.small .card-image, .card.medium .card-image, .card.large .card-image {
max-height: 60%;
overflow: hidden; }
.card.small .card-content, .card.medium .card-content, .card.large .card-content {
max-height: 40%;
overflow: hidden; }
.card.small .card-action, .card.medium .card-action, .card.large .card-action {
position: absolute;
bottom: 0;
left: 0;
right: 0; }
right: 0;
z-index: 1;
background-color: inherit; }
.card.small {
height: 300px; }
.card.small .card-image {
height: 150px; }
.card.small .card-content {
height: 150px; }
.card.medium {
height: 400px; }
.card.medium .card-image {
height: 250px; }
.card.medium .card-content {
height: 150px; }
.card.large {
height: 500px; }
.card.large .card-image {
height: 330px; }
.card.large .card-content {
height: 170px; }
.card .card-image {
position: relative; }
.card .card-image img {
Expand All @@ -5606,6 +5615,7 @@ small {
bottom: 0;
width: 100%; }
.card .card-image .card-title {
color: #fff;
position: absolute;
bottom: 0;
left: 0;
Expand Down Expand Up @@ -5658,12 +5668,14 @@ small {
#toast-container {
min-width: 30%;
left: 5%;
right: 5%;
bottom: 7%; } }
@media only screen and (min-width : 993px) {
#toast-container {
min-width: 8%;
top: 10%;
right: 7%; } }
right: 7%;
left: 7%; } }

.toast {
border-radius: 2px;
Expand All @@ -5673,10 +5685,12 @@ small {
margin-top: 10px;
position: relative;
max-width: 100%;
height: 48px;
line-height: 48px;
height: auto;
min-height: 48px;
line-height: 1.5em;
word-break: break-all;
background-color: #323232;
padding: 0 25px;
padding: 10px 25px;
font-size: 1.1rem;
font-weight: 300;
color: #fff;
Expand Down Expand Up @@ -5729,16 +5743,21 @@ small {
text-align: center;
line-height: 48px;
height: 48px;
padding: 0 20px;
padding: 0;
margin: 0;
text-transform: uppercase;
text-overflow: ellipsis;
overflow: hidden;
letter-spacing: .8px;
width: 15%; }
width: 15%;
min-width: 80px; }
.tabs .tab a {
color: #ee6e73;
display: block;
width: 100%;
height: 100%;
text-overflow: ellipsis;
overflow: hidden;
-webkit-transition: color .28s ease;
-moz-transition: color .28s ease;
-o-transition: color .28s ease;
Expand All @@ -5756,8 +5775,20 @@ small {
background-color: #f6b2b5;
will-change: left, right; }

.tabs .tab {
padding: 0; }
.hide-tab-scrollbar {
position: relative;
height: 48px;
overflow: hidden; }
.hide-tab-scrollbar .tabs {
overflow-x: scroll;
overflow-y: hidden; }

.scrollbar-measure {
width: 100px;
height: 100px;
overflow: scroll;
position: absolute;
top: -9999px; }

.material-tooltip {
padding: 10px 8px;
Expand All @@ -5767,11 +5798,12 @@ small {
border-radius: 2px;
color: #fff;
min-height: 36px;
line-height: 1rem;
line-height: 120%;
opacity: 0;
display: none;
position: absolute;
text-align: center;
max-width: calc(100% - 4px);
overflow: hidden;
left: 0;
top: 0;
Expand Down Expand Up @@ -5875,13 +5907,30 @@ button.btn-floating {
padding-top: 15px;
margin-bottom: 0;
z-index: 998; }
.fixed-action-btn.active ul {
visibility: visible; }
.fixed-action-btn.horizontal {
padding: 0 0 0 15px; }
.fixed-action-btn.horizontal ul {
text-align: right;
right: 64px;
top: 50%;
transform: translateY(-50%);
height: 100%;
left: initial;
width: 500px;
/*width 100% only goes to width of button container */ }
.fixed-action-btn.horizontal ul li {
display: inline-block;
margin: 15px 15px 0 0; }
.fixed-action-btn ul {
left: 0;
right: 0;
text-align: center;
position: absolute;
bottom: 64px;
margin: 0; }
margin: 0;
visibility: hidden; }
.fixed-action-btn ul li {
margin-bottom: 15px; }
.fixed-action-btn ul a.btn-floating {
Expand Down Expand Up @@ -5920,17 +5969,28 @@ button.btn-floating {
clear: both;
color: rgba(0, 0, 0, 0.87);
cursor: pointer;
min-height: 50px;
line-height: 1.5rem;
width: 100%;
text-align: left;
text-transform: none; }
.dropdown-content li:hover, .dropdown-content li.active {
.dropdown-content li:hover, .dropdown-content li.active, .dropdown-content li.selected {
background-color: #eee; }
.dropdown-content li.active.selected {
background-color: #e1e1e1; }
.dropdown-content li.divider {
min-height: 0;
height: 1px; }
.dropdown-content li > a, .dropdown-content li > span {
font-size: 1.2rem;
font-size: 16px;
color: #26a69a;
display: block;
padding: 1rem 1rem; }
line-height: 22px;
padding: 14px 16px; }
.dropdown-content li > span > label {
top: 1px;
left: 3px;
height: 18px; }
.dropdown-content li > a > i {
height: inherit;
line-height: inherit; }
Expand Down Expand Up @@ -5999,6 +6059,12 @@ button.btn-floating {
background-color: rgba(76, 175, 80, 0.7); }
.waves-effect.waves-teal .waves-ripple {
background-color: rgba(0, 150, 136, 0.7); }
.waves-effect input[type="button"], .waves-effect input[type="reset"], .waves-effect input[type="submit"] {
border: 0;
font-style: normal;
font-size: inherit;
text-transform: inherit;
background: none; }

.waves-notransition {
-webkit-transition: none !important;
Expand Down Expand Up @@ -6179,7 +6245,7 @@ a.waves-effect .waves-ripple {
line-height: 32px;
padding: 0 12px;
border-radius: 16px;
background-color: #E4E4E4; }
background-color: #e4e4e4; }
.chip img {
float: left;
margin: 0 8px 0 -12px;
Expand Down Expand Up @@ -6804,10 +6870,25 @@ select:disabled {
.select-wrapper i {
color: rgba(0, 0, 0, 0.3); }

.select-dropdown li.disabled {
.select-dropdown li.disabled, .select-dropdown li.disabled > span, .select-dropdown li.optgroup {
color: rgba(0, 0, 0, 0.3);
background-color: transparent; }

.select-dropdown li img {
height: 40px;
width: 40px;
margin: 5px 15px;
float: right; }

.select-dropdown li.optgroup {
border-top: 1px solid #eee; }
.select-dropdown li.optgroup.selected > span {
color: rgba(0, 0, 0, 0.7); }
.select-dropdown li.optgroup > span {
color: rgba(0, 0, 0, 0.4); }
.select-dropdown li.optgroup ~ li:not(.optgroup) {
padding-left: 1rem; }

/*********************
File Input
**********************/
Expand Down
6 changes: 3 additions & 3 deletions dist/css/materialize.min.css

Large diffs are not rendered by default.

694 changes: 462 additions & 232 deletions dist/js/materialize.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/js/materialize.min.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions extras/noUiSlider/nouislider.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*!
* Materialize v0.97.2 (http://materializecss.com)
* Copyright 2014-2015 Materialize
* MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
*/
/*!
* Materialize v0.97.1 (http://materializecss.com)
* Copyright 2014-2015 Materialize
Expand Down
5 changes: 5 additions & 0 deletions extras/noUiSlider/nouislider.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*!
* Materialize v0.97.2 (http://materializecss.com)
* Copyright 2014-2015 Materialize
* MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
*/
/*!
* Materialize v0.97.1 (http://materializecss.com)
* Copyright 2014-2015 Materialize
Expand Down
2 changes: 1 addition & 1 deletion extras/noUiSlider/nouislider.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dc869ec

Please sign in to comment.