From b97f10bbaac567494c4753d8d84e93d199fb875c Mon Sep 17 00:00:00 2001 From: Paul Tan Date: Sat, 15 Sep 2018 15:25:44 +0800 Subject: [PATCH 1/2] Revert "gh-pages.css: override markbind's default `container-fluid` styling" This reverts commit d8f206f04b5565dba134066dbf379109bc4683da. The commit was introduced to work-around some styling choices made by MarkBind, namely: * The #app div having the container-fluid class applied to it, which added a 15px padding on the horizontal sides of the page. * The footer having negative horizontal margins, which led to the footer extending past the boundary of the page. These styling choices have since been removed in MarkBind[1]: * The #app div does not have the container-fluid class applied to it any more. * The footer now has a margin of 0. As such, the changes made by d8f206f04b5565dba134066dbf379109bc4683da are not needed any more, so let's revert it. [1]: https://github.com/MarkBind/markbind/commit/c20e9412987eec32e8ff9cb57eaf4d09da0fed5e --- css/gh-pages.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/css/gh-pages.css b/css/gh-pages.css index e4205995..4b040ff6 100644 --- a/css/gh-pages.css +++ b/css/gh-pages.css @@ -213,14 +213,6 @@ table.tableblock > .title, } } -#app.container-fluid { - padding: 0; -} - -footer { - margin: 0; -} - .website-content { width: 100%; max-width: 62.5rem; From d83822e65c93c0a0a48f76fa146ef20cd2a9ab1b Mon Sep 17 00:00:00 2001 From: Paul Tan Date: Sat, 15 Sep 2018 15:38:05 +0800 Subject: [PATCH 2/2] gh-pages.css: make the site navbar stretch across the entire page In the official SE-EDU design, the site navbar at the top should stretch across the entire page. However, for the Learning Resources site, this does not happen. The site navbar is constrained to a maximum width of 1000px and is centered in the page. This makes the design of the Learning Resources site inconsistent with the rest of the SE-EDU sites. This is because a recent change in MarkBind[1] wraps the entire page (minus the footer) in a #content-wrapper div, and the #content-wrapper div is styled as: #content-wrapper { margin: 0 auto; max-width: 1000px; overflow-x: hidden; padding: 0 20px; width: 100%; } thus leading to the current behavior. Fix this by overriding #content-wrapper's `max-width` and `padding` properties, so that the site navbar will stretch acorss the entire page. [1]: https://github.com/MarkBind/markbind/commit/c20e9412987eec32e8ff9cb57eaf4d09da0fed5e --- css/gh-pages.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/gh-pages.css b/css/gh-pages.css index 4b040ff6..4d663b8c 100644 --- a/css/gh-pages.css +++ b/css/gh-pages.css @@ -223,3 +223,8 @@ table.tableblock > .title, #site-header { margin-bottom: 2.25rem; } + +#content-wrapper { + max-width: none; + padding: 0; +}