Merge pull request #361 from ryanmcdonough/master

Dividers
This commit is contained in:
Fez Vrasta 2015-01-13 13:34:28 +01:00
commit fa450b6a53
15 changed files with 190 additions and 22 deletions

View File

@ -8458,19 +8458,19 @@ body .jumbotron-material-blue-grey-A700,
top: -5px; top: -5px;
} }
.btn-link, .btn-link,
.btn:not([class^="btn btn-"]), .btn:not([class*="btn-"]),
.btn-default { .btn-default {
color: rgba(0, 0, 0, 0.84); color: rgba(0, 0, 0, 0.84);
} }
.btn-link:hover, .btn-link:hover,
.btn:not([class^="btn btn-"]):hover, .btn:not([class*="btn-"]):hover,
.btn-default:hover { .btn-default:hover {
color: rgba(0, 0, 0, 0.84); color: rgba(0, 0, 0, 0.84);
} }
.btn:not([class^="btn btn-"]):hover, .btn:not([class*="btn-"]):hover,
.btn-default:hover, .btn-default:hover,
.btn-flat:not(.btn-link):hover, .btn-flat:not(.btn-link):hover,
.btn:not([class^="btn btn-"]).active, .btn:not([class*="btn-"]).active,
.btn-default.active, .btn-default.active,
.btn-flat:not(.btn-link).active { .btn-flat:not(.btn-link).active {
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
@ -18936,6 +18936,12 @@ legend {
border-radius: 0; border-radius: 0;
padding: 0 16px; padding: 0 16px;
} }
.list-group .list-group-item.baseline {
border-bottom: 1px solid #cecece;
}
.list-group .list-group-item.baseline:last-child {
border-bottom: none;
}
.list-group .list-group-item .row-picture, .list-group .list-group-item .row-picture,
.list-group .list-group-item .row-action-primary { .list-group .list-group-item .row-action-primary {
float: left; float: left;
@ -30890,6 +30896,47 @@ icon-material-blue-grey-A700 {
.panel-footer { .panel-footer {
background-color: #ececec; background-color: #ececec;
} }
hr.on-dark {
color: #1a1a1a;
}
hr.on-light {
color: #ffffff;
}
@media (-webkit-min-device-pixel-ratio: 0.75), (min--moz-device-pixel-ratio: 0.75), (-o-device-pixel-ratio: 3/4), (min-device-pixel-ratio: 0.75), (min-resolution: 0.75dppx), (min-resolution: 120dpi) {
hr {
height: 0.75px;
}
}
@media (-webkit-min-device-pixel-ratio: 1), (min--moz-device-pixel-ratio: 1), (-o-device-pixel-ratio: 1), (min-device-pixel-ratio: 1), (min-resolution: 1dppx), (min-resolution: 160dpi) {
hr {
height: 1px;
}
}
@media (-webkit-min-device-pixel-ratio: 1.33), (min--moz-device-pixel-ratio: 1.33), (-o-device-pixel-ratio: 133/100), (min-device-pixel-ratio: 1.33), (min-resolution: 1.33dppx), (min-resolution: 213dpi) {
hr {
height: 1.333px;
}
}
@media (-webkit-min-device-pixel-ratio: 1.5), (min--moz-device-pixel-ratio: 1.5), (-o-device-pixel-ratio: 3/2), (min-device-pixel-ratio: 1.5), (min-resolution: 1.5dppx), (min-resolution: 240dpi) {
hr {
height: 1.5px;
}
}
@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-device-pixel-ratio: 2/1), (min-device-pixel-ratio: 2), (min-resolution: 2dppx), (min-resolution: 380dpi) {
hr {
height: 2px;
}
}
@media (-webkit-min-device-pixel-ratio: 3), (min--moz-device-pixel-ratio: 3), (-o-device-pixel-ratio: 3/1), (min-device-pixel-ratio: 3), (min-resolution: 3dppx), (min-resolution: 480dpi) {
hr {
height: 3px;
}
}
@media (-webkit-min-device-pixel-ratio: 4), (min--moz-device-pixel-ratio: 4), (-o-device-pixel-ratio: 4/1), (min-device-pixel-ratio: 3), (min-resolution: 4dppx), (min-resolution: 640dpi) {
hr {
height: 4px;
}
}
* { * {
-webkit-tap-highlight-color: rgba(255, 255, 255, 0); -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

55
dist/css/material.css vendored
View File

@ -8434,19 +8434,19 @@ body .jumbotron-material-blue-grey-A700,
top: -5px; top: -5px;
} }
.btn-link, .btn-link,
.btn:not([class^="btn btn-"]), .btn:not([class*="btn-"]),
.btn-default { .btn-default {
color: rgba(0, 0, 0, 0.84); color: rgba(0, 0, 0, 0.84);
} }
.btn-link:hover, .btn-link:hover,
.btn:not([class^="btn btn-"]):hover, .btn:not([class*="btn-"]):hover,
.btn-default:hover { .btn-default:hover {
color: rgba(0, 0, 0, 0.84); color: rgba(0, 0, 0, 0.84);
} }
.btn:not([class^="btn btn-"]):hover, .btn:not([class*="btn-"]):hover,
.btn-default:hover, .btn-default:hover,
.btn-flat:not(.btn-link):hover, .btn-flat:not(.btn-link):hover,
.btn:not([class^="btn btn-"]).active, .btn:not([class*="btn-"]).active,
.btn-default.active, .btn-default.active,
.btn-flat:not(.btn-link).active { .btn-flat:not(.btn-link).active {
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
@ -18912,6 +18912,12 @@ legend {
border-radius: 0; border-radius: 0;
padding: 0 16px; padding: 0 16px;
} }
.list-group .list-group-item.baseline {
border-bottom: 1px solid #cecece;
}
.list-group .list-group-item.baseline:last-child {
border-bottom: none;
}
.list-group .list-group-item .row-picture, .list-group .list-group-item .row-picture,
.list-group .list-group-item .row-action-primary { .list-group .list-group-item .row-action-primary {
float: left; float: left;
@ -30866,6 +30872,47 @@ icon-material-blue-grey-A700 {
.panel-footer { .panel-footer {
background-color: #ececec; background-color: #ececec;
} }
hr.on-dark {
color: #1a1a1a;
}
hr.on-light {
color: #ffffff;
}
@media (-webkit-min-device-pixel-ratio: 0.75), (min--moz-device-pixel-ratio: 0.75), (-o-device-pixel-ratio: 3/4), (min-device-pixel-ratio: 0.75), (min-resolution: 0.75dppx), (min-resolution: 120dpi) {
hr {
height: 0.75px;
}
}
@media (-webkit-min-device-pixel-ratio: 1), (min--moz-device-pixel-ratio: 1), (-o-device-pixel-ratio: 1), (min-device-pixel-ratio: 1), (min-resolution: 1dppx), (min-resolution: 160dpi) {
hr {
height: 1px;
}
}
@media (-webkit-min-device-pixel-ratio: 1.33), (min--moz-device-pixel-ratio: 1.33), (-o-device-pixel-ratio: 133/100), (min-device-pixel-ratio: 1.33), (min-resolution: 1.33dppx), (min-resolution: 213dpi) {
hr {
height: 1.333px;
}
}
@media (-webkit-min-device-pixel-ratio: 1.5), (min--moz-device-pixel-ratio: 1.5), (-o-device-pixel-ratio: 3/2), (min-device-pixel-ratio: 1.5), (min-resolution: 1.5dppx), (min-resolution: 240dpi) {
hr {
height: 1.5px;
}
}
@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-device-pixel-ratio: 2/1), (min-device-pixel-ratio: 2), (min-resolution: 2dppx), (min-resolution: 380dpi) {
hr {
height: 2px;
}
}
@media (-webkit-min-device-pixel-ratio: 3), (min--moz-device-pixel-ratio: 3), (-o-device-pixel-ratio: 3/1), (min-device-pixel-ratio: 3), (min-resolution: 3dppx), (min-resolution: 480dpi) {
hr {
height: 3px;
}
}
@media (-webkit-min-device-pixel-ratio: 4), (min--moz-device-pixel-ratio: 4), (-o-device-pixel-ratio: 4/1), (min-device-pixel-ratio: 3), (min-resolution: 4dppx), (min-resolution: 640dpi) {
hr {
height: 4px;
}
}
* { * {
-webkit-tap-highlight-color: rgba(255, 255, 255, 0); -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

71
less/_dividers.less Normal file
View File

@ -0,0 +1,71 @@
hr {
&.on-dark {
color: lighten(@black, 10%);
}
&.on-light {
color: lighten(@white, 10%);
}
@media (-webkit-min-device-pixel-ratio: 0.75),
(min--moz-device-pixel-ratio: 0.75),
(-o-device-pixel-ratio: 3/4),
(min-device-pixel-ratio: 0.75),
(min-resolution: 0.75dppx),
(min-resolution: 120dpi), {
height:0.75px;
}
@media (-webkit-min-device-pixel-ratio: 1),
(min--moz-device-pixel-ratio: 1),
(-o-device-pixel-ratio: 1),
(min-device-pixel-ratio: 1),
(min-resolution: 1dppx),
(min-resolution: 160dpi) {
height:1px;
}
@media (-webkit-min-device-pixel-ratio: 1.33),
(min--moz-device-pixel-ratio: 1.33),
(-o-device-pixel-ratio: 133/100),
(min-device-pixel-ratio: 1.33),
(min-resolution: 1.33dppx),
(min-resolution: 213dpi) {
height:1.333px;
}
@media (-webkit-min-device-pixel-ratio: 1.5),
(min--moz-device-pixel-ratio: 1.5),
(-o-device-pixel-ratio: 3/2),
(min-device-pixel-ratio: 1.5),
(min-resolution: 1.5dppx),
(min-resolution: 240dpi) {
height:1.5px;
}
@media (-webkit-min-device-pixel-ratio: 2),
(min--moz-device-pixel-ratio: 2),
(-o-device-pixel-ratio: 2/1),
(min-device-pixel-ratio: 2),
(min-resolution: 2dppx),
(min-resolution: 380dpi) {
height:2px;
}
@media (-webkit-min-device-pixel-ratio: 3),
(min--moz-device-pixel-ratio: 3),
(-o-device-pixel-ratio: 3/1),
(min-device-pixel-ratio: 3),
(min-resolution: 3dppx),
(min-resolution: 480dpi) {
height:3px;
}
@media (-webkit-min-device-pixel-ratio: 4),
(min--moz-device-pixel-ratio: 4),
(-o-device-pixel-ratio: 4/1),
(min-device-pixel-ratio: 3),
(min-resolution: 4dppx),
(min-resolution: 640dpi) {
height:4px;
}
}

View File

@ -110,6 +110,8 @@ legend {
@import "_panels.less"; @import "_panels.less";
@import "_dividers.less";
// Prevent highlight on mobile // Prevent highlight on mobile
* { * {
-webkit-tap-highlight-color: rgba(255, 255, 255, 0); -webkit-tap-highlight-color: rgba(255, 255, 255, 0);

View File

@ -29,6 +29,7 @@
"grunt-contrib-uglify": "^0.6.0", "grunt-contrib-uglify": "^0.6.0",
"grunt-contrib-watch": "^0.6.1", "grunt-contrib-watch": "^0.6.1",
"grunt-csswring": "^1.1.0", "grunt-csswring": "^1.1.0",
"grunt-dependency-installer": "^0.2.0",
"grunt-exec": "^0.4.6", "grunt-exec": "^0.4.6",
"grunt-newer": "^0.7.0", "grunt-newer": "^0.7.0",
"jshint-stylish": "^1.0.0", "jshint-stylish": "^1.0.0",