From 221c36268eb093875571faf933d798d52c97a030 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Tue, 10 Mar 2015 17:32:00 +0100 Subject: [PATCH] Better main panel centering --- css/tarteaucitron.css | 1 + tarteaucitron.js | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/css/tarteaucitron.css b/css/tarteaucitron.css index 5e9540f..763bb8e 100644 --- a/css/tarteaucitron.css +++ b/css/tarteaucitron.css @@ -346,6 +346,7 @@ background: #fff; color: #333; font-size: 13px; + margin-bottom: 3px; margin-left: 7px; padding: 4px 10px; } diff --git a/tarteaucitron.js b/tarteaucitron.js index 63c078c..0370ac6 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -721,10 +721,10 @@ var tarteaucitron = { if (document.getElementById('tarteaucitronScrollbarParent') !== null && document.getElementById('tarteaucitronScrollbarChild') !== null) { // media query - if (e[a + 'Width'] <= 767) { - scrollbarMarginRight = 12; - } else if (e[a + 'Width'] <= 479) { + if (e[a + 'Width'] <= 479) { tarteaucitron.userInterface.css('tarteaucitronScrollbarAdjust', 'marginLeft', '11px'); + } else if (e[a + 'Width'] <= 767) { + scrollbarMarginRight = 12; } scrollbarWidthParent = document.getElementById('tarteaucitronScrollbarParent').offsetWidth; @@ -746,6 +746,14 @@ var tarteaucitron = { if (mainTop < 0) { mainTop = 0; } + + if (document.getElementById('tarteaucitronMainLineOffset') !== null) { + if (document.getElementById('tarteaucitron').offsetHeight < (windowInnerHeight / 3)) { + mainTop -= document.getElementById('tarteaucitronMainLineOffset').offsetHeight; + } + } + + // apply tarteaucitron.userInterface.css('tarteaucitron', 'top', mainTop + 'px'); }