Add new logo

gtk-rs · GuillaumeGomez · Jun 7, 2021 · Jun 5, 2021 · Jun 6, 2021 · Jun 7, 2021
commit 70f45872744a58012e93c10d76ef13d32d9130fc
diff --git a/_includes/book.svg b/_includes/book.svg
diff --git a/_includes/contact.html b/_includes/contact.html
@@ -0,0 +1,9 @@
+<ul class="contact">
+  <li><a href="https://matrix.to/#/#rust:gnome.org"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Matrix</title><path d="M.632.55v22.9H2.28V24H0V0h2.28v.55zm7.043 7.26v1.157h.033c.309-.443.683-.784 1.117-1.024.433-.245.936-.365 1.5-.365.54 0 1.033.107 1.481.314.448.208.785.582 1.02 1.108.254-.374.6-.706 1.034-.992.434-.287.95-.43 1.546-.43.453 0 .872.056 1.26.167.388.11.716.286.993.53.276.245.489.559.646.951.152.392.23.863.23 1.417v5.728h-2.349V11.52c0-.286-.01-.559-.032-.812a1.755 1.755 0 0 0-.18-.66 1.106 1.106 0 0 0-.438-.448c-.194-.11-.457-.166-.785-.166-.332 0-.6.064-.803.189a1.38 1.38 0 0 0-.48.499 1.946 1.946 0 0 0-.231.696 5.56 5.56 0 0 0-.06.785v4.768h-2.35v-4.8c0-.254-.004-.503-.018-.752a2.074 2.074 0 0 0-.143-.688 1.052 1.052 0 0 0-.415-.503c-.194-.125-.476-.19-.854-.19-.111 0-.259.024-.439.074-.18.051-.36.143-.53.282-.171.138-.319.337-.439.595-.12.259-.18.6-.18 1.02v4.966H5.46V7.81zm15.693 15.64V.55H21.72V0H24v24h-2.28v-.55z"/></svg> #rust:gnome.org</a></li>
+
+  <li><a href="https://discourse.gnome.org/tag/rust"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Discourse</title><path d="M12.103 0C18.666 0 24 5.485 24 11.997c0 6.51-5.33 11.99-11.9 11.99L0 24V11.79C0 5.28 5.532 0 12.103 0zm.116 4.563c-2.593-.003-4.996 1.352-6.337 3.57-1.33 2.208-1.387 4.957-.148 7.22L4.4 19.61l4.794-1.074c2.745 1.225 5.965.676 8.136-1.39 2.17-2.054 2.86-5.228 1.737-7.997-1.135-2.778-3.84-4.59-6.84-4.585h-.008z"/></svg> discourse.gnome.org/tag/rust</a></li>
+
+  <li><a href="https://github.com/gtk-rs"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg> github.com/gtk-rs</a></li>
+
+  <li><a href="https://opencollective.com/gtk-rs"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Open Collective</title><path d="M12 0C5.373 0 0 5.373 0 12s5.373 12 12 12c2.54 0 4.894-.79 6.834-2.135l-3.107-3.109a7.715 7.715 0 1 1 0-13.512l3.107-3.109A11.943 11.943 0 0 0 12 0zm9.865 5.166l-3.109 3.107A7.67 7.67 0 0 1 19.715 12a7.682 7.682 0 0 1-.959 3.727l3.109 3.107A11.943 11.943 0 0 0 24 12c0-2.54-.79-4.894-2.135-6.834z"/></svg> opencollective.com/gtk-rs</a></li>
+</ul>
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,18 +1,10 @@
 <footer class="site-footer">
 
   <div class="wrapper">
-    <ul>
-      <li><a href="https://matrix.to/#/#rust:gnome.org"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Matrix</title><path d="M.632.55v22.9H2.28V24H0V0h2.28v.55zm7.043 7.26v1.157h.033c.309-.443.683-.784 1.117-1.024.433-.245.936-.365 1.5-.365.54 0 1.033.107 1.481.314.448.208.785.582 1.02 1.108.254-.374.6-.706 1.034-.992.434-.287.95-.43 1.546-.43.453 0 .872.056 1.26.167.388.11.716.286.993.53.276.245.489.559.646.951.152.392.23.863.23 1.417v5.728h-2.349V11.52c0-.286-.01-.559-.032-.812a1.755 1.755 0 0 0-.18-.66 1.106 1.106 0 0 0-.438-.448c-.194-.11-.457-.166-.785-.166-.332 0-.6.064-.803.189a1.38 1.38 0 0 0-.48.499 1.946 1.946 0 0 0-.231.696 5.56 5.56 0 0 0-.06.785v4.768h-2.35v-4.8c0-.254-.004-.503-.018-.752a2.074 2.074 0 0 0-.143-.688 1.052 1.052 0 0 0-.415-.503c-.194-.125-.476-.19-.854-.19-.111 0-.259.024-.439.074-.18.051-.36.143-.53.282-.171.138-.319.337-.439.595-.12.259-.18.6-.18 1.02v4.966H5.46V7.81zm15.693 15.64V.55H21.72V0H24v24h-2.28v-.55z"/></svg> #rust:gnome.org</a></li>
-
-      <li><a href="https://github.com/gtk-rs"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg> github.com/gtk-rs</a></li>
-
-            <li><a href="https://opencollective.com/gtk-rs"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Open Collective</title><path d="M12 0C5.373 0 0 5.373 0 12s5.373 12 12 12c2.54 0 4.894-.79 6.834-2.135l-3.107-3.109a7.715 7.715 0 1 1 0-13.512l3.107-3.109A11.943 11.943 0 0 0 12 0zm9.865 5.166l-3.109 3.107A7.67 7.67 0 0 1 19.715 12a7.682 7.682 0 0 1-.959 3.727l3.109 3.107A11.943 11.943 0 0 0 24 12c0-2.54-.79-4.894-2.135-6.834z"/></svg> opencollective.com/gtk-rs</a></li>
-    </ul>
-    <div>
-      <!--
-    Proudly part of
-    <img src="https://gitlab.gnome.org/Teams/Circle/-/raw/91de93edbb3e75eb0882d56bd466e58b525135d5/assets/button/circle-button-fullcolor.svg" alt="GNOME Circle Logo" />
-       -->
-    </div>
+    {% include contact.html %}
+    <a href="https://circle.gnome.org/">
+      Proudly part of
+      <img src="https://gitlab.gnome.org/Teams/Circle/-/raw/91de93edbb3e75eb0882d56bd466e58b525135d5/assets/button/circle-button-fullcolor.svg" alt="GNOME Circle Logo" />
+    </a>
   </div>
 </footer>
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
@@ -15,15 +15,23 @@
     margin: 2.5rem 1.5rem;
     display: inline-block;
 
-    background-size: contain;
-    background-repeat: no-repeat;
-    padding-left: 120px;
-    line-height: 100px;
+    padding-left: 1rem;
 
     transition: 0.2s;
     transition-property: transform, opacity;
 
-    background-image: url('../images/gtk-rs.png');
+    &::before {
+        background-size: contain;
+        background-repeat: no-repeat;
+        display: inline-block;
+        height: 110px;
+        width: 110px;
+        border-radius: 50%;
+        background-image: url('/logo.svg');
+        content: '';
+        vertical-align: middle;
+        margin-right: 1.6rem;
+    }
 
     &:hover {
         opacity: 0.9;
@@ -131,49 +139,64 @@
         flex-wrap: wrap;
         justify-content: space-around;
         align-items: center;
-    }
 
-    svg {
-        width: 1.2em;
-        margin-right: 0.6em;
-        display: inline-block;
-        path {
-            fill: white;
+        ul {
+            margin: 0;
         }
-    }
 
-    a {
-        color: white;
-        text-decoration: none;
-        line-height: 2em;
-        display: flex;
+        a {
+            color: white;
 
-        &:hover {
-            color: #CCC;
+            &:hover {
+                color: #CCC;
+            }
+        }
 
-            svg {
-                path {
-                    fill: #CCC;
-                }
+
+        & > a {
+            font-size: 0.8em;
+            display: inline-block;
+            text-decoration: none;
+
+            img {
+                width: auto;
+                height: 5rem;
+                display: block;
+                padding-top: 0.3em;
+                transition: opacity 0.3s;
+            }
+
+            &:hover img {
+                opacity: 0.8;
             }
         }
     }
+}
+
+ul.contact {
 
     li {
         list-style: none;
     }
 
-    .wrapper > div {
-        font-size: 0.8em;
-        line-height: 0;
-    }
 
-    img {
-        height: 5em;
-        width: auto;
-        margin-left: auto;
-        display: block;
-        padding-top: 1em;
+    a {
+        line-height: 2em;
+        display: flex;
+        text-decoration: none;
+
+        svg {
+            width: 1.2em;
+            padding-top: 1px;
+            margin-right: 0.6em;
+            path {
+                fill: currentcolor;
+            }
+        }
+
+        &:hover {
+            text-decoration: none;
+        }
     }
 }
 
@@ -368,13 +391,13 @@ section.special {
         text-align: center;
         display: flex;
         flex-wrap: wrap;
-        justify-content: space-between;
+        justify-content: space-evenly;
+        margin-left: 0;
     }
 
     li {
         list-style: none;
         display: inline-block;
-        flex-grow: 1;
     }
 
 
@@ -383,7 +406,7 @@ section.special {
         font-family: $headings-font-family;
         font-weight: 600;
 
-        padding: 0 0.8em;
+        padding: 0 1em;
         margin: 0.15em 0.3em;
         line-height: 3em;
         vertical-align: center;

diff --git a/contact.md b/contact.md
@@ -6,8 +6,7 @@ layout: default
 
 For general support use the GNOME Discourse or the Matrix chat.
 
-- GNOME Discourse **[discourse.gnome.org](https://discourse.gnome.org)**
-- Matrix channel **[#rust:gnome.org](https://matrix.to/#/#rust:gnome.org)**
+{% include contact.html %}
 
 ### Contact Gtk-rs developers
 

diff --git a/gtk.png b/gtk.png
diff --git a/images/gtk-rs.png b/images/gtk-rs.png