mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2024-11-11 04:07:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #627 from Invis1ble/fix-394

Browse Source 
Fix 394
This commit is contained in:
Fez Vrasta 2015-06-29 22:33:21 +02:00
commit 18fc7137e2
4 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
less/_alerts.less Normal file → Executable file
View File

@ -4,10 +4,10 @@
.generic-variations(~"", @darkbg-text, { .generic-variations(~"", @darkbg-text, {
background-color: @material-color; background-color: @material-color;
color: @text-color; color: @material-text-color;
a, .alert-link { a, .alert-link {
color: @text-color; color: @material-text-color;
} }
}); });

26
less/_mixins-fullpalette.less Normal file → Executable file
View File

@ -8,10 +8,12 @@
.background-variations(@extra, @default) { .background-variations(@extra, @default) {
.generic-variations(@extra, @default, { .generic-variations(@extra, @default, {
background-color: @material-color; background-color: @material-color;
color: @text-color;
& when (@material-color = @btn-default) { & when (@material-color = @btn-default) {
color: @lightbg-text; color: @lightbg-text;
} }
& when not (@material-color = @btn-default) {
color: @material-text-color;
}
}); });
} }
@ -28,7 +30,7 @@
// @material-color-name ---> "red", "green", "indigo" ... // @material-color-name ---> "red", "green", "indigo" ...
// @material-color-full-name ---> "red", "green-50", "indigo-400" ... // @material-color-full-name ---> "red", "green-50", "indigo-400" ...
// @material-color ---> #f44336, #e8f5e9, #5c6bc0 ... // @material-color ---> #f44336, #e8f5e9, #5c6bc0 ...
// @text-color ---> rgba(255,255,255,0.84), rgba(0,0,0,0.84), rgba(255,255,255,0.84) ... // @material-text-color ---> rgba(255,255,255,0.84), rgba(0,0,0,0.84), rgba(255,255,255,0.84) ...
// //
.generic-variations(@extra, @default, @func) { .generic-variations(@extra, @default, @func) {
@ -40,63 +42,63 @@
@material-color-name: "default"; @material-color-name: "default";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @default; @material-color: @default;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-black@{extra} { &-black@{extra} {
@material-color-name: "black"; @material-color-name: "black";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @black; @material-color: @black;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-white@{extra} { &-white@{extra} {
@material-color-name: "white"; @material-color-name: "white";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @white; @material-color: @white;
@text-color: @lightbg-text; @material-text-color: @lightbg-text;
@func(); @func();
} }
&-inverse@{extra} { &-inverse@{extra} {
@material-color-name: "inverse"; @material-color-name: "inverse";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @inverse; @material-color: @inverse;
@text-color: contrast(@inverse, @lightbg-text, @darkbg-text, @contrast-factor); @material-text-color: contrast(@inverse, @lightbg-text, @darkbg-text, @contrast-factor);
@func(); @func();
} }
&-primary@{extra} { &-primary@{extra} {
@material-color-name: "primary"; @material-color-name: "primary";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @primary; @material-color: @primary;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-success@{extra} { &-success@{extra} {
@material-color-name: "success"; @material-color-name: "success";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @success; @material-color: @success;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-info@{extra} { &-info@{extra} {
@material-color-name: "info"; @material-color-name: "info";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @info; @material-color: @info;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-warning@{extra} { &-warning@{extra} {
@material-color-name: "warning"; @material-color-name: "warning";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @warning; @material-color: @warning;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-danger@{extra} { &-danger@{extra} {
@material-color-name: "danger"; @material-color-name: "danger";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @danger; @material-color: @danger;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
@ -109,7 +111,7 @@
&-material-@{material-color-name}@{material-color-number}@{extra} { &-material-@{material-color-name}@{material-color-number}@{extra} {
@material-color-full-name: "@{material-color-name}@{material-color-number}"; @material-color-full-name: "@{material-color-name}@{material-color-number}";
@material-color: @@material-color-full-name; @material-color: @@material-color-full-name;
@text-color: contrast(@material-color, @lightbg-text, @darkbg-text, @contrast-factor); @material-text-color: contrast(@material-color, @lightbg-text, @darkbg-text, @contrast-factor);
@func(); @func();
} }

26
less/_mixins.less Normal file → Executable file
View File

@ -8,10 +8,12 @@
.background-variations(@extra, @default) { .background-variations(@extra, @default) {
.generic-variations(@extra, @default, { .generic-variations(@extra, @default, {
background-color: @material-color; background-color: @material-color;
color: @text-color;
& when (@material-color = @btn-default) { & when (@material-color = @btn-default) {
color: @lightbg-text; color: @lightbg-text;
} }
& when not (@material-color = @btn-default) {
color: @material-text-color;
}
}); });
} }
@ -28,7 +30,7 @@
// @material-color-name ---> "red", "green", "indigo" ... // @material-color-name ---> "red", "green", "indigo" ...
// @material-color-full-name ---> "red", "green-50", "indigo-400" ... // @material-color-full-name ---> "red", "green-50", "indigo-400" ...
// @material-color ---> #f44336, #e8f5e9, #5c6bc0 ... // @material-color ---> #f44336, #e8f5e9, #5c6bc0 ...
// @text-color ---> rgba(255,255,255,0.84), rgba(0,0,0,0.84), rgba(255,255,255,0.84) ... // @material-text-color ---> rgba(255,255,255,0.84), rgba(0,0,0,0.84), rgba(255,255,255,0.84) ...
// //
@ -41,63 +43,63 @@
@material-color-name: "default"; @material-color-name: "default";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @default; @material-color: @default;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-black@{extra} { &-black@{extra} {
@material-color-name: "black"; @material-color-name: "black";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @black; @material-color: @black;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-white@{extra} { &-white@{extra} {
@material-color-name: "white"; @material-color-name: "white";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @white; @material-color: @white;
@text-color: @lightbg-text; @material-text-color: @lightbg-text;
@func(); @func();
} }
&-inverse@{extra} { &-inverse@{extra} {
@material-color-name: "inverse"; @material-color-name: "inverse";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @inverse; @material-color: @inverse;
@text-color: contrast(@inverse, @lightbg-text, @darkbg-text, @contrast-factor); @material-text-color: contrast(@inverse, @lightbg-text, @darkbg-text, @contrast-factor);
@func(); @func();
} }
&-primary@{extra} { &-primary@{extra} {
@material-color-name: "primary"; @material-color-name: "primary";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @primary; @material-color: @primary;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-success@{extra} { &-success@{extra} {
@material-color-name: "success"; @material-color-name: "success";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @success; @material-color: @success;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-info@{extra} { &-info@{extra} {
@material-color-name: "info"; @material-color-name: "info";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @info; @material-color: @info;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-warning@{extra} { &-warning@{extra} {
@material-color-name: "warning"; @material-color-name: "warning";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @warning; @material-color: @warning;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
&-danger@{extra} { &-danger@{extra} {
@material-color-name: "danger"; @material-color-name: "danger";
@material-color-full-name: @material-color-name; @material-color-full-name: @material-color-name;
@material-color: @danger; @material-color: @danger;
@text-color: @darkbg-text; @material-text-color: @darkbg-text;
@func(); @func();
} }
@ -110,7 +112,7 @@
&-material-@{material-color-name}@{material-color-number}@{extra} { &-material-@{material-color-name}@{material-color-number}@{extra} {
@material-color-full-name: "@{material-color-name}@{material-color-number}"; @material-color-full-name: "@{material-color-name}@{material-color-number}";
@material-color: @@material-color-full-name; @material-color: @@material-color-full-name;
@text-color: contrast(@material-color, @lightbg-text, @darkbg-text, @contrast-factor); @material-text-color: contrast(@material-color, @lightbg-text, @darkbg-text, @contrast-factor);
@func(); @func();
} }

8
less/_navbar.less Normal file → Executable file
View File

@ -168,10 +168,10 @@
.generic-variations(~".navbar", @primary, { .generic-variations(~".navbar", @primary, {
background-color: @material-color; background-color: @material-color;
color: @text-color; color: @material-text-color;
// deeply defined to override welljumbo class without !impotant need // deeply defined to override welljumbo class without !impotant need
.navbar-form .form-control-wrapper input.form-control::placeholder, .navbar-form input.form-control::placeholder { .navbar-form .form-control-wrapper input.form-control::placeholder, .navbar-form input.form-control::placeholder {
color: @text-color; color: @material-text-color;
} }
.dropdown-menu { .dropdown-menu {
border-radius: @dropdown-radius; border-radius: @dropdown-radius;
@ -187,10 +187,10 @@
.active > a { .active > a {
&:hover, &:hover,
&:focus { &:focus {
color: @text-color; color: @material-text-color;
} }
background-color: @material-color; background-color: @material-color;
color: @text-color; color: @material-text-color;
} }
} }
}); });