From d0850d19acc266a08534d8db2e6255e29b64a83b Mon Sep 17 00:00:00 2001 From: MAYA Ma Date: Thu, 19 Jan 2017 14:46:49 +1100 Subject: [PATCH] fix a documentation site css issue with aligning body content next to navdrawer --- assets/sass-project/project.scss | 6 +++--- css/project.css | 6 +++--- css/project.css.map | 2 +- css/project.min.css | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/sass-project/project.scss b/assets/sass-project/project.scss index 475a8aef5..7df64e063 100644 --- a/assets/sass-project/project.scss +++ b/assets/sass-project/project.scss @@ -10,7 +10,7 @@ padding-top: ($toolbar-height * 2); @include media-breakpoint-up(lg) { - .navdrawer-permanent + { + .navdrawer-permanent ~ & { margin-left: $navdrawer-width-mobile; } } @@ -18,7 +18,7 @@ .doc-main { @include media-breakpoint-up(lg) { - .navdrawer-permanent + { + .navdrawer-permanent ~ & { margin-left: $navdrawer-width-mobile; } } @@ -28,7 +28,7 @@ position: fixed; @include media-breakpoint-up(lg) { - .navdrawer-permanent + { + .navdrawer-permanent ~ & { margin-left: $navdrawer-width-mobile; } } diff --git a/css/project.css b/css/project.css index 7ef1ad349..477f047f3 100644 --- a/css/project.css +++ b/css/project.css @@ -7,13 +7,13 @@ padding-top: 7rem; } @media (min-width: 1280px) { - .doc-jumbotron .navdrawer-permanent + { + .navdrawer-permanent ~ .doc-jumbotron { margin-left: 17.5rem; } } @media (min-width: 1280px) { - .doc-main .navdrawer-permanent + { + .navdrawer-permanent ~ .doc-main { margin-left: 17.5rem; } } @@ -22,7 +22,7 @@ position: fixed; } @media (min-width: 1280px) { - .doc-toolbar .navdrawer-permanent + { + .navdrawer-permanent ~ .doc-toolbar { margin-left: 17.5rem; } } diff --git a/css/project.css.map b/css/project.css.map index 2a6bd7f5a..43915bdff 100644 --- a/css/project.css.map +++ b/css/project.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAIE,cAAe;EACb,gBAAgB,EAAE,gCAAgC;EAClD,mBAAmB,EAAE,OAAO;EAC5B,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,KAAK;EACtB,WAAW,EAAE,IAAqB;;AC8BlC,0BAAyB;ED3BvB,qCAAuB;IACrB,WAAW,EE6OmB,OAAO;;;;ADnNzC,0BAAyB;EDnBvB,gCAAuB;IACrB,WAAW,EEqOmB,OAAO;;;;AFhO3C,YAAa;EACX,QAAQ,EAAE,KAAK;;ACYf,0BAAyB;EDTvB,mCAAuB;IACrB,WAAW,EE2NmB,OAAO", +"mappings": "AAIE,cAAe;EACb,gBAAgB,EAAE,gCAAgC;EAClD,mBAAmB,EAAE,OAAO;EAC5B,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,KAAK;EACtB,WAAW,EAAE,IAAqB;;AC8BlC,0BAAyB;ED3BvB,qCAAyB;IACvB,WAAW,EE6OmB,OAAO;;;;ADnNzC,0BAAyB;EDnBvB,gCAAyB;IACvB,WAAW,EEqOmB,OAAO;;;;AFhO3C,YAAa;EACX,QAAQ,EAAE,KAAK;;ACYf,0BAAyB;EDTvB,mCAAyB;IACvB,WAAW,EE2NmB,OAAO", "sources": ["../assets/sass-project/project.scss","../assets/sass/mixins/_breakpoint.scss","../assets/sass/variables/_variable-material.scss"], "names": [], "file": "project.css" diff --git a/css/project.min.css b/css/project.min.css index 9fc04e633..c4ba8b06c 100644 --- a/css/project.min.css +++ b/css/project.min.css @@ -1 +1 @@ -.doc-jumbotron{background-image:url(images/doc-jumbotron-bg.jpg);background-position:50% 50%;background-repeat:no-repeat;-webkit-background-size:cover;background-size:cover;padding-top:7rem}.doc-toolbar{position:fixed}@media (min-width:1280px){.doc-jumbotron .navdrawer-permanent+,.doc-main .navdrawer-permanent+,.doc-toolbar .navdrawer-permanent+{margin-left:17.5rem}} \ No newline at end of file +.doc-jumbotron{background-image:url(images/doc-jumbotron-bg.jpg);background-position:50% 50%;background-repeat:no-repeat;-webkit-background-size:cover;background-size:cover;padding-top:7rem}.doc-toolbar{position:fixed}@media (min-width:1280px){.navdrawer-permanent~.doc-jumbotron,.navdrawer-permanent~.doc-main,.navdrawer-permanent~.doc-toolbar{margin-left:17.5rem}} \ No newline at end of file