From 6aabe915e891bbbac5cc52658136d87ef21eddfd Mon Sep 17 00:00:00 2001 From: Matias Szylkowski Date: Tue, 21 Dec 2021 14:45:09 -0500 Subject: [PATCH 1/6] Added tasts --- .vscode/tasks.json | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000000..ea550d21e7a9 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,70 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "amp: Run unit test in this file", + "detail": "amp unit --files=${file} --headless --verbose", + "type": "shell", + "command": "amp", + "args": ["unit", "--files=${file}", "--headless", "--verbose"], + "group": "test", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": true + } + }, + { + "label": "amp: Watch unit test in this file", + "detail": "amp unit --files=${file} --headless --verbose --watch", + "type": "shell", + "command": "amp", + "args": ["unit", "--files=${file}", "--headless", "--verbose", "--watch"], + "group": "test", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": true + }, + "isBackground": true + }, + { + "label": "amp: Run unit tests in all changed files", + "detail": "amp unit --local_changes --headless --verbose", + "type": "shell", + "command": "amp", + "args": ["unit", "--local_changes", "--headless", "--verbose"], + "group": "test", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": true + } + }, + { + "label": "amp: Check PR", + "detail": "amp pr-check --nobuild", + "type": "shell", + "command": "amp", + "args": ["pr-check", "--nobuild"], + "group": "test", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": true + } + }, + ] +} \ No newline at end of file From dc1fa876f8e029a54a7cfd4bf2f70795da071102 Mon Sep 17 00:00:00 2001 From: Matias Szylkowski Date: Tue, 21 Dec 2021 14:47:32 -0500 Subject: [PATCH 2/6] Undo --- .vscode/tasks.json | 70 ---------------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index ea550d21e7a9..000000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "amp: Run unit test in this file", - "detail": "amp unit --files=${file} --headless --verbose", - "type": "shell", - "command": "amp", - "args": ["unit", "--files=${file}", "--headless", "--verbose"], - "group": "test", - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared", - "showReuseMessage": true, - "clear": true - } - }, - { - "label": "amp: Watch unit test in this file", - "detail": "amp unit --files=${file} --headless --verbose --watch", - "type": "shell", - "command": "amp", - "args": ["unit", "--files=${file}", "--headless", "--verbose", "--watch"], - "group": "test", - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared", - "showReuseMessage": true, - "clear": true - }, - "isBackground": true - }, - { - "label": "amp: Run unit tests in all changed files", - "detail": "amp unit --local_changes --headless --verbose", - "type": "shell", - "command": "amp", - "args": ["unit", "--local_changes", "--headless", "--verbose"], - "group": "test", - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared", - "showReuseMessage": true, - "clear": true - } - }, - { - "label": "amp: Check PR", - "detail": "amp pr-check --nobuild", - "type": "shell", - "command": "amp", - "args": ["pr-check", "--nobuild"], - "group": "test", - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared", - "showReuseMessage": true, - "clear": true - } - }, - ] -} \ No newline at end of file From 1fc12d28f16b24a7032e1a893877ad96a4441e3e Mon Sep 17 00:00:00 2001 From: Matias Szylkowski Date: Mon, 21 Mar 2022 13:40:18 -0400 Subject: [PATCH 3/6] Removed FOUT on Open Sans --- .../0.1/amp-story-education.css | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/extensions/amp-story-education/0.1/amp-story-education.css b/extensions/amp-story-education/0.1/amp-story-education.css index 2992a26d42dc..44c7e8c30b5e 100644 --- a/extensions/amp-story-education/0.1/amp-story-education.css +++ b/extensions/amp-story-education/0.1/amp-story-education.css @@ -1,8 +1,15 @@ -@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600,700'); +@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap'); @import '../../amp-story/1.0/amp-story-shadow-reset.css'; +/* Using https://www.industrialempathy.com/perfect-ish-font-fallback/?font=Open%20Sans */ +@font-face { + font-family: "Open Sans-fallback"; + size-adjust: 105.44%; + src: local("Arial"); +} + amp-story-education { position: fixed !important; height: 100% !important; @@ -20,7 +27,8 @@ amp-story-education { width: 100% !important; background: rgba(0, 0, 0, 0.8) !important; color: #FFF !important; - font-family: 'Open Sans', sans-serif !important; + font-family: 'Open Sans', 'Open Sans-fallback', sans-serif !important; + line-height: 1em !important; font-weight: 400 !important; pointer-events: auto !important; opacity: 1 !important; @@ -104,7 +112,7 @@ amp-story-education { background: rgba(255, 255, 255, 0.25) !important; border-radius: 24px !important; font-size: 14px !important; - font-weight: 700 !important; + font-weight: 600 !important; line-height: 14px !important; } From 69c9109ae4961fa9b9dc789159caf02739bc44e1 Mon Sep 17 00:00:00 2001 From: Matias Szylkowski Date: Mon, 21 Mar 2022 14:05:47 -0400 Subject: [PATCH 4/6] Revert weight to 700 --- extensions/amp-story-education/0.1/amp-story-education.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/amp-story-education/0.1/amp-story-education.css b/extensions/amp-story-education/0.1/amp-story-education.css index 44c7e8c30b5e..8e2dc3f415a4 100644 --- a/extensions/amp-story-education/0.1/amp-story-education.css +++ b/extensions/amp-story-education/0.1/amp-story-education.css @@ -131,7 +131,7 @@ amp-story-education { border-radius: 48px !important; color: #FFF !important; font-size: 16px !important; - font-weight: 600 !important; + font-weight: 700 !important; line-height: 43px !important; } From 687f38c8008f9fd226fdb5bc627d52600ebf7ac4 Mon Sep 17 00:00:00 2001 From: Matias Szylkowski Date: Mon, 21 Mar 2022 14:07:00 -0400 Subject: [PATCH 5/6] Fixed wrong weight --- extensions/amp-story-education/0.1/amp-story-education.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/amp-story-education/0.1/amp-story-education.css b/extensions/amp-story-education/0.1/amp-story-education.css index 8e2dc3f415a4..0824cd6149ed 100644 --- a/extensions/amp-story-education/0.1/amp-story-education.css +++ b/extensions/amp-story-education/0.1/amp-story-education.css @@ -112,7 +112,7 @@ amp-story-education { background: rgba(255, 255, 255, 0.25) !important; border-radius: 24px !important; font-size: 14px !important; - font-weight: 600 !important; + font-weight: 700 !important; line-height: 14px !important; } @@ -131,7 +131,7 @@ amp-story-education { border-radius: 48px !important; color: #FFF !important; font-size: 16px !important; - font-weight: 700 !important; + font-weight: 600 !important; line-height: 43px !important; } From cee246cf477a227240d32d101e35afcccaa759e3 Mon Sep 17 00:00:00 2001 From: Matias Szylkowski Date: Mon, 21 Mar 2022 15:50:03 -0400 Subject: [PATCH 6/6] Set line-height to 1.5em --- extensions/amp-story-education/0.1/amp-story-education.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/amp-story-education/0.1/amp-story-education.css b/extensions/amp-story-education/0.1/amp-story-education.css index 0824cd6149ed..175274b17470 100644 --- a/extensions/amp-story-education/0.1/amp-story-education.css +++ b/extensions/amp-story-education/0.1/amp-story-education.css @@ -28,7 +28,7 @@ amp-story-education { background: rgba(0, 0, 0, 0.8) !important; color: #FFF !important; font-family: 'Open Sans', 'Open Sans-fallback', sans-serif !important; - line-height: 1em !important; + line-height: 1.5em !important; font-weight: 400 !important; pointer-events: auto !important; opacity: 1 !important;