Skip to content

Commit 2ca5e7b

Browse files
author
AMJones
committed
Improves transitions, fixes IE10 issues.
1 parent a2a1d0b commit 2ca5e7b

File tree

6 files changed

+33
-23
lines changed

6 files changed

+33
-23
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"css"
1111
],
1212
"homepage": "https://www.github.com/strapless/drawer",
13-
"version": "1.1.1",
13+
"version": "1.1.2",
1414
"authors": [
1515
{
1616
"name": "Aaron M Jones",

dist/css/drawer.css

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* StrapLess Drawer v1.1.1 (http://github.com/strapless/drawer)
3-
* Licensed under MIT (https://github.com/strapless/drawer/blob/master/LICENSE)
4-
*/
2+
* StrapLess Drawer v1.1.2 (http://github.com/strapless/drawer)
3+
* Licensed under MIT (https://github.com/strapless/drawer/blob/master/LICENSE)
4+
*/
55
header .navbar-toggler {
66
-webkit-transition: .5s ease-in-out;
77
-o-transition: .5s ease-in-out;
@@ -93,7 +93,9 @@ nav.drawer .drawer-group {
9393
}
9494

9595
nav.drawer .drawer-item {
96-
display: block;
96+
display: -webkit-flex !important;
97+
display: -ms-flexbox !important;
98+
display: flex !important;
9799
}
98100

99101
nav.drawer .drawer-link, nav.drawer .drawer-item > *:not(.drawer-group) {
@@ -109,6 +111,9 @@ nav.drawer .drawer-link, nav.drawer .drawer-item > *:not(.drawer-group) {
109111
-ms-grid-row-align: center;
110112
-webkit-align-items: center;
111113
align-items: center;
114+
-webkit-flex-direction: row;
115+
-ms-flex-direction: row;
116+
flex-direction: row;
112117
}
113118

114119
nav.drawer .drawer-item-heading {
@@ -235,13 +240,19 @@ nav.drawer .drawer-hide {
235240
-ms-transform: translateX(0);
236241
transform: translateX(0);
237242
display: -webkit-flex !important;
238-
display: -ms-flexbox !important;
239-
display: flex !important;
243+
display: -ms-flexbox !important;
244+
display: flex !important;
240245
}
241246
.drawer-padding-adjust {
247+
-webkit-transition: padding-left .5s ease-in-out;
248+
-o-transition: padding-left .5s ease-in-out;
249+
transition: padding-left .5s ease-in-out;
242250
padding-left: 244px;
243251
}
244252
.drawer-margin-adjust {
253+
-webkit-transition: margin-left .5s ease-in-out;
254+
-o-transition: margin-left .5s ease-in-out;
255+
transition: margin-left .5s ease-in-out;
245256
margin-left: 244px;
246257
}
247258
.persistent:not(.on) .drawer-padding-adjust {
@@ -270,10 +281,8 @@ nav.drawer .drawer-hide {
270281
}
271282
}
272283

273-
nav.drawer + .container-fluid {
284+
nav.drawer + .container {
274285
-webkit-flex: 1 1 auto;
275286
-ms-flex: 1 1 auto;
276287
flex: 1 1 auto;
277-
margin-bottom: 1rem;
278-
width: auto;
279288
}

dist/css/drawer.min.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/drawer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jQuery.fn.extend( {
6262
/**
6363
* jQuery Plugin for managing a navigation drawer.
6464
*
65-
* @version v1.1.1
65+
* @version v1.1.2
6666
* @license https://github.com/strapless/strapless/LICENSE
6767
* @author Aaron M Jones <am@jonesiscoding.com>
6868
*/

js/drawer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* jQuery Plugin for managing a navigation drawer.
33
*
4-
* @version v1.1.1
4+
* @version v1.1.2
55
* @license https://github.com/strapless/strapless/LICENSE
66
* @author Aaron M Jones <am@jonesiscoding.com>
77
*/

scss/_drawer.scss

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
@import "drawer-mixins";
33

44
@if not($enable-framework) {
5-
/*!
6-
* StrapLess Drawer v1.1.1 (http://github.com/strapless/drawer)
7-
* Licensed under MIT (https://github.com/strapless/drawer/blob/master/LICENSE)
8-
*/
5+
/*!
6+
* StrapLess Drawer v1.1.2 (http://github.com/strapless/drawer)
7+
* Licensed under MIT (https://github.com/strapless/drawer/blob/master/LICENSE)
8+
*/
99
}
1010

1111
header .navbar-toggler {
@@ -78,14 +78,15 @@ nav.drawer {
7878
padding: 0 0 .25rem 0;
7979
}
8080
.drawer-item {
81-
display: block;
81+
display: flex !important;
8282
}
8383
.drawer-link, .drawer-item > *:not(.drawer-group) {
8484
padding: 0 1.5rem;
8585
min-height: $drawer-item-height;
8686
display: flex;
8787
flex: 1 0 auto;
8888
align-items: center;
89+
flex-direction: row;
8990
}
9091
.drawer-item-heading {
9192
color: $drawer-item-heading-color;
@@ -207,9 +208,11 @@ nav.drawer {
207208
// Automatically adjust other elements
208209
$dwu: unit($drawer-width);
209210
.drawer-padding-adjust {
211+
transition: padding-left .5s ease-in-out;
210212
padding-left: $drawer-width + space-x(md, $dwu);
211213
}
212214
.drawer-margin-adjust {
215+
transition: margin-left .5s ease-in-out;
213216
margin-left: $drawer-width + space-x(md, $dwu);
214217
}
215218
.persistent:not(.on) {
@@ -237,8 +240,6 @@ nav.drawer {
237240
}
238241
}
239242

240-
nav.drawer + .container-fluid {
243+
nav.drawer + .container {
241244
flex: 1 1 auto;
242-
margin-bottom: 1rem;
243-
width: auto;
244245
}

0 commit comments

Comments
 (0)