mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2025-10-31 16:07:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'extracting-typography' of https://github.com/kogosoftwarellc/bootstrap-material-design into kogosoftwarellc-extracting-typography

Browse Source 
# Conflicts:
#	less/material.less
#	sass/material.scss
This commit is contained in:
Kevin Ross 2015-11-19 09:30:22 -06:00
commit ed17dbf9af
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
less/_material.less
View File

@ -84,21 +84,7 @@ legend {
@import "_progress.less"; @import "_progress.less";
// Typography // Typography
.text-warning { @import "_typography.less";
color: @btn-warning;
}
.text-primary {
color: @btn-primary;
}
.text-danger {
color: @btn-danger;
}
.text-success {
color: @btn-success;
}
.text-info {
color: @btn-info;
}
@import "_tabs.less"; @import "_tabs.less";

15
less/_typography.less Normal file
View File

@ -0,0 +1,15 @@
.text-warning {
color: @btn-warning;
}
.text-primary {
color: @btn-primary;
}
.text-danger {
color: @btn-danger;
}
.text-success {
color: @btn-success;
}
.text-info {
color: @btn-info;
}