From 5ea2f1e4ec597980c8342818bcf8b9955b374dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bend=C3=ADk?= Date: Sat, 20 Jan 2018 09:23:10 +0100 Subject: [PATCH] =?UTF-8?q?Presun=20menu=20port=C3=A1l,=20o=20linuxe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/alpha/scss/_header.scss | 19 ++++++++++++++- static/alpha/scss/_layout.scss | 4 ++++ static/js/menu.js | 25 ++++++++++++++++++++ templates/template_overrides/alpha/base.html | 10 ++++---- 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/static/alpha/scss/_header.scss b/static/alpha/scss/_header.scss index 1496e6e64..11ecdee36 100644 --- a/static/alpha/scss/_header.scss +++ b/static/alpha/scss/_header.scss @@ -155,6 +155,8 @@ } #search_panel { + overflow: hidden; + .search-input { box-shadow: 0px 0px 3px -1px rgba(0, 0, 0, 0.5); } @@ -175,6 +177,12 @@ } } +#menu_panel { + .module { + display: none; + } +} + @media #{$large-down} { #header { .search-link { @@ -229,13 +237,20 @@ display: none; } } + + .module { + display: block; + } + } + + .menu, #main_menu { + border-bottom: 1px solid $light-border-color; } #main_menu { position: static; padding: $base-margin-reduced 0; margin: 0; - border-bottom: 1px solid $light-border-color; li { float: none; padding: 0; @@ -305,6 +320,8 @@ #search_panel { display: block; + bottom: 0; + margin: $base-margin 0; .search-input { box-shadow: none; border: 1px solid $light-border-color; diff --git a/static/alpha/scss/_layout.scss b/static/alpha/scss/_layout.scss index e6a732a4b..2f4078455 100644 --- a/static/alpha/scss/_layout.scss +++ b/static/alpha/scss/_layout.scss @@ -216,4 +216,8 @@ $small-header-height: sprite-height(logo_mini) + ($base-margin-reduced * 2); #main_content { margin-top: 0px; } + + #module_block_linux, #module_block_portal, #module_block_recommended, #module_block_support { + display: none; + } } diff --git a/static/js/menu.js b/static/js/menu.js index 6770273f4..6ce91ee75 100644 --- a/static/js/menu.js +++ b/static/js/menu.js @@ -20,8 +20,33 @@ var registerUserPanel = function(root) { }); }; +var copyMenu = function(root) { + if (root !== document.body) { + return; + } + + var clone; + var menuPanel = _.id('menu_panel'); + var searchPanel = _.id('search_panel'); + var blockLinux = _.id('module_block_linux'); + var blockPortal = _.id('module_block_portal'); + if (menuPanel === null || searchPanel === null || blockLinux === null || blockPortal === null) { + return; + } + + clone = blockPortal.cloneNode(true); + clone.setAttribute('id', clone.getAttribute('id') + '_clone'); + menuPanel.insertBefore(clone, searchPanel); + + clone = blockLinux.cloneNode(true); + clone.setAttribute('id', clone.getAttribute('id') + '_clone'); + menuPanel.insertBefore(clone, searchPanel); + console.log(blockLinux.cloneNode(true)); +}; + _.onLoad(function(e) { registerUserPanel(e.memo); + copyMenu(e.memo); }); var onClick = function(e) { diff --git a/templates/template_overrides/alpha/base.html b/templates/template_overrides/alpha/base.html index 0019f98c4..836ec294f 100644 --- a/templates/template_overrides/alpha/base.html +++ b/templates/template_overrides/alpha/base.html @@ -95,32 +95,32 @@

Správy