mirror of
https://github.com/mdbootstrap/mdb-ui-kit.git
synced 2024-11-22 09:36:55 +03:00
Merge branch 'master' of https://github.com/FezVrasta/bootstrap-material-design
# Conflicts: # rollup.config.js
This commit is contained in:
Vitali Korezki
commit
5057312531
|
|
@ -1,6 +1,6 @@
|
|||
<h1 align=center>Material Design for Bootstrap</h1>
|
||||
|
||||
Material Design for Bootstrap is the best way to use [Material Design guidelines by Google](http://www.google.com/design/spec/material-design/introduction.html)
|
||||
Material Design for Bootstrap is the best way to use [Material Design guidelines by Google](https://material.io/design/introduction/)
|
||||
in your Bootstrap 4 based application.
|
||||
Since this is a fully customizable version of Bootstrap, just include Material Design for Bootstrap CSS instead of Bootstrap CSS, and include the JavaScript at
|
||||
the end of your document (just before the `</body>` tag), and everything will be converted to Material Design.
|
||||
|
|
@ -23,7 +23,7 @@ time, please consider becoming a contributor of this project!
|
|||
If you are interested contact @FezVrasta or just adopt one of our [issues](https://github.com/FezVrasta/bootstrap-material-design/issues).
|
||||
|
||||
If you like this project you may support it by [donating](https://www.paypal.me/fezvrasta), starring this repository or reporting issues.
|
||||
All issues filed should be reduced to a [CodePen](http://codepen.io/rosskevin/pen/eJMMVB) test case where possible.
|
||||
All issues filed should be reduced to a [CodePen](https://codepen.io/rosskevin/pen/eJMMVB) test case where possible.
|
||||
|
||||
|
||||
## Contributing
|
||||
|
|
@ -39,13 +39,13 @@ Please read through our [contributing guidelines](CONTRIBUTING.md). Included are
|
|||
|
||||
Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://codeguide.co/), maintained by [Mark Otto](https://github.com/mdo), one of Bootstrap's founders.
|
||||
|
||||
Editor preferences are available in the [editor config](https://github.com/FezVrasta/bootstrap-material-design/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
|
||||
Editor preferences are available in the [editor config](https://github.com/FezVrasta/bootstrap-material-design/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org>.
|
||||
|
||||
|
||||
## Versioning
|
||||
|
||||
For transparency into our release cycle and in striving to maintain backward compatibility, this project is maintained under
|
||||
[the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.
|
||||
[the Semantic Versioning guidelines](https://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.
|
||||
|
||||
See [the Releases section of our GitHub project](https://github.com/fezvrasta/bootstrap-material-design/releases) for changelogs
|
||||
of each release version.
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ blog: https://blog.getbootstrap.com
|
|||
expo: https://expo.getbootstrap.com
|
||||
mkp: https://www.creative-tim.com/product/material-kit-pro?affiliate_id=87385
|
||||
mdp: https://www.creative-tim.com/product/material-dashboard-pro?affiliate_id=87385
|
||||
mdbootstrap: https://mdbootstrap.com/material-design-for-bootstrap/?utm_ref_id=26974
|
||||
mdbootstrap: https://mdbootstrap.com/products/?utm_ref_id=26974
|
||||
|
||||
cdn:
|
||||
# See https://www.srihash.org for info on how to generate the hashes
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=fezvrastagithubiobootstrapmateri" id="_carbonads_js"></script>
|
||||
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?serve=CKYI553N&placement=fezvrastagithubio" id="_carbonads_js"></script>
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
<a class="nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a>
|
||||
</li>
|
||||
<li class="nav-item partner creativetim">
|
||||
<a class="nav-link" href="{{ site.mdp }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Dashboard Pro');" target="_blank" rel="noopener">Material Dashboard</a>
|
||||
<a class="nav-link" href="{{ site.mdp }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Dashboard Pro');" target="_blank" rel="sponsored">Material Dashboard</a>
|
||||
</li>
|
||||
<li class="nav-item partner creativetim">
|
||||
<a class="nav-link" href="{{ site.mkp }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Kit Pro');" target="_blank" rel="noopener">Material Kit</a>
|
||||
<a class="nav-link" href="{{ site.mkp }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Kit Pro');" target="_blank" rel="sponsored">Material Kit</a>
|
||||
</li>
|
||||
<li class="nav-item partner mdbootstrap">
|
||||
<a class="nav-link" href="{{ site.mdbootstrap }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Design for Boostrap PRO');"
|
||||
target="_blank" rel="noopener">Material Design for Bootstrap PRO</a>
|
||||
target="_blank" rel="sponsored">Material Design for Bootstrap PRO</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
10
index.html
10
index.html
|
|
@ -83,21 +83,21 @@ gem install bootstrap-material-design -v 4.1.1
|
|||
<p class="partner mdbootstrap">
|
||||
2000+ material UI elements, 600+ material icons, 74 CSS animations, SASS files, templates, premium tutorials and many more
|
||||
</p>
|
||||
<a class="partner mdbootstrap" href="{{ site.mdbootstrap }}" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Image - mdbootstrap');">
|
||||
<a class="partner mdbootstrap" href="{{ site.mdbootstrap }}" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Image - mdbootstrap');" rel="sponsored">
|
||||
<img class="img-fluid mt-3 mx-auto" src="{{ site.baseurl }}/assets/img/mdbootstrap-alt.jpg" alt="Bootstrap Themes" width="1024" height="388">
|
||||
</a>
|
||||
<br /><br />
|
||||
<a href="{{ site.mdbootstrap }}" class="btn btn-outline-primary partner mdbootstrap" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button - mdbootstrap');">Get Material Design for Bootstrap PRO</a>
|
||||
<a href="{{ site.mdbootstrap }}" class="btn btn-outline-primary partner mdbootstrap" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button - mdbootstrap');" rel="sponsored">Get Material Design for Bootstrap PRO</a>
|
||||
|
||||
<h3 class="partner creativetim">Official Pro Kits</h3>
|
||||
<p class="partner creativetim">
|
||||
Take Material Design for Bootstrap 4 to the next level with official Material Kit Pro and Material Dashboard Pro.
|
||||
</p>
|
||||
<a class="partner creativetim" href="{{ site.mkp }}" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Image - creativetim');">
|
||||
<a class="partner creativetim" href="{{ site.mkp }}" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Image - creativetim');" rel="sponsored">
|
||||
<img class="img-fluid mt-3 mx-auto" src="{{ site.baseurl }}/assets/img/mk-pro-banner.jpg" alt="Bootstrap Themes" width="1024" height="388">
|
||||
</a>
|
||||
<br /><br />
|
||||
<a href="{{ site.mkp }}" class="btn btn-outline-primary partner creativetim" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button MKP - creativetim');">Material Kit Pro</a>
|
||||
<a href="{{ site.mdp }}" class="btn btn-outline-primary partner creativetim" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button MDP - creativetim');">Material Dashboard Pro</a>
|
||||
<a href="{{ site.mkp }}" class="btn btn-outline-primary partner creativetim" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button MKP - creativetim');" rel="sponsored">Material Kit Pro</a>
|
||||
<a href="{{ site.mdp }}" class="btn btn-outline-primary partner creativetim" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button MDP - creativetim');" rel="sponsored">Material Dashboard Pro</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ const Autofill = ($ => {
|
|||
const DATA_KEY = `bmd.${NAME}`;
|
||||
const JQUERY_NAME = `bmd${NAME.charAt(0).toUpperCase() + NAME.slice(1)}`;
|
||||
const JQUERY_NO_CONFLICT = $.fn[JQUERY_NAME];
|
||||
const LAST_VALUE_DATA_KEY = "bmd.last_value";
|
||||
|
||||
const Default = {};
|
||||
|
||||
|
|
@ -45,9 +46,21 @@ const Autofill = ($ => {
|
|||
setInterval(() => {
|
||||
$("input[type!=checkbox]").each((index, element) => {
|
||||
let $element = $(element);
|
||||
if ($element.val() && $element.val() !== $element.attr("value")) {
|
||||
|
||||
let previousValue = $element.data(LAST_VALUE_DATA_KEY);
|
||||
if (previousValue === undefined) {
|
||||
previousValue = $element.attr("value");
|
||||
}
|
||||
if (previousValue === undefined) {
|
||||
previousValue = "";
|
||||
}
|
||||
|
||||
let currentValue = $element.val();
|
||||
if (currentValue !== previousValue) {
|
||||
$element.trigger("change");
|
||||
}
|
||||
|
||||
$element.data(LAST_VALUE_DATA_KEY, currentValue);
|
||||
});
|
||||
}, 100);
|
||||
}
|
||||
|
|
@ -61,13 +74,25 @@ const Autofill = ($ => {
|
|||
let $inputs = $(event.currentTarget)
|
||||
.closest("form")
|
||||
.find("input")
|
||||
.not("[type=file]");
|
||||
.not("[type=file], [type=date]");
|
||||
focused = setInterval(() => {
|
||||
$inputs.each((index, element) => {
|
||||
let $element = $(element);
|
||||
if ($element.val() !== $element.attr("value")) {
|
||||
|
||||
let previousValue = $element.data(LAST_VALUE_DATA_KEY);
|
||||
if (previousValue === undefined) {
|
||||
previousValue = $element.attr("value");
|
||||
}
|
||||
if (previousValue === undefined) {
|
||||
previousValue = "";
|
||||
}
|
||||
|
||||
let currentValue = $element.val();
|
||||
if (currentValue !== previousValue) {
|
||||
$element.trigger("change");
|
||||
}
|
||||
|
||||
$element.data(LAST_VALUE_DATA_KEY, currentValue);
|
||||
});
|
||||
}, 100);
|
||||
})
|
||||
|
|
|
|||
|
|
@ -89,6 +89,9 @@ const Drawer = ($ => {
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
$(".bmd-layout-drawer").hide();
|
||||
this.$element.show();
|
||||
this.$toggles.attr("aria-expanded", true);
|
||||
this.$element.attr("aria-expanded", true);
|
||||
this.$element.attr("aria-hidden", false);
|
||||
|
|
|
|||
32
package.json
32
package.json
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "bootstrap-material-design",
|
||||
"description": "Material Design for Bootstrap 4",
|
||||
"version": "4.1.1",
|
||||
"version": "4.1.2",
|
||||
"keywords": [
|
||||
"material",
|
||||
"design",
|
||||
|
|
@ -45,24 +45,24 @@
|
|||
},
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.0.0-beta.38",
|
||||
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.38",
|
||||
"@babel/preset-env": "^7.0.0-beta.38",
|
||||
"babel-core": "^6.25.0",
|
||||
"babel-minify": "^0.2.0",
|
||||
"@babel/core": "^7.4.4",
|
||||
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
|
||||
"@babel/preset-env": "^7.4.4",
|
||||
"babel-core": "^6.26.3",
|
||||
"babel-minify": "^0.5.0",
|
||||
"babel-plugin-module-resolver": "3",
|
||||
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
|
||||
"bootstrap": "^4.0.0",
|
||||
"bootstrap": "^4.3.1",
|
||||
"cssnano-cli": "^1.0.5",
|
||||
"jquery": ">=3.0.0",
|
||||
"node-sass": "^4.5.3",
|
||||
"node-sass-tilde-importer": "^1.0.0",
|
||||
"popper.js": "^1.11.0",
|
||||
"prettier": "^1.5.3",
|
||||
"rollup": "^0.50.0",
|
||||
"rollup-plugin-babel": "^4.0.0-beta.0",
|
||||
"rollup-plugin-commonjs": "^8.2.6",
|
||||
"rollup-plugin-node-resolve": "^3.0.2"
|
||||
"jquery": ">=3.4.0",
|
||||
"node-sass": "^4.12.0",
|
||||
"node-sass-tilde-importer": "^1.0.2",
|
||||
"popper.js": "^1.15.0",
|
||||
"prettier": "^1.17.0",
|
||||
"rollup": "^1.11.2",
|
||||
"rollup-plugin-babel": "^4.3.2",
|
||||
"rollup-plugin-commonjs": "^9.3.4",
|
||||
"rollup-plugin-node-resolve": "^4.2.3"
|
||||
},
|
||||
"files": [
|
||||
"dist",
|
||||
|
|
|
|||
|
|
@ -8,14 +8,15 @@ const babelOptions = JSON.parse(fs.readFileSync('./.babelrc'));
|
|||
export default {
|
||||
output: {
|
||||
format: 'umd',
|
||||
},
|
||||
globals: {
|
||||
jquery: 'jQuery',
|
||||
'popper.js': 'Popper',
|
||||
},
|
||||
},
|
||||
external: ['jquery', 'popper.js'],
|
||||
plugins: [
|
||||
babel(Object.assign(babelOptions, {
|
||||
exclude: 'node_modules/**', // only transpile our source code
|
||||
externalHelpersWhitelist: [
|
||||
// Include only required helpers
|
||||
'defineProperties',
|
||||
|
|
@ -27,7 +28,7 @@ export default {
|
|||
],
|
||||
}) ),
|
||||
resolve({
|
||||
module: true,
|
||||
mainFields: ['module', 'main'], // Default: ['module', 'main']
|
||||
}),
|
||||
cjs({
|
||||
include: ['node_modules/bootstrap/**', 'node_modules/jquery/**'],
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
// Mixins to allow creation of additional custom drawer sizes when using the defaults at the same time
|
||||
|
||||
@mixin bmd-drawer-x-out($size) {
|
||||
@each $side, $abbrev in (left: l, right: r) {
|
||||
&.bmd-drawer-f-#{$abbrev} {
|
||||
|
||||
@each $side,
|
||||
$abbrev in (left: l, right: r) {
|
||||
#{if(&, "&", "*")}.bmd-drawer-f-#{$abbrev} {
|
||||
>.bmd-layout-drawer {
|
||||
// position
|
||||
top: 0;
|
||||
|
|
@ -12,13 +14,11 @@
|
|||
height: 100%;
|
||||
|
||||
@if $side==left {
|
||||
transform: translateX(
|
||||
-$size - 10px
|
||||
); // initial position of drawer (closed), way off screen
|
||||
} @else {
|
||||
transform: translateX(
|
||||
$size + 10px
|
||||
); // initial position of drawer (closed), way off screen
|
||||
transform: translateX(-$size - 10px); // initial position of drawer (closed), way off screen
|
||||
}
|
||||
|
||||
@else {
|
||||
transform: translateX($size + 10px); // initial position of drawer (closed), way off screen
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -31,8 +31,10 @@
|
|||
}
|
||||
|
||||
@mixin bmd-drawer-y-out($size) {
|
||||
@each $side, $abbrev in (top: t, bottom: b) {
|
||||
&.bmd-drawer-f-#{$abbrev} {
|
||||
|
||||
@each $side,
|
||||
$abbrev in (top: t, bottom: b) {
|
||||
#{if(&, "&", "*")}.bmd-drawer-f-#{$abbrev} {
|
||||
>.bmd-layout-drawer {
|
||||
// position
|
||||
#{$side}: 0;
|
||||
|
|
@ -42,13 +44,11 @@
|
|||
height: $size;
|
||||
|
||||
@if $side==top {
|
||||
transform: translateY(
|
||||
-$size - 10px
|
||||
); // initial position of drawer (closed), way off screen
|
||||
} @else {
|
||||
transform: translateY(
|
||||
$size + 10px
|
||||
); // initial position of drawer (closed), way off screen
|
||||
transform: translateY(-$size - 10px); // initial position of drawer (closed), way off screen
|
||||
}
|
||||
|
||||
@else {
|
||||
transform: translateY($size + 10px); // initial position of drawer (closed), way off screen
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -62,15 +62,20 @@
|
|||
@function bmd-drawer-breakpoint-name($breakpoint, $suffix: "") {
|
||||
// e.g. &, &-sm, &-md, &-lg
|
||||
$name: "&-#{$breakpoint}#{$suffix}";
|
||||
|
||||
@if $breakpoint==xs {
|
||||
$name: "&";
|
||||
}
|
||||
|
||||
@return $name;
|
||||
}
|
||||
|
||||
@mixin bmd-drawer-x-in($size) {
|
||||
@each $side, $abbrev in (left: l, right: r) {
|
||||
&.bmd-drawer-f-#{$abbrev} {
|
||||
|
||||
@each $side,
|
||||
$abbrev in (left: l, right: r) {
|
||||
#{if(&, "&", "*")}.bmd-drawer-f-#{$abbrev} {
|
||||
|
||||
// Push - drawer will push the header and content (default behavior)
|
||||
>.bmd-layout-header {
|
||||
width: calc(100% - #{$size});
|
||||
|
|
@ -89,8 +94,11 @@
|
|||
}
|
||||
|
||||
@mixin bmd-drawer-y-in($size) {
|
||||
@each $side, $abbrev in (top: t, bottom: b) {
|
||||
&.bmd-drawer-f-#{$abbrev} {
|
||||
|
||||
@each $side,
|
||||
$abbrev in (top: t, bottom: b) {
|
||||
#{if(&, "&", "*")}.bmd-drawer-f-#{$abbrev} {
|
||||
|
||||
// 1. Push - drawer will push the header or content
|
||||
>.bmd-layout-header {
|
||||
@if $side==top {
|
||||
|
|
@ -125,7 +133,10 @@
|
|||
@if $breakpoint==xs {
|
||||
// bmd-drawer-in marker class (non-responsive)
|
||||
@include bmd-drawer-x-in($size);
|
||||
} @else {
|
||||
}
|
||||
|
||||
@else {
|
||||
|
||||
// responsive class
|
||||
@include media-breakpoint-up($breakpoint) {
|
||||
// bmd-drawer-f-(left and right) styles
|
||||
|
|
@ -148,7 +159,10 @@
|
|||
@if $breakpoint==xs {
|
||||
// bmd-drawer-in marker class (non-responsive)
|
||||
@include bmd-drawer-y-in($size);
|
||||
} @else {
|
||||
}
|
||||
|
||||
@else {
|
||||
|
||||
// responsive class
|
||||
@include media-breakpoint-up($breakpoint) {
|
||||
// bmd-drawer-f-(left and right) styles
|
||||
|
|
@ -162,8 +176,10 @@
|
|||
@mixin bmd-drawer-x-overlay() {
|
||||
@include bmd-layout-backdrop-in();
|
||||
|
||||
@each $side, $abbrev in (left: l, right: r) {
|
||||
@each $side,
|
||||
$abbrev in (left: l, right: r) {
|
||||
&.bmd-drawer-f-#{$abbrev} {
|
||||
|
||||
>.bmd-layout-header,
|
||||
>.bmd-layout-content {
|
||||
width: 100%;
|
||||
|
|
@ -176,7 +192,8 @@
|
|||
@mixin bmd-drawer-y-overlay() {
|
||||
@include bmd-layout-backdrop-in();
|
||||
|
||||
@each $side, $abbrev in (top: t, bottom: b) {
|
||||
@each $side,
|
||||
$abbrev in (top: t, bottom: b) {
|
||||
&.bmd-drawer-f-#{$abbrev} {
|
||||
>.bmd-layout-header {
|
||||
@if $side==top {
|
||||
|
|
@ -214,7 +231,9 @@
|
|||
&.bmd-drawer-overlay {
|
||||
@include bmd-drawer-x-overlay();
|
||||
}
|
||||
} @else {
|
||||
}
|
||||
|
||||
@else {
|
||||
@include media-breakpoint-down($breakpoint) {
|
||||
// overlay responsive class
|
||||
@include bmd-drawer-x-overlay();
|
||||
|
|
@ -242,7 +261,9 @@
|
|||
&.bmd-drawer-overlay {
|
||||
@include bmd-drawer-y-overlay();
|
||||
}
|
||||
} @else {
|
||||
}
|
||||
|
||||
@else {
|
||||
@include media-breakpoint-down($breakpoint) {
|
||||
// overlay responsive class
|
||||
@include bmd-drawer-y-overlay();
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
@mixin bmd-disabled() {
|
||||
|
||||
fieldset[disabled][disabled] &,
|
||||
&.disabled,
|
||||
&:disabled,
|
||||
|
|
@ -8,6 +9,7 @@
|
|||
}
|
||||
|
||||
@mixin bmd-selection-color() {
|
||||
|
||||
.radio label,
|
||||
.radio-inline,
|
||||
.checkbox label,
|
||||
|
|
@ -34,6 +36,7 @@
|
|||
label:has(input[type=checkbox][disabled]),
|
||||
// css 4
|
||||
fieldset[disabled] & {
|
||||
|
||||
&,
|
||||
&:hover,
|
||||
&:focus {
|
||||
|
|
@ -57,12 +60,14 @@
|
|||
&::after {
|
||||
border-color: $color;
|
||||
}
|
||||
|
||||
&::before {
|
||||
background-color: $color;
|
||||
}
|
||||
}
|
||||
|
||||
@mixin bmd-form-color($label-color, $label-color-focus, $border-color) {
|
||||
|
||||
[class^='bmd-label'],
|
||||
[class*=' bmd-label'] {
|
||||
color: $label-color;
|
||||
|
|
@ -71,43 +76,29 @@
|
|||
// override BS and keep the border-color normal/grey so that overlaid focus animation draws attention
|
||||
.form-control {
|
||||
// underline animation color on focus
|
||||
$underline-background-image: linear-gradient(
|
||||
to top,
|
||||
$underline-background-image: linear-gradient(to top,
|
||||
$label-color-focus 2px,
|
||||
fade-out($label-color-focus, 1) 2px
|
||||
),
|
||||
linear-gradient(
|
||||
to top,
|
||||
fade-out($label-color-focus, 1) 2px),
|
||||
linear-gradient(to top,
|
||||
$input-border-color 1px,
|
||||
fade-out($input-border-color, 1) 1px
|
||||
);
|
||||
$underline-background-image-invalid: linear-gradient(
|
||||
to top,
|
||||
fade-out($input-border-color, 1) 1px);
|
||||
$underline-background-image-invalid: linear-gradient(to top,
|
||||
$bmd-invalid-underline 2px,
|
||||
fade-out($bmd-invalid-underline, 1) 2px
|
||||
),
|
||||
linear-gradient(
|
||||
to top,
|
||||
fade-out($bmd-invalid-underline, 1) 2px),
|
||||
linear-gradient(to top,
|
||||
$input-border-color 1px,
|
||||
fade-out($input-border-color, 1) 1px
|
||||
);
|
||||
$underline-background-image-readonly: linear-gradient(
|
||||
to top,
|
||||
fade-out($input-border-color, 1) 1px);
|
||||
$underline-background-image-readonly: linear-gradient(to top,
|
||||
$bmd-readonly-underline 1px,
|
||||
fade-out($bmd-readonly-underline, 1) 1px
|
||||
),
|
||||
linear-gradient(
|
||||
to top,
|
||||
fade-out($bmd-readonly-underline, 1) 1px),
|
||||
linear-gradient(to top,
|
||||
$input-border-color 1px,
|
||||
fade-out($input-border-color, 1) 1px
|
||||
);
|
||||
$underline-background-image-disabled: linear-gradient(
|
||||
to right,
|
||||
fade-out($input-border-color, 1) 1px);
|
||||
$underline-background-image-disabled: linear-gradient(to right,
|
||||
$input-border-color 0%,
|
||||
$input-border-color 30%,
|
||||
transparent 30%,
|
||||
transparent 100%
|
||||
);
|
||||
transparent 100%);
|
||||
|
||||
// bg image is always there, we just need to reveal it
|
||||
&,
|
||||
|
|
@ -131,18 +122,23 @@
|
|||
|
||||
// allow underline focus image and validation images to coexist
|
||||
&.form-control-success {
|
||||
|
||||
&,
|
||||
.is-focused & {
|
||||
background-image: $underline-background-image, $form-icon-success;
|
||||
}
|
||||
}
|
||||
|
||||
&.form-control-warning {
|
||||
|
||||
&,
|
||||
.is-focused & {
|
||||
background-image: $underline-background-image, $form-icon-warning;
|
||||
}
|
||||
}
|
||||
|
||||
&.form-control-danger {
|
||||
|
||||
&,
|
||||
.is-focused & {
|
||||
background-image: $underline-background-image, $form-icon-danger;
|
||||
|
|
@ -152,11 +148,11 @@
|
|||
|
||||
.is-focused,
|
||||
// may or may not be a form-group or bmd-form-group
|
||||
&.is-focused {
|
||||
#{if(&, "&", "*")}.is-focused {
|
||||
// on focus set borders and labels to the validation color
|
||||
|
||||
// Use the BS provided mixin for the bulk of the color
|
||||
@include form-validation-state("valid", $label-color);
|
||||
@include form-validation-state("valid", $label-color, "none");
|
||||
|
||||
[class^='bmd-label'],
|
||||
[class*=' bmd-label'] {
|
||||
|
|
@ -192,15 +188,12 @@
|
|||
}
|
||||
|
||||
@mixin bmd-form-size-variant($font-size, $label-top-margin, $variant-padding-y, $variant-line-height, $form-group-context: null) {
|
||||
$variant-input-height: (
|
||||
($font-size * $variant-line-height) + ($variant-padding-y * 2)
|
||||
);
|
||||
$variant-input-height: (($font-size * $variant-line-height) + ($variant-padding-y * 2));
|
||||
$static-font-size: ($bmd-bmd-label-static-size-ratio * $font-size);
|
||||
$help-font-size: ($bmd-help-size-ratio * $font-size);
|
||||
|
||||
$label-static-top: $label-top-margin;
|
||||
$label-placeholder-top: $label-top-margin + $static-font-size +
|
||||
$variant-padding-y;
|
||||
$label-placeholder-top: $label-top-margin + $static-font-size + $variant-padding-y;
|
||||
|
||||
//@debug "font-size: #{$font-size} static-font-size: #{$static-font-size} help-font-size: #{$help-font-size} form-group-context: #{$form-group-context} ";
|
||||
|
||||
|
|
@ -278,9 +271,9 @@
|
|||
}
|
||||
|
||||
// floating focused/filled will look like static
|
||||
&.is-focused,
|
||||
#{if(&, "&", "*")}.is-focused,
|
||||
.is-focused,
|
||||
&.is-filled,
|
||||
#{if(&, "&", "*")}.is-filled,
|
||||
.is-filled {
|
||||
.bmd-label-floating {
|
||||
@include bmd-label-static($label-static-top, $static-font-size);
|
||||
|
|
@ -291,6 +284,7 @@
|
|||
.bmd-label-static {
|
||||
@include bmd-label-static($label-static-top, $static-font-size);
|
||||
}
|
||||
|
||||
// #559 Fix for webkit/chrome autofill - rule must be separate because it breaks firefox otherwise #731
|
||||
//input:-webkit-autofill ~ .bmd-label-floating { FIXME: confirm that the autofill js generation of change event makes this unnecessary
|
||||
// @include bmd-label-static($label-top, $static-font-size, $static-line-height);
|
||||
|
|
@ -303,6 +297,7 @@
|
|||
|
||||
// validation icon placement
|
||||
.form-control {
|
||||
|
||||
&.form-control-success,
|
||||
&.form-control-warning,
|
||||
&.form-control-danger {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user