mirror of
https://github.com/mdbootstrap/mdb-ui-kit.git
synced 2024-11-25 11:04:09 +03:00
fixes #106 - also fixes the jshint errors from prior commit
This commit is contained in:
shockwork
parent
c4336133d9
commit
16af0a6f76
|
|
@ -18,6 +18,13 @@ module.exports = function(grunt) {
|
|||
}
|
||||
},
|
||||
|
||||
githooks: {
|
||||
all: {
|
||||
// Will run the jshint and test:unit tasks at every commit
|
||||
"pre-commit": "less autoprefixer cssmin uglify copy newer:jshint jasmine:scripts"
|
||||
}
|
||||
},
|
||||
|
||||
sass: {
|
||||
compilesass: {
|
||||
files: {
|
||||
|
|
@ -170,7 +177,7 @@ module.exports = function(grunt) {
|
|||
|
||||
});
|
||||
|
||||
grunt.registerTask("default", ["less", "autoprefixer", "cssmin", "uglify", "copy"]);
|
||||
grunt.registerTask("default", ["githooks", "less", "autoprefixer", "cssmin", "uglify", "copy"]);
|
||||
|
||||
grunt.registerTask("scss", ["sass", "autoprefixer", "cssmin", "uglify", "copy"]);
|
||||
|
||||
|
|
|
|||
6
dist/css/material-wfont.css
vendored
6
dist/css/material-wfont.css
vendored
|
|
@ -4064,14 +4064,14 @@ fieldset[disabled] .navbar .btn-link:focus {
|
|||
margin: 0;
|
||||
}
|
||||
.nav-tabs > li > a:hover {
|
||||
background: transparent;
|
||||
background-color: 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;
|
||||
.nav-tabs > li.open > .nav-tabs > li:hover {
|
||||
background-color: transparent !important;
|
||||
border: 0 !important;
|
||||
color: #FFFFFF !important;
|
||||
font-weight: 500;
|
||||
|
|
|
|||
2
dist/css/material-wfont.min.css
vendored
2
dist/css/material-wfont.min.css
vendored
File diff suppressed because one or more lines are too long
6
dist/css/material.css
vendored
6
dist/css/material.css
vendored
|
|
@ -4063,14 +4063,14 @@ fieldset[disabled] .navbar .btn-link:focus {
|
|||
margin: 0;
|
||||
}
|
||||
.nav-tabs > li > a:hover {
|
||||
background: transparent;
|
||||
background-color: 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;
|
||||
.nav-tabs > li.open > .nav-tabs > li:hover {
|
||||
background-color: transparent !important;
|
||||
border: 0 !important;
|
||||
color: #FFFFFF !important;
|
||||
font-weight: 500;
|
||||
|
|
|
|||
2
dist/css/material.min.css
vendored
2
dist/css/material.min.css
vendored
File diff suppressed because one or more lines are too long
8
dist/js/ripples.js
vendored
8
dist/js/ripples.js
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/* Copyright 2014+, Federico Zivolo, LICENSE at https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md */
|
||||
/* globals CustomEvent */
|
||||
|
||||
/*jshint maxlen: 500 */
|
||||
window.ripples = {
|
||||
init : function(withRipple) {
|
||||
"use strict";
|
||||
|
|
@ -56,10 +56,10 @@ window.ripples = {
|
|||
|
||||
// This changes the alpha value of the rgba (opacity) to the constant __rippleOpacity__
|
||||
// Not sure if regexp is quicker...
|
||||
rgbArr = targetColor.split(',');
|
||||
rgbArr = targetColor.split(",");
|
||||
rgbArr.pop();
|
||||
rgbArr.push(" " + __rippleOpacity__ + ")")
|
||||
targetColor = rgbArr.join(',');
|
||||
rgbArr.push(" " + __rippleOpacity__ + ")");
|
||||
targetColor = rgbArr.join(",");
|
||||
|
||||
|
||||
// Insert new ripple into ripple wrapper
|
||||
|
|
|
|||
17
less/_tabs.import.less
vendored
17
less/_tabs.import.less
vendored
|
|
@ -1,19 +1,24 @@
|
|||
// main: material.less
|
||||
|
||||
.nav-tabs {
|
||||
.nav-tabs {
|
||||
background: @navbar-default-bg;
|
||||
> li {
|
||||
> a {
|
||||
> li {
|
||||
> a {
|
||||
color: #FFFFFF;
|
||||
border: 0;
|
||||
margin: 0;
|
||||
&:hover {
|
||||
background: transparent;
|
||||
background-color: transparent;
|
||||
border: 0;
|
||||
}
|
||||
}
|
||||
&.active > a, &.active > a:hover, &.open > a, &.open > a:hover {
|
||||
background: transparent !important;
|
||||
&.active > a,
|
||||
&.active >
|
||||
a:hover,
|
||||
&.open > a,
|
||||
&.open >
|
||||
&:hover {
|
||||
background-color: transparent !important;
|
||||
border: 0 !important;
|
||||
color: #FFFFFF !important;
|
||||
font-weight: 500;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
"grunt-contrib-sass": "^0.8.1",
|
||||
"grunt-contrib-uglify": "^0.6.0",
|
||||
"grunt-contrib-watch": "^0.6.1",
|
||||
"grunt-githooks": "^0.3.1",
|
||||
"grunt-newer": "^0.7.0",
|
||||
"jshint-stylish": "^1.0.0",
|
||||
"load-grunt-tasks": "^0.6.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* Copyright 2014+, Federico Zivolo, LICENSE at https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md */
|
||||
/* globals CustomEvent */
|
||||
|
||||
/*jshint maxlen: 500 */
|
||||
window.ripples = {
|
||||
init : function(withRipple) {
|
||||
"use strict";
|
||||
|
|
@ -56,10 +56,10 @@ window.ripples = {
|
|||
|
||||
// This changes the alpha value of the rgba (opacity) to the constant __rippleOpacity__
|
||||
// Not sure if regexp is quicker...
|
||||
rgbArr = targetColor.split(',');
|
||||
rgbArr = targetColor.split(",");
|
||||
rgbArr.pop();
|
||||
rgbArr.push(" " + __rippleOpacity__ + ")")
|
||||
targetColor = rgbArr.join(',');
|
||||
rgbArr.push(" " + __rippleOpacity__ + ")");
|
||||
targetColor = rgbArr.join(",");
|
||||
|
||||
|
||||
// Insert new ripple into ripple wrapper
|
||||
|
|
|
|||
|
|
@ -4064,14 +4064,14 @@ fieldset[disabled] .navbar .btn-link:focus {
|
|||
margin: 0;
|
||||
}
|
||||
.nav-tabs > li > a:hover {
|
||||
background: transparent;
|
||||
background-color: 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;
|
||||
.nav-tabs > li.open > .nav-tabs > li:hover {
|
||||
background-color: transparent !important;
|
||||
border: 0 !important;
|
||||
color: #FFFFFF !important;
|
||||
font-weight: 500;
|
||||
|
|
|
|||
2
template/material/css/material-wfont.min.css
vendored
2
template/material/css/material-wfont.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -4063,14 +4063,14 @@ fieldset[disabled] .navbar .btn-link:focus {
|
|||
margin: 0;
|
||||
}
|
||||
.nav-tabs > li > a:hover {
|
||||
background: transparent;
|
||||
background-color: 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;
|
||||
.nav-tabs > li.open > .nav-tabs > li:hover {
|
||||
background-color: transparent !important;
|
||||
border: 0 !important;
|
||||
color: #FFFFFF !important;
|
||||
font-weight: 500;
|
||||
|
|
|
|||
2
template/material/css/material.min.css
vendored
2
template/material/css/material.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -50,11 +50,11 @@ window.ripples = {
|
|||
// Move ripple to the mouse position
|
||||
$ripple.setAttribute("style", "left:" + mousePos.x + "px; top:" + mousePos.y + "px;");
|
||||
|
||||
// Get the clicked targets text color, this will be applied to the ripple.
|
||||
// Get the clicked targets text color, this will be applied to the ripple as background-color.
|
||||
targetColor = window.getComputedStyle($el).color;
|
||||
|
||||
|
||||
// This changes the last value of the rgba value (opacity) to the constant __rippleOpacity__
|
||||
// This changes the alpha value of the rgba (opacity) to the constant __rippleOpacity__
|
||||
// Not sure if regexp is quicker...
|
||||
rgbArr = targetColor.split(',');
|
||||
rgbArr.pop();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user