From 7dc138fddeef72fb61f00403fd521e125299a48a Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 12 Dec 2016 17:53:23 -0700
Subject: [PATCH] Move languages to bottom
---
layouts/partials/footer.html | 8 ++
layouts/partials/menu.html | 8 --
static/css/bootstrap.css | 15 ---
static/css/style.css | 189 +++++++++++++++++++++++++++--------
4 files changed, 155 insertions(+), 65 deletions(-)
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 6fb9d3c0..a15abb1b 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,4 +1,12 @@
<footer class="copyright">
+ <p>
+ <a style="color: inherit; margin-right: 2em;" href="{{ .URL }}">{{ .Language.LanguageName }}{{ if .IsHome }}{{ else }}: {{ .Title }}{{ end }}</a>
+ {{ if .IsTranslated }}
+ {{ range .Translations }}
+ <a style="color: inherit; margin-right: 2em;" href="{{ .URL }}">{{ .Language.LanguageName }}{{ if .IsHome }}{{ else }}: {{ .Title }}{{ end }}</a>
+ {{ end}}
+ {{ end }}
+ </p>
Copyright © 2016 by <a style="color: inherit;" href="https://github.com/redox-os"><b>Redox Developers</b></a>
</footer>
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 6e1b5008..4e750f09 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -10,14 +10,6 @@
{{ range .Site.Menus.main }}
<h2><a style="color: inherit;" href="{{ .URL | relLangURL }}">{{ .Name }}</a></h2>
{{ end }}
- <br/><br/>
-
- <h3><a style="color: inherit;" href="{{ .URL }}">{{ .Language.LanguageName }}{{ if .IsHome }}{{ else }}: {{ .Title }}{{ end }}</a></h3>
- {{ if .IsTranslated }}
- {{ range .Translations }}
- <h3><a style="color: inherit;" href="{{ .URL }}">{{ .Language.LanguageName }}{{ if .IsHome }}{{ else }}: {{ .Title }}{{ end }}</a></h3>
- {{ end}}
- {{ end }}
</li>
</ul>
</nav>
diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css
index f25bd2a1..1a9571dd 100644
--- a/static/css/bootstrap.css
+++ b/static/css/bootstrap.css
@@ -569,21 +569,6 @@ pre {
.btn-primary:active {
background-image: none;
}
-.btn-success {
- color: #fff;
- background-color: #42ca8b;
- border-color: #35bd7e;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active {
- color: #fff;
- background-color: #32b176;
- border-color: #288e5e;
-}
-.btn-success:active {
- background-image: none;
-}
@-webkit-keyframes progress-bar-stripes {
from {
background-position: 40px 0;
diff --git a/static/css/style.css b/static/css/style.css
index cc1fba04..f43588fb 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -67,13 +67,6 @@ ul.menu h2 {
display: inline;
line-height: 1.5em;
}
-ul.menu h3 {
- font-size: 14px;
- font-weight: 500;
- margin: 1em;
- display: inline;
- line-height: 1.5em;
-}
ul.menu li>ul {
margin-top: .5em;
padding-left: 0em;
@@ -103,22 +96,6 @@ h3 {
font-weight: 500;
}
-.side-header h2 {
- font-weight: 500;
- font-size: 18.5px;
- line-height: 24px;
- margin-top: 7px;
-}
-
-.side-header h3 {
- font-size: 1em;
- margin-top: 0px;
-}
-
-.side-header p {
- color: #777;
-}
-
.table-features {
width: 100%;
margin-bottom: 18px;
@@ -189,10 +166,15 @@ p.pitch {
}
}
+p.pitch a {
+ font-size: 80%;
+}
+
.install-box {
color: #777;
text-align: right;
font-size: 130%;
+ margin-top: 0.8em;
}
.version-rec-box-inner {
@@ -230,19 +212,11 @@ hr {
max-width: 250px;
}
-.row.features {
- margin-top: 2.0em;
-}
-
-.copyright {
- margin-top: 2.0em;
-}
-
ul.laundry-list {
- margin-bottom: 20px;
- column-count: auto;
- -moz-column-count: auto;
- -webkit-column-count: auto;
+ column-count: 2;
+ -moz-column-count: 2;
+ -webkit-column-count: 2;
+ margin-bottom: 20px;
}
.resp-block {
@@ -254,6 +228,11 @@ ul.laundry-list {
font-size: 18px;
padding: 10px 15px;
}
+ ul.laundry-list {
+ column-count: auto;
+ -moz-column-count: auto;
+ -webkit-column-count: auto;
+ }
img.ribbon {
display: inline !important;
position: absolute;
@@ -335,6 +314,8 @@ ul.laundry-list {
padding: 10px;
display: none;
border-radius: 4px;
+ font-family: monospace;
+ font-size: 12px;
}
.ace-error-text, .ace-error-line, .ace-warning-text, .ace-warning-line {
@@ -393,7 +374,7 @@ ul.laundry-list {
.content {
border-top: 2px solid #dedede;
margin-top: 2em;
- margin-bottom: 8em;
+ margin-bottom: 2em;
padding-top: 2em;
}
@@ -419,20 +400,33 @@ ul.laundry-list {
line-height: 1.5em;
margin: 3rem 0 1rem;
font-weight: 400;
- border-top: 2px solid #dedede;
- padding-top: 1rem;
+ border-top: 2px solid #dedede;
+ padding-top: 1rem;
}
.content h3 {
font-size: 1em;
line-height: 1.5em;
font-weight: 500;
- margin: 2rem 0 .5rem;
+ margin: .5rem 0;
+}
+
+.side-header h2 {
+ font-weight: 500;
+ font-size: 18.5px;
+ line-height: 24px;
+ margin-top: 7px;
+ border-top: none;
+ padding-top: 0;
}
-.post-title {
- color: inherit;
- text-decoration: underline;
+.side-header h3 {
+ font-size: 1em;
+ margin-top: 0px;
+}
+
+.side-header p {
+ color: #777;
}
@media screen and (min-width: 820px) {
@@ -511,3 +505,114 @@ ul.laundry-list {
margin: 0 0 0 2rem;
padding: 0;
}
+
+#users > h1 {
+ text-align: center;
+ padding-top: 10px;
+ font-size: 2.5em;
+ font-weight: 400;
+ margin: 0px;
+ padding-top: 50px;
+}
+
+#users > h2 {
+ text-align: center;
+ font-size: 1.5em;
+ line-height: 1.5em;
+ font-weight: 400;
+ margin: 0px;
+ padding-bottom: 60px;
+}
+
+#users > div > div {
+ text-align: center;
+}
+
+#users .user-container {
+ margin-left: auto;
+ margin-right: auto;
+ width: 200px;
+ height: 100px;
+}
+
+#users .user-container a {
+ line-height: 100px;
+}
+
+#users img {
+ max-width: 200px;
+ max-height: 100px;
+ vertical-align: middle;
+}
+
+#users .details {
+ margin-top: 2em;
+ margin-bottom: 2em;
+}
+
+#users .fade-in {
+ transition: opacity 0.5s linear;
+}
+
+#users .fade-out {
+ transition: opacity 0.1s ease-in-out;
+}
+
+#users .fade-in * {
+ z-index: 1;
+}
+
+#users .fade-out * {
+ z-index: -1;
+}
+
+@media (min-width: 992px) {
+
+ #users .fade-in {
+ opacity: 1;
+ }
+
+ #users .fade-out {
+ opacity: 0;
+ }
+
+}
+
+#users .user-details-row-1 div {
+ height: 2em;
+ margin-top: 0em;
+}
+
+#users .user-details-row-2 div {
+ height: 2em;
+ margin-top: -2em;
+}
+
+#users .user-details-row-3 div {
+ height: 2em;
+ margin-top: -2em;
+}
+
+#users .details p {
+ margin: 0px;
+}
+
+#users em {
+ font-weight: bold;
+}
+
+#users #user-add-info {
+ text-align: center;
+ padding-top: 50px;
+}
+
+footer {
+ border-top: 2px solid #dedede;
+ margin: 1.2em auto 0 auto;
+ padding-top: 0.6em; /* half to accomodate p tag margin */
+}
+
+footer a {
+ display: inline-block;
+ font-weight: bold;
+}
--
GitLab