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

working with local BS4 branch (PR submitted) that flexes the navbar

Browse Source
This commit is contained in:
Kevin Ross 2016-01-20 14:55:24 -06:00
parent 7bbc8547f4
commit 0aaa118bc4
4 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scss/.scss-lint.yml
View File

@ -123,6 +123,7 @@ linters:
"flex-align",
"flex-shrink",
"align-items",
"align-self",
"justify-content",
"padding",
"padding-top",

75
scss/_bootstrap.scss
View File

@ -1,47 +1,50 @@
// FIXME: temporarily use the local bootstrap - waiting on flex enable navbar https://github.com/twbs/bootstrap/pull/18976
//@import "../bower_components/bootstrap/scss/
// Core variables and mixins
@import "../bower_components/bootstrap/scss/custom";
@import "../bower_components/bootstrap/scss/variables";
@import "../bower_components/bootstrap/scss/mixins";
//@import "../../bootstrap/scss/custom";
@import "../../bootstrap/scss/variables";
@import "../../bootstrap/scss/mixins";
// Reset and dependencies
@import "../bower_components/bootstrap/scss/normalize";
@import "../bower_components/bootstrap/scss/print";
@import "../../bootstrap/scss/normalize";
@import "../../bootstrap/scss/print";
// Core CSS
@import "../bower_components/bootstrap/scss/reboot";
@import "../bower_components/bootstrap/scss/type";
@import "../bower_components/bootstrap/scss/images";
@import "../bower_components/bootstrap/scss/code";
@import "../bower_components/bootstrap/scss/grid";
@import "../bower_components/bootstrap/scss/tables";
@import "../bower_components/bootstrap/scss/forms";
@import "../bower_components/bootstrap/scss/buttons";
@import "../../bootstrap/scss/reboot";
@import "../../bootstrap/scss/type";
@import "../../bootstrap/scss/images";
@import "../../bootstrap/scss/code";
@import "../../bootstrap/scss/grid";
@import "../../bootstrap/scss/tables";
@import "../../bootstrap/scss/forms";
@import "../../bootstrap/scss/buttons";
// Components
@import "../bower_components/bootstrap/scss/animation";
@import "../bower_components/bootstrap/scss/dropdown";
@import "../bower_components/bootstrap/scss/button-group";
@import "../bower_components/bootstrap/scss/input-group";
@import "../bower_components/bootstrap/scss/custom-forms";
@import "../bower_components/bootstrap/scss/nav";
@import "../bower_components/bootstrap/scss/navbar";
@import "../bower_components/bootstrap/scss/card";
@import "../bower_components/bootstrap/scss/breadcrumb";
@import "../bower_components/bootstrap/scss/pagination";
@import "../bower_components/bootstrap/scss/labels";
@import "../bower_components/bootstrap/scss/jumbotron";
@import "../bower_components/bootstrap/scss/alert";
@import "../bower_components/bootstrap/scss/progress";
@import "../bower_components/bootstrap/scss/media";
@import "../bower_components/bootstrap/scss/list-group";
@import "../bower_components/bootstrap/scss/responsive-embed";
@import "../bower_components/bootstrap/scss/close";
@import "../../bootstrap/scss/animation";
@import "../../bootstrap/scss/dropdown";
@import "../../bootstrap/scss/button-group";
@import "../../bootstrap/scss/input-group";
@import "../../bootstrap/scss/custom-forms";
@import "../../bootstrap/scss/nav";
@import "../../bootstrap/scss/navbar";
@import "../../bootstrap/scss/card";
@import "../../bootstrap/scss/breadcrumb";
@import "../../bootstrap/scss/pagination";
@import "../../bootstrap/scss/labels";
@import "../../bootstrap/scss/jumbotron";
@import "../../bootstrap/scss/alert";
@import "../../bootstrap/scss/progress";
@import "../../bootstrap/scss/media";
@import "../../bootstrap/scss/list-group";
@import "../../bootstrap/scss/responsive-embed";
@import "../../bootstrap/scss/close";
// Components w/ JavaScript
@import "../bower_components/bootstrap/scss/modal";
@import "../bower_components/bootstrap/scss/tooltip";
@import "../bower_components/bootstrap/scss/popover";
@import "../bower_components/bootstrap/scss/carousel";
@import "../../bootstrap/scss/modal";
@import "../../bootstrap/scss/tooltip";
@import "../../bootstrap/scss/popover";
@import "../../bootstrap/scss/carousel";
// Utility classes
@import "../bower_components/bootstrap/scss/utilities";
@import "../../bootstrap/scss/utilities";

2
scss/_forms.scss
View File

@ -4,7 +4,7 @@ form {
// reverse the above for navbars (no help expected in a navbar form)
.navbar & {
margin: 0;
margin-bottom: 0; // only adjust bottom so that pull-right flexed margin-left: auto works
.mdb-form-group {
display: inline-block;

2
scss/_switches.scss
View File

@ -31,13 +31,13 @@
display: block;
width: $mdb-switch-handle-size;
height: $mdb-switch-handle-size;
align-self: center;
content: "";
background: $mdb-switch-handle-unchecked-bg;
border-radius: 100%;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
transition: left 0.2s ease-in, background-color 0.2s ease-in, transform 0.3s ease;
transform: translateY(-50%);
align-self: center;
}
// Jelly effect on click