From 7532d9d986a57bf157f4800cfda5bcf898c9c181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= <lukasz@holeczek.pl> Date: Mon, 31 Oct 2016 13:20:11 +0100 Subject: [PATCH] Fixed side menu issue #49 --- AJAX_Full_Project_GULP/css/style.css | 8 +++----- AJAX_Full_Project_GULP/scss/core/_mobile.scss | 8 ++------ AJAX_Starter_GULP/css/style.css | 8 +++----- AJAX_Starter_GULP/scss/core/_mobile.scss | 8 ++------ .../src/app/shared/sidebar.directive.ts | 1 - Angular2_CLI_Full_Project/src/assets/css/style.css | 8 +++----- Angular2_CLI_Full_Project/src/scss/core/_mobile.scss | 8 ++------ Angular2_CLI_Starter/src/assets/css/style.css | 8 +++----- Angular2_CLI_Starter/src/scss/core/_mobile.scss | 8 ++------ Angular_Full_Project_GULP/css/style.css | 8 +++----- Angular_Full_Project_GULP/scss/core/_mobile.scss | 8 ++------ Angular_Starter_GULP/css/style.css | 8 +++----- Angular_Starter_GULP/scss/core/_mobile.scss | 8 ++------ Static_Full_Project_GULP/css/style.css | 8 +++----- Static_Full_Project_GULP/scss/core/_mobile.scss | 8 ++------ Static_Starter_GULP/css/style.css | 8 +++----- Static_Starter_GULP/scss/core/_mobile.scss | 8 ++------ 17 files changed, 40 insertions(+), 89 deletions(-) diff --git a/AJAX_Full_Project_GULP/css/style.css b/AJAX_Full_Project_GULP/css/style.css index ec66184..5ff48ab 100644 --- a/AJAX_Full_Project_GULP/css/style.css +++ b/AJAX_Full_Project_GULP/css/style.css @@ -7643,8 +7643,8 @@ base-chart.chart { width: 100% !important; margin: 0 auto !important; } .sidebar { - width: 200px !important; - margin-left: -200px; } + left: -200px !important; + width: 200px !important; } .sidebar ul.nav { width: 200px !important; } .sidebar .sidebar-footer { @@ -7668,8 +7668,6 @@ base-chart.chart { max-width: 100%; overflow-x: hidden; } body.mobile-open .sidebar { - margin-left: 0; } - body.mobile-open .sidebar .sidebar-footer { - margin-left: 0; } + left: 0 !important; } body.mobile-open .main { margin-left: 200px !important; } } diff --git a/AJAX_Full_Project_GULP/scss/core/_mobile.scss b/AJAX_Full_Project_GULP/scss/core/_mobile.scss index 7ff6979..29565d2 100644 --- a/AJAX_Full_Project_GULP/scss/core/_mobile.scss +++ b/AJAX_Full_Project_GULP/scss/core/_mobile.scss @@ -34,8 +34,8 @@ } .sidebar { + left: -$mobile-sidebar-width !important; width: $mobile-sidebar-width !important; - margin-left: -$mobile-sidebar-width; ul.nav { width: $mobile-sidebar-width !important; @@ -75,11 +75,7 @@ max-width: 100%; overflow-x: hidden; .sidebar { - margin-left: 0; - - .sidebar-footer { - margin-left: 0; - } + left: 0 !important; } .main { diff --git a/AJAX_Starter_GULP/css/style.css b/AJAX_Starter_GULP/css/style.css index ec66184..5ff48ab 100644 --- a/AJAX_Starter_GULP/css/style.css +++ b/AJAX_Starter_GULP/css/style.css @@ -7643,8 +7643,8 @@ base-chart.chart { width: 100% !important; margin: 0 auto !important; } .sidebar { - width: 200px !important; - margin-left: -200px; } + left: -200px !important; + width: 200px !important; } .sidebar ul.nav { width: 200px !important; } .sidebar .sidebar-footer { @@ -7668,8 +7668,6 @@ base-chart.chart { max-width: 100%; overflow-x: hidden; } body.mobile-open .sidebar { - margin-left: 0; } - body.mobile-open .sidebar .sidebar-footer { - margin-left: 0; } + left: 0 !important; } body.mobile-open .main { margin-left: 200px !important; } } diff --git a/AJAX_Starter_GULP/scss/core/_mobile.scss b/AJAX_Starter_GULP/scss/core/_mobile.scss index 7ff6979..29565d2 100644 --- a/AJAX_Starter_GULP/scss/core/_mobile.scss +++ b/AJAX_Starter_GULP/scss/core/_mobile.scss @@ -34,8 +34,8 @@ } .sidebar { + left: -$mobile-sidebar-width !important; width: $mobile-sidebar-width !important; - margin-left: -$mobile-sidebar-width; ul.nav { width: $mobile-sidebar-width !important; @@ -75,11 +75,7 @@ max-width: 100%; overflow-x: hidden; .sidebar { - margin-left: 0; - - .sidebar-footer { - margin-left: 0; - } + left: 0 !important; } .main { diff --git a/Angular2_CLI_Full_Project/src/app/shared/sidebar.directive.ts b/Angular2_CLI_Full_Project/src/app/shared/sidebar.directive.ts index 25186ae..6cf0325 100644 --- a/Angular2_CLI_Full_Project/src/app/shared/sidebar.directive.ts +++ b/Angular2_CLI_Full_Project/src/app/shared/sidebar.directive.ts @@ -76,7 +76,6 @@ export class MobileSidebarToggleDirective { this.toggleClass(document.querySelector('body'), 'mobile-open'); - console.log('asdasdasd'); } } diff --git a/Angular2_CLI_Full_Project/src/assets/css/style.css b/Angular2_CLI_Full_Project/src/assets/css/style.css index ec66184..5ff48ab 100644 --- a/Angular2_CLI_Full_Project/src/assets/css/style.css +++ b/Angular2_CLI_Full_Project/src/assets/css/style.css @@ -7643,8 +7643,8 @@ base-chart.chart { width: 100% !important; margin: 0 auto !important; } .sidebar { - width: 200px !important; - margin-left: -200px; } + left: -200px !important; + width: 200px !important; } .sidebar ul.nav { width: 200px !important; } .sidebar .sidebar-footer { @@ -7668,8 +7668,6 @@ base-chart.chart { max-width: 100%; overflow-x: hidden; } body.mobile-open .sidebar { - margin-left: 0; } - body.mobile-open .sidebar .sidebar-footer { - margin-left: 0; } + left: 0 !important; } body.mobile-open .main { margin-left: 200px !important; } } diff --git a/Angular2_CLI_Full_Project/src/scss/core/_mobile.scss b/Angular2_CLI_Full_Project/src/scss/core/_mobile.scss index 7ff6979..29565d2 100644 --- a/Angular2_CLI_Full_Project/src/scss/core/_mobile.scss +++ b/Angular2_CLI_Full_Project/src/scss/core/_mobile.scss @@ -34,8 +34,8 @@ } .sidebar { + left: -$mobile-sidebar-width !important; width: $mobile-sidebar-width !important; - margin-left: -$mobile-sidebar-width; ul.nav { width: $mobile-sidebar-width !important; @@ -75,11 +75,7 @@ max-width: 100%; overflow-x: hidden; .sidebar { - margin-left: 0; - - .sidebar-footer { - margin-left: 0; - } + left: 0 !important; } .main { diff --git a/Angular2_CLI_Starter/src/assets/css/style.css b/Angular2_CLI_Starter/src/assets/css/style.css index ec66184..5ff48ab 100644 --- a/Angular2_CLI_Starter/src/assets/css/style.css +++ b/Angular2_CLI_Starter/src/assets/css/style.css @@ -7643,8 +7643,8 @@ base-chart.chart { width: 100% !important; margin: 0 auto !important; } .sidebar { - width: 200px !important; - margin-left: -200px; } + left: -200px !important; + width: 200px !important; } .sidebar ul.nav { width: 200px !important; } .sidebar .sidebar-footer { @@ -7668,8 +7668,6 @@ base-chart.chart { max-width: 100%; overflow-x: hidden; } body.mobile-open .sidebar { - margin-left: 0; } - body.mobile-open .sidebar .sidebar-footer { - margin-left: 0; } + left: 0 !important; } body.mobile-open .main { margin-left: 200px !important; } } diff --git a/Angular2_CLI_Starter/src/scss/core/_mobile.scss b/Angular2_CLI_Starter/src/scss/core/_mobile.scss index 7ff6979..29565d2 100644 --- a/Angular2_CLI_Starter/src/scss/core/_mobile.scss +++ b/Angular2_CLI_Starter/src/scss/core/_mobile.scss @@ -34,8 +34,8 @@ } .sidebar { + left: -$mobile-sidebar-width !important; width: $mobile-sidebar-width !important; - margin-left: -$mobile-sidebar-width; ul.nav { width: $mobile-sidebar-width !important; @@ -75,11 +75,7 @@ max-width: 100%; overflow-x: hidden; .sidebar { - margin-left: 0; - - .sidebar-footer { - margin-left: 0; - } + left: 0 !important; } .main { diff --git a/Angular_Full_Project_GULP/css/style.css b/Angular_Full_Project_GULP/css/style.css index ec66184..5ff48ab 100644 --- a/Angular_Full_Project_GULP/css/style.css +++ b/Angular_Full_Project_GULP/css/style.css @@ -7643,8 +7643,8 @@ base-chart.chart { width: 100% !important; margin: 0 auto !important; } .sidebar { - width: 200px !important; - margin-left: -200px; } + left: -200px !important; + width: 200px !important; } .sidebar ul.nav { width: 200px !important; } .sidebar .sidebar-footer { @@ -7668,8 +7668,6 @@ base-chart.chart { max-width: 100%; overflow-x: hidden; } body.mobile-open .sidebar { - margin-left: 0; } - body.mobile-open .sidebar .sidebar-footer { - margin-left: 0; } + left: 0 !important; } body.mobile-open .main { margin-left: 200px !important; } } diff --git a/Angular_Full_Project_GULP/scss/core/_mobile.scss b/Angular_Full_Project_GULP/scss/core/_mobile.scss index 7ff6979..29565d2 100644 --- a/Angular_Full_Project_GULP/scss/core/_mobile.scss +++ b/Angular_Full_Project_GULP/scss/core/_mobile.scss @@ -34,8 +34,8 @@ } .sidebar { + left: -$mobile-sidebar-width !important; width: $mobile-sidebar-width !important; - margin-left: -$mobile-sidebar-width; ul.nav { width: $mobile-sidebar-width !important; @@ -75,11 +75,7 @@ max-width: 100%; overflow-x: hidden; .sidebar { - margin-left: 0; - - .sidebar-footer { - margin-left: 0; - } + left: 0 !important; } .main { diff --git a/Angular_Starter_GULP/css/style.css b/Angular_Starter_GULP/css/style.css index ec66184..5ff48ab 100644 --- a/Angular_Starter_GULP/css/style.css +++ b/Angular_Starter_GULP/css/style.css @@ -7643,8 +7643,8 @@ base-chart.chart { width: 100% !important; margin: 0 auto !important; } .sidebar { - width: 200px !important; - margin-left: -200px; } + left: -200px !important; + width: 200px !important; } .sidebar ul.nav { width: 200px !important; } .sidebar .sidebar-footer { @@ -7668,8 +7668,6 @@ base-chart.chart { max-width: 100%; overflow-x: hidden; } body.mobile-open .sidebar { - margin-left: 0; } - body.mobile-open .sidebar .sidebar-footer { - margin-left: 0; } + left: 0 !important; } body.mobile-open .main { margin-left: 200px !important; } } diff --git a/Angular_Starter_GULP/scss/core/_mobile.scss b/Angular_Starter_GULP/scss/core/_mobile.scss index 7ff6979..29565d2 100644 --- a/Angular_Starter_GULP/scss/core/_mobile.scss +++ b/Angular_Starter_GULP/scss/core/_mobile.scss @@ -34,8 +34,8 @@ } .sidebar { + left: -$mobile-sidebar-width !important; width: $mobile-sidebar-width !important; - margin-left: -$mobile-sidebar-width; ul.nav { width: $mobile-sidebar-width !important; @@ -75,11 +75,7 @@ max-width: 100%; overflow-x: hidden; .sidebar { - margin-left: 0; - - .sidebar-footer { - margin-left: 0; - } + left: 0 !important; } .main { diff --git a/Static_Full_Project_GULP/css/style.css b/Static_Full_Project_GULP/css/style.css index ec66184..5ff48ab 100644 --- a/Static_Full_Project_GULP/css/style.css +++ b/Static_Full_Project_GULP/css/style.css @@ -7643,8 +7643,8 @@ base-chart.chart { width: 100% !important; margin: 0 auto !important; } .sidebar { - width: 200px !important; - margin-left: -200px; } + left: -200px !important; + width: 200px !important; } .sidebar ul.nav { width: 200px !important; } .sidebar .sidebar-footer { @@ -7668,8 +7668,6 @@ base-chart.chart { max-width: 100%; overflow-x: hidden; } body.mobile-open .sidebar { - margin-left: 0; } - body.mobile-open .sidebar .sidebar-footer { - margin-left: 0; } + left: 0 !important; } body.mobile-open .main { margin-left: 200px !important; } } diff --git a/Static_Full_Project_GULP/scss/core/_mobile.scss b/Static_Full_Project_GULP/scss/core/_mobile.scss index 7ff6979..29565d2 100644 --- a/Static_Full_Project_GULP/scss/core/_mobile.scss +++ b/Static_Full_Project_GULP/scss/core/_mobile.scss @@ -34,8 +34,8 @@ } .sidebar { + left: -$mobile-sidebar-width !important; width: $mobile-sidebar-width !important; - margin-left: -$mobile-sidebar-width; ul.nav { width: $mobile-sidebar-width !important; @@ -75,11 +75,7 @@ max-width: 100%; overflow-x: hidden; .sidebar { - margin-left: 0; - - .sidebar-footer { - margin-left: 0; - } + left: 0 !important; } .main { diff --git a/Static_Starter_GULP/css/style.css b/Static_Starter_GULP/css/style.css index ec66184..5ff48ab 100644 --- a/Static_Starter_GULP/css/style.css +++ b/Static_Starter_GULP/css/style.css @@ -7643,8 +7643,8 @@ base-chart.chart { width: 100% !important; margin: 0 auto !important; } .sidebar { - width: 200px !important; - margin-left: -200px; } + left: -200px !important; + width: 200px !important; } .sidebar ul.nav { width: 200px !important; } .sidebar .sidebar-footer { @@ -7668,8 +7668,6 @@ base-chart.chart { max-width: 100%; overflow-x: hidden; } body.mobile-open .sidebar { - margin-left: 0; } - body.mobile-open .sidebar .sidebar-footer { - margin-left: 0; } + left: 0 !important; } body.mobile-open .main { margin-left: 200px !important; } } diff --git a/Static_Starter_GULP/scss/core/_mobile.scss b/Static_Starter_GULP/scss/core/_mobile.scss index 7ff6979..29565d2 100644 --- a/Static_Starter_GULP/scss/core/_mobile.scss +++ b/Static_Starter_GULP/scss/core/_mobile.scss @@ -34,8 +34,8 @@ } .sidebar { + left: -$mobile-sidebar-width !important; width: $mobile-sidebar-width !important; - margin-left: -$mobile-sidebar-width; ul.nav { width: $mobile-sidebar-width !important; @@ -75,11 +75,7 @@ max-width: 100%; overflow-x: hidden; .sidebar { - margin-left: 0; - - .sidebar-footer { - margin-left: 0; - } + left: 0 !important; } .main { -- GitLab