From c2dd679cb0e8aa057539fec2d9a80021aa88fe6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 11 Mar 2018 11:05:28 +0100 Subject: [PATCH 1/2] misc: rename sidebar to sidemenu (#22440) --- gadjo/static/css/gadjo.scss | 6 +++--- gadjo/static/js/gadjo.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gadjo/static/css/gadjo.scss b/gadjo/static/css/gadjo.scss index 0bd60a1..c6bb474 100644 --- a/gadjo/static/css/gadjo.scss +++ b/gadjo/static/css/gadjo.scss @@ -684,8 +684,8 @@ input[type=submit]:hover { background: #23282d url(texture.png); } -body[data-has-sidebar] #header, -body[data-has-sidebar] #main { +body[data-has-sidemenu] #header, +body[data-has-sidemenu] #main { margin-left: 36px; } @@ -852,7 +852,7 @@ ul#sidepage-menu li a { content: "\f00d"; /* fa-times */ } } - body[data-has-sidebar] #main, + body[data-has-sidemenu] #main, body.sidepage-expanded #main { margin-left: 0; } diff --git a/gadjo/static/js/gadjo.js b/gadjo/static/js/gadjo.js index 5fbeb89..e2b71f2 100644 --- a/gadjo/static/js/gadjo.js +++ b/gadjo/static/js/gadjo.js @@ -350,7 +350,7 @@ var gadjo_js = gadjo_js || {}; $(function () { if ($('body').data('gadjo')) { if ($('#sidepage').length == 1) { - $('body').attr('data-has-sidebar', 'true'); + $('body').attr('data-has-sidemenu', 'true'); } if ($('body[data-no-moving-header]').length == 0) { /* 440 is header image height (500px) - header height (60px) */ -- 2.17.0