From ab266217c14a90e63e977903f41e3fa3fcbe936f Mon Sep 17 00:00:00 2001 From: Fez Vrasta Date: Tue, 19 Aug 2014 10:16:39 +0200 Subject: [PATCH] Added support for IE --- material/material.css | 48 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/material/material.css b/material/material.css index 2b891e46..bb1c65c5 100644 --- a/material/material.css +++ b/material/material.css @@ -225,9 +225,13 @@ h6, border-radius: 2px; } .ripple { - fill: black; - fill-opacity: 0.05; - stroke: none; + position: absolute; + width: 20px; + height: 20px; + margin-left: -10px; + margin-top: -10px; + border-radius: 100%; + background-color: rgba(0, 0, 0, 0.05); -webkit-transform: scale(1); -ms-transform: scale(1); transform: scale(1); @@ -237,8 +241,10 @@ h6, opacity: 0; } .ripple.ripple-on { - transition: opacity 0.15s ease-in 0s -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s; -webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s; + -ms-transition: opacity 0.15s ease-in 0s, -ms-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s; + -moz-transition: opacity 0.15s ease-in 0s, -moz-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s; + transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s; opacity: 1; } .ripple.ripple-out { @@ -469,6 +475,12 @@ h6, -webkit-animation-fill-mode: forwards; animation-fill-mode: forwards; } +.form-control-wrapper select ~ .material-input:before { + bottom: 1px; +} +.form-control-wrapper select ~ .material-input:after { + display: none; +} .form-group.has-warning .material-input:before, .form-group.has-warning input.form-control:focus ~ .material-input:after { background: #ff5722; @@ -525,6 +537,9 @@ select.form-control:focus { box-shadow: none; border-color: #757575; } +legend { + border-bottom: 0; +} .container .well, .container .jumbotron { background-color: #fff; @@ -819,3 +834,28 @@ fieldset[disabled] .navbar .btn-link:focus { .text-info { color: #3498db; } +.nav-tabs { + background: #4285f4; +} +.nav-tabs > li > a { + color: #FFFFFF; + border: 0; + margin: 0; +} +.nav-tabs > li > a:hover { + background: transparent; + border: 0; +} +.nav-tabs > li.active > a, +.nav-tabs > li.active > a:hover, +.nav-tabs > li.open > a, +.nav-tabs > li.open > a:hover { + background: transparent !important; + border: 0 !important; + color: #FFFFFF !important; + font-weight: 500; +} +.nav-tabs > li.disabled > a, +.nav-tabs > li.disabled > a:hover { + color: rgba(255, 255, 255, 0.5); +}