]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2225edd)
Make the wiki slightly narrower by dropping the sidebar
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2020 22:19:31 +0000 (23:19 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2020 22:19:31 +0000 (23:19 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/scss/_variables.scss patch | blob | blame | history
src/scss/style.scss patch | blob | blame | history
src/templates/base.html patch | blob | blame | history
src/templates/wiki/base.html patch | blob | blame | history

diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 749b58f59d67d45a26b6de159e4c5a7b422e06c4..2b781ed3e3a55cea5c228458e67626cf85e4fd2e 100644 (file)
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -33,17 +33,6 @@ $code-color:                         $white;
 $pre-color:                                    $white;
 $table-color:                          inherit;
 
-// Breakpoints
-$grid-breakpoints: (
-       xs: 0,
-       sm: 600px,
-       md: 768px,
-       lg: 1024px,
-       xl: 1280px
-);
-
-$grid-gutter-width:                    24px;
-
 $border-radius:                                5px;
 $border-radius-lg:                     5px;
 
diff --git a/src/scss/style.scss b/src/scss/style.scss
index 521a4af4e16147237c23243bec844f059df24202..960f8c3a010e370a299fa3a4a0fe1afda699c348 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -51,6 +51,15 @@ body {
        display: flex;
        min-height: 100vh;
        flex-flow: column;
+
+       // Make the wiki slightly narrower
+       &.wiki-ipfire-org {
+               @include media-breakpoint-up(xl) {
+                       .container {
+                               max-width: 900px;
+                       }
+               }
+       }
 }
 
 // Buttons
diff --git a/src/templates/base.html b/src/templates/base.html
index 3a56f88c3ed5749f055e36cc668620deed8d5aca..6540cff7c14fc019a79b8dbf5c40a1a3ba514e77 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -20,7 +20,7 @@
                {% block head %}{% end block %}
        </head>
 
-       <body id="page-top">
+       <body id="page-top" class="{{ hostname.replace(".", "-") }}">
                <nav class="navbar navbar-dark navbar-expand-lg mb-4">
                        <div class="container">
                                <a class="navbar-brand" href="/">
diff --git a/src/templates/wiki/base.html b/src/templates/wiki/base.html
index 19516de8b48acaf6d92c4a7ca7b6f193b2807217..b3acb4b51576bc995964c1b530fd70542f392b56 100644 (file)
--- a/src/templates/wiki/base.html
+++ b/src/templates/wiki/base.html
@@ -1,15 +1,7 @@
 {% extends "../base.html" %}
 
 {% block content %}
-       <div class="row">
-               <div class="col-12 col-lg-3 d-none d-lg-block">
-                       {% block sidebar %}{% end block %}
-               </div>
+       {% module WikiNavbar() %}
 
-               <div class="col-12 col-lg-9">
-                       {% module WikiNavbar() %}
-
-                       {% block main %}{% end block %}
-               </div>
-       </div>
+       {% block main %}{% end block %}
 {% end block %}
The website of ipfire.org.