Forráskód Böngészése

Use `Muli` as the headings font

JC Brand 6 éve
szülő
commit
11655e2e32
9 módosított fájl, 38 hozzáadás és 43 törlés
  1. 12 4
      css/converse.css
  2. BIN
      css/webfonts/muli.ttf
  3. 6 6
      css/website.css
  4. 2 23
      index.html
  5. 2 2
      sass/_core.scss
  6. 1 0
      sass/_messages.scss
  7. 2 1
      sass/_variables.scss
  8. 7 0
      sass/font-awesome.scss
  9. 6 7
      sass/website.scss

+ 12 - 4
css/converse.css

@@ -11,6 +11,12 @@
   font-weight: 400;
   src: local("Baumans Regular"), local("Baumans-Regular"), url(webfonts/baumans.ttf) format("truetype"); }
 
+@font-face {
+  font-family: 'Muli';
+  font-style: normal;
+  font-weight: 400;
+  src: local("Muli Regular"), local("Muli-Regular"), url(webfonts/muli.ttf) format("truetype"); }
+
 @font-face {
   font-family: 'ConverseFontAwesomeBrands';
   font-style: normal;
@@ -9357,7 +9363,8 @@ readers do not read off random characters that represent icons */
   --mobile-chat-width: 100%;
   --mobile-chat-height: 400px;
   --normal-font: "Helvetica", "Arial", sans-serif;
-  --heading-font: 'Baumans', cursive;
+  --heading-font: 'Muli', normal;
+  --branding-font: 'Baumans', cursive;
   --heading-display: block;
   --heading-color: white;
   --chatroom-head-color: #E77051;
@@ -9553,7 +9560,7 @@ body.reset {
       max-width: 83.33333%; } }
 
 .converse-brand__text {
-  font-family: var(--heading-font);
+  font-family: var(--branding-font);
   font-weight: normal;
   width: 50%;
   margin: auto;
@@ -9599,7 +9606,7 @@ body.reset {
     font-size: 200%;
     display: inline-flex;
     align-items: flex-end;
-    font-family: var(--heading-font); }
+    font-family: var(--branding-font); }
     #conversejs .brand-heading:hover .brand-name {
       color: var(--link-color); }
     #conversejs .brand-heading .converse-svg-logo {
@@ -11943,7 +11950,8 @@ body.reset {
       text-overflow: ellipsis;
       white-space: nowrap;
       font-family: var(--heading-font);
-      font-size: 115%; }
+      font-size: 115%;
+      font-weight: bold; }
       #conversejs .message.chat-msg .chat-msg__heading .chat-msg__author .badge {
         font-size: 80%;
         font-family: var(--normal_font); }

BIN
css/webfonts/muli.ttf


+ 6 - 6
css/website.css

@@ -5091,7 +5091,7 @@ img::-moz-selection {
 
 h1, h2, h3, h4, h5, h6 {
   margin: 0 0 35px;
-  font-family: Futura,Helvetica,Trebuchet MS,Arial,sans-serif;
+  font-family: 'Muli', sans-serif;
   font-weight: normal;
   letter-spacing: 1px; }
 
@@ -5127,10 +5127,10 @@ a {
     word-spacing: 50px; }
 
 .byline {
-  font-family: Futura,Helvetica,Trebuchet MS,Arial,sans-serif;
+  font-family: 'Muli', sans-serif;
   font-size: 28px;
-  opacity: 0.6;
-  margin-bottom: 3em; }
+  opacity: 0.5;
+  margin-bottom: 2em; }
 
 #about p {
   opacity: 0.9; }
@@ -5139,7 +5139,7 @@ a {
   font-weight: 400; }
 
 .navbar {
-  font-family: Futura,Helvetica,Trebuchet MS,Arial,sans-serif;
+  font-family: 'Muli', sans-serif;
   margin-bottom: 0;
   background: transparent;
   font-size: 95%;
@@ -5337,7 +5337,7 @@ section h4 {
     padding: 100px 0; } }
 
 .btn {
-  font-family: Futura,Helvetica,Trebuchet MS,Arial,sans-serif;
+  font-family: 'Muli', sans-serif;
   font-weight: 400;
   -webkit-transition: all 0.3s ease-in-out;
   -moz-transition: all 0.3s ease-in-out;

+ 2 - 23
index.html

@@ -71,28 +71,6 @@
     <section id="intro" class="intro" class="container">
         <div class="row">
             <div class="col-md-12 col-md-offset-2">
-                <h1 class="brand-heading converse-brand-heading hidden">
-                    <svg class="converse-svg-logo"
-                        xmlns:svg="http://www.w3.org/2000/svg"
-                        xmlns="http://www.w3.org/2000/svg"
-                        xmlns:xlink="http://www.w3.org/1999/xlink"
-                        viewBox="0 0 364 364">
-                    <title>Converse</title>
-                    <g class="cls-1" id="g904">
-                        <g data-name="Layer 2">
-                            <g data-name="Layer 7">
-                                <path
-                                    class="cls-3"
-                                    d="M221.46,103.71c0,18.83-29.36,18.83-29.12,0C192.1,84.88,221.46,84.88,221.46,103.71Z" />
-                                <path
-                                    class="cls-4"
-                                    d="M179.9,4.15A175.48,175.48,0,1,0,355.38,179.63,175.48,175.48,0,0,0,179.9,4.15Zm-40.79,264.5c-.23-17.82,27.58-17.82,27.58,0S138.88,286.48,139.11,268.65ZM218.6,168.24A79.65,79.65,0,0,1,205.15,174a12.76,12.76,0,0,0-6.29,4.65L167.54,222a1.36,1.36,0,0,1-2.46-.8v-35.8a2.58,2.58,0,0,0-3.06-2.53c-15.43,3-30.23,7.7-42.73,19.94-38.8,38-29.42,105.69,16.09,133.16a162.25,162.25,0,0,1-91.47-67.27C-3.86,182.26,34.5,47.25,138.37,25.66c46.89-9.75,118.25,5.16,123.73,62.83C265.15,120.64,246.56,152.89,218.6,168.24Z" />
-                            </g>
-                        </g>
-                    </g>
-                </svg>
-                <span>converse</span></h1>
-
                 <h1 class="brand-heading indiechat">
                     <svg class="converse-svg-logo"
                         xmlns:svg="http://www.w3.org/2000/svg"
@@ -114,8 +92,9 @@
                     </g>
                 </svg>
                 converse<span class="subdued">.js</span></h1>
-
                 <p class="byline">messaging freedom</p>
+                <p class="intro-text">A free and open-source XMPP chat client in your browser</p>
+                <p>Try out the <a href="/fullscreen.html">fullpage</a> version</p>
                 <p>
                 <a href="https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org"
                    target="_blank" rel="noopener"><img src="https://inverse.chat/badge.svg?room=discuss@conference.conversejs.org"/></a>

+ 2 - 2
sass/_core.scss

@@ -71,7 +71,7 @@ body.reset {
 }
 
 .converse-brand__text {
-    font-family: var(--heading-font);
+    font-family: var(--branding-font);
     font-weight: normal;
     width: 50%;
     margin: auto;
@@ -138,7 +138,7 @@ body.reset {
         font-size: 200%;
         display: inline-flex;
         align-items: flex-end;
-        font-family: var(--heading-font);
+        font-family: var(--branding-font);
         &:hover {
             .brand-name {
                 color: var(--link-color);

+ 1 - 0
sass/_messages.scss

@@ -218,6 +218,7 @@
                     white-space: nowrap;
                     font-family: var(--heading-font);
                     font-size: 115%;
+                    font-weight: bold;
                     .badge {
                         font-size: 80%;
                         font-family: var(--normal_font);

+ 2 - 1
sass/_variables.scss

@@ -92,7 +92,8 @@ $mobile_portrait_length: 480px !default;
     // --font-path: "webfonts/icomoon/fonts/";
 
     --normal-font: "Helvetica", "Arial", sans-serif;
-    --heading-font: 'Baumans', cursive;
+    --heading-font: 'Muli', normal;
+    --branding-font: 'Baumans', cursive;
     --heading-display: block;
     --heading-color: white;
 

+ 7 - 0
sass/font-awesome.scss

@@ -5,6 +5,13 @@
   src: local('Baumans Regular'), local('Baumans-Regular'), url(webfonts/baumans.ttf) format('truetype');
 }
 
+@font-face {
+  font-family: 'Muli';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Muli Regular'), local('Muli-Regular'), url(webfonts/muli.ttf) format('truetype');
+}
+
 @font-face {
   font-family: 'ConverseFontAwesomeBrands';
   font-style: normal;

+ 6 - 7
sass/website.scss

@@ -49,7 +49,7 @@ img::-moz-selection {
 
 h1, h2, h3, h4, h5, h6 {
     margin: 0 0 35px;
-    font-family: Futura,Helvetica,Trebuchet MS,Arial,sans-serif;
+    font-family: 'Muli', sans-serif;
     font-weight: normal;
     letter-spacing: 1px;
 }
@@ -94,11 +94,10 @@ a {
     }
 }
 .byline {
-    font-family: Futura,Helvetica,Trebuchet MS,Arial,sans-serif;
+    font-family: 'Muli', sans-serif;
     font-size: 28px;
-    opacity: 0.6;
-    // color: #E7A151;
-    margin-bottom: 3em;
+    opacity: 0.5;
+    margin-bottom: 2em;
 }
 
 #about {
@@ -112,7 +111,7 @@ a {
 }
 
 .navbar {
-    font-family: Futura,Helvetica,Trebuchet MS,Arial,sans-serif;
+    font-family: 'Muli', sans-serif;
     margin-bottom: 0;
 	background: transparent;
     font-size: 95%;
@@ -353,7 +352,7 @@ section {
     }
 }
 .btn {
-    font-family: Futura,Helvetica,Trebuchet MS,Arial,sans-serif;
+    font-family: 'Muli', sans-serif;
     font-weight: 400;
     -webkit-transition: all 0.3s ease-in-out;
     -moz-transition: all 0.3s ease-in-out;