Skip to content

Commit

Permalink
Sidebar ie issue - Issue related to brand card in IE (#181)
Browse files Browse the repository at this point in the history
* adding new toolbox cards patterns

* addingbasic brand cards

* working on brand cards

* adding brand card interaction

* adding new cards styles

* making changes based on PR comments

* updating style for brancd

* removing  example of brand cards and moving it to style guide

* moved flag icon to optional dependencies

* removing unneeded JS

* removing flags icons

* adding additional toggle switch

* adding additional toggle switch

* adding additional toggle switch

* adding additional toggle switch

* cleaning up examples

* fixing issue related to brand card

* fixing/updating app header issues

* mergin master
  • Loading branch information
mkayan authored and davezen1 committed Nov 7, 2017
1 parent 90790cb commit 0500909
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
8 changes: 6 additions & 2 deletions app/styles/custom/_containers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
width: 300px;
min-width: 300px;
}
.cbp-sidebar-offset {
width: calc(100% - 300px);
}
.fixed {
.sidebar {
@include transition(top ease 0.25s);
Expand All @@ -73,7 +76,6 @@
}
}
.cbp-sidebar-offset {
width: calc(100% - 300px);
margin-left: 300px;
padding-left: 0;
}
Expand All @@ -94,6 +96,9 @@
width: 350px;
min-width: 350px;
}
.cbp-sidebar-offset {
width: calc(100% - 350px);
}
.fixed {
.sidebar {
@include transition(top ease 0.25s);
Expand All @@ -109,7 +114,6 @@
}
}
.cbp-sidebar-offset {
width: calc(100% - 350px);
margin-left: 350px;
padding-left: 0;
}
Expand Down
8 changes: 6 additions & 2 deletions app/styles/custom/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,14 @@
z-index: $zindex-navbar-fixed;
}
.heading-text{
font-size:20px;
margin-top: 10px;
font-size: 24px;
margin-top: 15px;
margin-bottom: 8px;
}

.mdl-textfield.is-dirty .mdl-textfield__label {
height: 27px; //fixing the font size shifting issue in app direcotry
}

@media (max-width: $screen-sm-max) {
.navbar-header {
Expand Down
2 changes: 1 addition & 1 deletion app/styles/vendor/_toggle-switch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ $em-base: 16 !default;
a {
display: block;
color: $white;
transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}

label,
Expand Down

0 comments on commit 0500909

Please sign in to comment.