Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dependencies: Upgrade Source Sans Pro font to Source Sans 3. 

https://blog.adobe.com/en/2020/11/30/whats-new-in-source-sans-3.html

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-02-22 21:58:00 -08:00 committed by Tim Abbott
parent 289b5bc100
commit ba0ee6ddfa
20 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/copy_and_paste.js
View File

@ -54,7 +54,7 @@ run_test("paste_handler", () => {
assert.equal(copy_and_paste.paste_handler_converter(input), "The `JSDOM` constructor");
input =
'<meta http-equiv="content-type" content="text/html; charset=utf-8"><a href="https://zulip.readthedocs.io/en/latest/subsystems/logging.html" target="_blank" title="https://zulip.readthedocs.io/en/latest/subsystems/logging.html" style="color: hsl(200, 100%, 40%); text-decoration: none; cursor: pointer; font-family: &quot;Source Sans Pro&quot;, &quot;Helvetica Neue&quot;, Helvetica, Arial, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: hsl(0, 0%, 100%);">https://zulip.readthedocs.io/en/latest/subsystems/logging.html</a>';
'<meta http-equiv="content-type" content="text/html; charset=utf-8"><a href="https://zulip.readthedocs.io/en/latest/subsystems/logging.html" target="_blank" title="https://zulip.readthedocs.io/en/latest/subsystems/logging.html" style="color: hsl(200, 100%, 40%); text-decoration: none; cursor: pointer; font-family: &quot;Source Sans 3&quot;, &quot;Helvetica Neue&quot;, Helvetica, Arial, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: hsl(0, 0%, 100%);">https://zulip.readthedocs.io/en/latest/subsystems/logging.html</a>';
assert.equal(
copy_and_paste.paste_handler_converter(input),
"https://zulip.readthedocs.io/en/latest/subsystems/logging.html",

2
package.json
View File

@ -62,7 +62,7 @@
"simplebar": "^5.2.1",
"sortablejs": "^1.9.0",
"sorttable": "^1.0.2",
"source-sans-pro": "^3.6.0",
"source-sans": "^3.28.0",
"spectrum-colorpicker": "^1.8.1",
"stacktrace-gps": "^3.0.4",
"style-loader": "^2.0.0",

BIN
static/images/why-zulip/slack-unreads.svg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
static/images/why-zulip/zulip-reply-later.svg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 100 KiB

BIN
static/images/why-zulip/zulip-topics.svg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

2
static/js/bundles/common.js
View File

@ -13,7 +13,7 @@ import "../../third/bootstrap/css/bootstrap-btn.css";
import "simplebar/dist/simplebar.css";
import "font-awesome/css/font-awesome.css";
import "../../assets/icons/zulip-icons.font";
import "source-sans-pro/source-sans-pro.css";
import "source-sans/source-sans-3.css";
import "../../styles/pygments.css";
import "@uppy/core/dist/style.css";
import "@uppy/progress-bar/dist/style.css";

2
static/js/favicon.js
View File

@ -1,6 +1,6 @@
import render_favicon_svg from "../templates/favicon.svg.hbs";
import favicon_font_url from "!url-loader!font-subset-loader2?glyphs=0123456789KMGT∞!source-sans-pro/TTF/SourceSansPro-Bold.ttf";
import favicon_font_url from "!url-loader!font-subset-loader2?glyphs=0123456789KMGT∞!source-sans/TTF/SourceSans3-Bold.ttf";
let favicon_state;

4
static/js/stats/stats.js
View File

@ -3,7 +3,7 @@ import Plotly from "plotly.js/lib/core";
Plotly.register([require("plotly.js/lib/bar"), require("plotly.js/lib/pie")]);
const font_14pt = {
family: "Source Sans Pro",
family: "Source Sans 3",
size: 14,
color: "#000000",
};
@ -470,7 +470,7 @@ function populate_messages_sent_by_client(data) {
textinfo: "text",
hoverinfo: "none",
marker: {color: "#537c5e"},
font: {family: "Source Sans Pro", size: 18, color: "#000000"},
font: {family: "Source Sans 3", size: 18, color: "#000000"},
},
trace_annotations: {
x: annotations.values,

2
static/styles/app_components.css
View File

@ -473,7 +473,7 @@
display: inline;
margin-right: 8px;
font-family: FontAwesome, Yantramanav, "Source Sans Pro";
font-family: FontAwesome, Yantramanav, "Source Sans 3";
font-weight: 600;
}
}

3
static/styles/portico/archive.css
View File

@ -1,6 +1,5 @@
body {
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial,
sans-serif;
font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
}

4
static/styles/portico/billing.css
View File

@ -1,5 +1,5 @@
.billing-upgrade-page {
font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
font-family: "Source Sans 3", Helvetica, Arial, sans-serif;
background-color: hsl(0, 0%, 98%);
height: 100vh;
@ -131,7 +131,7 @@
span {
background: 0;
box-shadow: none;
font-family: "Source Sans Pro", Helvetica, Arial;
font-family: "Source Sans 3", Helvetica, Arial;
font-size: 1.4em;
line-height: 20px;
}

2
static/styles/portico/landing_page.css
View File

@ -2175,7 +2175,7 @@ nav {
font-size: 0.8rem;
font-weight: 600;
font-family: "Source Sans Pro", sans-serif;
font-family: "Source Sans 3", sans-serif;
margin-top: 10px;
}

4
static/styles/portico/markdown.css
View File

@ -241,14 +241,14 @@
.tip::before {
display: inline;
content: "\f0eb Tip: ";
font-family: FontAwesome, Yantramanav, "Source Sans Pro";
font-family: FontAwesome, Yantramanav, "Source Sans 3";
font-weight: 600;
}
.keyboard_tip::before {
display: inline;
content: "\f11c Keyboard Shortcut: ";
font-family: FontAwesome, Yantramanav, "Source Sans Pro";
font-family: FontAwesome, Yantramanav, "Source Sans 3";
font-weight: 600;
}

4
static/styles/portico/portico.css
View File

@ -1,6 +1,6 @@
body {
background-color: hsl(0, 0%, 98%);
font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
font-family: "Source Sans 3", Helvetica, Arial, sans-serif;
line-height: 150%;
height: 100%;
font-weight: 300;
@ -1299,7 +1299,7 @@ input.new-organization-button {
min-height: calc(100vh - 290px);
height: 100%;
background-color: hsl(163, 42%, 85%);
font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
font-family: "Source Sans 3", Helvetica, Arial, sans-serif;
}
.error_page .container {

4
static/styles/portico/portico_signin.css
View File

@ -323,7 +323,7 @@ html {
vertical-align: top;
padding: 13px 22px 13px 22px;
font-family: "Source Sans Pro";
font-family: "Source Sans 3";
font-size: 1.2rem;
font-weight: 400;
@ -404,7 +404,7 @@ html {
padding: 10px 32px 10px 12px;
margin: 25px 0 5px;
font-family: "Source Sans Pro";
font-family: "Source Sans 3";
font-size: 1.2rem;
line-height: normal;
height: auto;

4
static/styles/portico/stats.css
View File

@ -1,5 +1,5 @@
body {
font-family: "Source Sans Pro", "Helvetica Neue", sans-serif !important;
font-family: "Source Sans 3", "Helvetica Neue", sans-serif !important;
background-color: hsl(0, 0%, 98%);
}
@ -113,7 +113,7 @@ p {
}
.button {
font-family: "Source Sans Pro", "Helvetica Neue", sans-serif !important;
font-family: "Source Sans 3", "Helvetica Neue", sans-serif !important;
border: none;
border-radius: 4px;
outline: none;

10
static/styles/zulip.css
View File

@ -33,8 +33,7 @@ html {
}
body {
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial,
sans-serif;
font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif;
}
/* Common background color */
@ -48,8 +47,7 @@ input,
button,
select,
textarea {
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial,
sans-serif;
font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif;
line-height: normal;
}
@ -381,7 +379,7 @@ p.n-margin {
textarea,
input {
font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
font-family: "Source Sans 3", Helvetica, Arial, sans-serif;
}
/* Override Bootstrap's fixed sizes for various elements */
@ -1761,7 +1759,7 @@ div.focused_table {
padding-right: 20px;
border: none;
border-radius: 0;
font-family: "Source Sans Pro";
font-family: "Source Sans 3";
font-weight: 300;
line-height: $header_height;
}

6
static/templates/favicon.svg.hbs
View File

@ -1,7 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
<style>
@font-face {
font-family: 'Source Sans Pro';
font-family: 'Source Sans 3';
font-style: normal;
font-weight: 700;
src: url({{{favicon_font_url}}}) format('truetype');
@ -13,13 +13,13 @@
</linearGradient>
<path d="M688.52 150.67c0 33.91-15.23 64.04-38.44 82.31L424.79 434.17c-4.18 3.59-9.62-2.19-6.61-7.03l82.64-165.46c2.31-4.63-.69-10.33-5.44-10.33H174.86c-49.64 0-90.26-45.31-90.26-100.68 0-55.37 40.62-100.68 90.26-100.68h423.39c49.65 0 90.27 45.31 90.27 100.68zM174.86 723.13h423.39c49.64 0 90.26-45.31 90.26-100.68 0-55.37-40.62-100.68-90.26-100.68H277.73c-4.75 0-7.76-5.7-5.44-10.33l82.64-165.46c3.01-4.83-2.42-10.62-6.61-7.03L123.04 540.14c-23.21 18.27-38.44 48.4-38.44 82.31 0 55.37 40.62 100.68 90.26 100.68z" fill="url(#a)" transform="translate(8 8) scale(0.023769201057729446) translate(-386.56 -386.56)" />
<text x="15" y="15" text-anchor="end"
font-family="Source Sans Pro" font-weight="bold" letter-spacing="-0.5"
font-family="'Source Sans 3'" font-weight="bold" letter-spacing="-0.5"
fill="white" stroke="white" stroke-width="2" stroke-linejoin="round" opacity=".5"
{{#if count_long}}font-size="9" textLength="14" lengthAdjust="spacingAndGlyphs"{{else}}font-size="11"{{/if}}>
{{count}}
</text>
<text x="15" y="15" text-anchor="end"
font-family="Source Sans Pro" font-weight="bold" letter-spacing="-0.5"
font-family="'Source Sans 3'" font-weight="bold" letter-spacing="-0.5"
{{#if count_long}}font-size="9" textLength="14" lengthAdjust="spacingAndGlyphs"{{else}}font-size="11"{{/if}}>
{{count}}
</text>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

2
version.py
View File

@ -45,4 +45,4 @@ API_FEATURE_LEVEL = 39
# historical commits sharing the same major version, in which case a
# minor version bump suffices.
PROVISION_VERSION = "127.0"
PROVISION_VERSION = "128.0"

8
yarn.lock
View File

@ -11328,10 +11328,10 @@ source-map@^0.7.3, source-map@~0.7.2:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
source-sans-pro@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/source-sans-pro/-/source-sans-pro-3.6.0.tgz#f4167065ebf096136b1b4f141dbd48886dda1486"
integrity sha512-C1RFUGu+YASuqpgDRInTM7Y6OwqeWNOuKn7v0P/4Kh66epTI4PYWwPWP5kdA4l/VqzBAWiqoz5dk0trof73R7w==
source-sans@^3.28.0:
version "3.28.0"
resolved "https://registry.yarnpkg.com/source-sans/-/source-sans-3.28.0.tgz#fca86d2214f75e1c3dfaea6a5bae91dbb00d573f"
integrity sha512-ra//x4S1iPfKIAtyHVe92/75CirB3ixIRuWDBOZIIjSUD7DJrs4WSfJaQ1U3MG3JytIJV9G64tUHonhXAftDsw==
spawn-wrap@^2.0.0:
version "2.0.0"