Skip to content

Commit 512e591

Browse files
committed
new #right off-canvas
new right.less file added rewrite layout.less and menu.less files remove affixed #menu added sticky #left option sidebar-left-mini #menu hover option changed
1 parent 0599fbb commit 512e591

133 files changed

Lines changed: 1665 additions & 987 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

dist/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* bootstrap-admin-template - Free Admin Template Based On Twitter Bootstrap 3.x
3-
* @version 2.4.1
3+
* @version 2.4.2
44
* @license MIT
55
* @link https://github.com/puikinsh/Bootstrap-Admin-Template
66
*/

dist/app.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core.js

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* bootstrap-admin-template - Free Admin Template Based On Twitter Bootstrap 3.x
3-
* @version 2.4.1
3+
* @version 2.4.2
44
* @license MIT
55
* @link https://github.com/puikinsh/Bootstrap-Admin-Template
66
*/
@@ -47,7 +47,8 @@
4747

4848
var $navBar = $('nav.navbar'),
4949
$body = $('body'),
50-
$menu = $('#menu');
50+
$menu = $('#menu'),
51+
$left = $('#left');
5152

5253
function addPaddingTop(el, val) {
5354
el.css('padding-top', val);
@@ -66,20 +67,8 @@
6667
$body.css('padding-top', bodyPadTop);
6768

6869
if ($body.hasClass('menu-affix')) {
69-
$menu.affix({
70-
offset: {
71-
top: $menu.offset().top
72-
}
73-
}).css({
74-
height: function height() {
75-
if ($(window).width() < 768) {
76-
return $(window).height();
77-
} else {
78-
return $(window).height();
79-
}
80-
},
81-
top: bodyPadTop - 1,
82-
bottom: 0
70+
$left.css({
71+
top: bodyPadTop
8372
});
8473
console.log($navBar.outerHeight(true));
8574
}
@@ -168,7 +157,6 @@
168157
;(function ($, Metis) {
169158
var $body = $('body'),
170159
$leftToggle = $('.toggle-left'),
171-
$rightToggle = $('.toggle-right'),
172160
$count = 0;
173161

174162
Metis.metisAnimatePanel = function () {
@@ -196,25 +184,6 @@
196184
} else {
197185
$leftToggle.addClass('hidden');
198186
}
199-
if ($('#right').length) {
200-
$rightToggle.on(Metis.buttonPressedEvent, function (e) {
201-
switch (true) {
202-
// Close right panel
203-
case $body.hasClass("sidebar-right-opened"):
204-
$body.removeClass("sidebar-right-opened");
205-
break;
206-
default:
207-
// Open right panel
208-
$body.addClass("sidebar-right-opened");
209-
if (!$body.hasClass("sidebar-left-mini") & !$body.hasClass("sidebar-left-hidden")) {
210-
$body.addClass("sidebar-left-mini");
211-
}
212-
}
213-
e.preventDefault();
214-
});
215-
} else {
216-
$rightToggle.addClass('hidden');
217-
}
218187
};
219188
return Metis;
220189
})(jQuery, Metis || {});

dist/core.min.js

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

dist/main.css

Lines changed: 16 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/**
22
* bootstrap-admin-template - Free Admin Template Based On Twitter Bootstrap 3.x
3-
* @version 2.4.1
3+
* @version 2.4.2
44
* @license MIT
55
* @link https://github.com/puikinsh/Bootstrap-Admin-Template
66
*/
77
/* ==========================================================================
88
metisAdmin: Base
99
========================================================================== */
1010
body {
11-
transition: all 0.3s ease-in-out;
11+
font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
1212
}
1313
/*********************************************************/
1414
/* Layout Styles */
@@ -59,8 +59,7 @@ body {
5959
margin: 0 auto;
6060
position: relative;
6161
}
62-
#left,
63-
#right {
62+
#left {
6463
transition: all 0.3s ease-in-out;
6564
width: 250px;
6665
z-index: 999;
@@ -69,29 +68,13 @@ body {
6968
position: absolute;
7069
left: -250px;
7170
}
72-
#right {
73-
position: fixed;
74-
top: 0;
75-
bottom: 0;
76-
overflow-y: auto;
77-
right: -250px;
78-
}
7971
.sidebar-left-opened #left {
8072
left: 0;
8173
}
82-
.sidebar-right-opened {
83-
position: relative;
84-
right: 250px;
85-
}
86-
.sidebar-right-opened #right {
87-
right: 0;
88-
}
89-
.sidebar-right-opened.fixed .navbar-fixed-top {
90-
right: 250px;
91-
}
9274
@media (min-width: 768px) {
9375
#left {
94-
position: relative;
76+
position: -webkit-sticky;
77+
position: sticky;
9578
float: left;
9679
left: auto;
9780
}
@@ -106,13 +89,6 @@ body {
10689
transition: all 0.3s ease-in-out;
10790
overflow: hidden;
10891
}
109-
.sidebar-right-opened {
110-
right: 0;
111-
margin-right: 250px;
112-
}
113-
.sidebar-right-opened .navbar-fixed-top {
114-
margin-right: 250px;
115-
}
11692
}
11793
@media (min-width: 1200px) {
11894
body.boxed {
@@ -132,6 +108,14 @@ body {
132108
}
133109
}
134110
/* ================== END Template Layout ============== */
111+
/*********************************************************/
112+
/* right onoffcanvas */
113+
/*********************************************************/
114+
#right {
115+
width: 250px;
116+
overflow-y: auto;
117+
padding: 1rem;
118+
}
135119
/* BEGIN TOP bar */
136120
#top .navbar {
137121
margin-bottom: 0;
@@ -369,58 +353,22 @@ body {
369353
#menu > li ul a:hover {
370354
background-color: rgba(0, 0, 0, 0.1);
371355
}
372-
#menu.affix {
373-
position: fixed;
374-
width: 250px;
375-
overflow-x: hidden;
376-
overflow-y: hidden;
377-
-webkit-overflow-scrolling: touch;
378-
}
379-
#menu.affix:hover {
380-
overflow-y: scroll;
381-
}
382356
@media (min-width: 768px) {
383-
body:not(.sidebar-left-mini) #menu li.active > ul,
384-
#menu.affix li > ul {
385-
position: relative;
386-
top: auto !important;
387-
left: auto !important;
388-
right: auto !important;
389-
}
390-
body:not(.sidebar-left-mini) #menu:not(.affix) li.active > ul {
391-
display: inherit;
392-
}
393-
#menu li > ul,
394-
.sidebar-left-mini #menu li > ul {
357+
.sidebar-left-mini #menu > li > ul {
395358
position: absolute;
396359
top: 0;
397360
left: 100%;
398361
box-shadow: none;
399362
min-width: 200px;
400363
z-index: 1;
401364
background-color: rgba(0, 0, 0, 0.8);
402-
}
403-
#menu:not(.affix) li > ul,
404-
.sidebar-left-mini #menu:not(.affix) li > ul {
405365
display: none;
406-
}
407-
.sidebar-left-mini #menu > li > ul {
408366
top: 100%;
409367
}
410-
#menu li > ul > li > ul {
411-
top: 0;
412-
}
413-
.side-right #menu li > ul {
414-
left: auto;
415-
right: 100%;
416-
}
417-
#menu:not(.affix) li:hover > ul {
368+
.sidebar-left-mini #menu > li:hover > ul {
418369
display: inherit;
419370
visibility: visible;
420371
}
421-
.sidebar-left-mini #menu.affix {
422-
position: relative !important;
423-
}
424372
}
425373
@media (min-width: 768px) {
426374
.sidebar-left-mini #menu > li > a .fa {
@@ -435,7 +383,7 @@ body {
435383
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05);
436384
position: absolute;
437385
left: 100%;
438-
top: -1px;
386+
top: 0;
439387
z-index: 1;
440388
background: rgba(0, 0, 0, 0.85);
441389
display: none;
@@ -445,12 +393,6 @@ body {
445393
display: block;
446394
min-width: 200px;
447395
}
448-
.sidebar-left-mini.side-right #menu > li > a .link-title {
449-
border-right-width: 0;
450-
border-left: 1px solid rgba(0, 0, 0, 0.1);
451-
left: auto;
452-
right: 100%;
453-
}
454396
}
455397
body:not(.sidebar-left-mini) #menu .nav-header {
456398
padding: 3px 15px !important;

dist/main.min.css

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

0 commit comments

Comments
 (0)