diff --git a/apple/Omnivore.xcodeproj/project.pbxproj b/apple/Omnivore.xcodeproj/project.pbxproj index 1d4522b28..0bb3b1f69 100644 --- a/apple/Omnivore.xcodeproj/project.pbxproj +++ b/apple/Omnivore.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 042F48DC26DFD10E00BF98FC /* iOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042F48DB26DFD10E00BF98FC /* iOSLaunchTests.swift */; }; 045B1681279147E7005047F7 /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 045B1680279147E7005047F7 /* FirebaseMessaging */; }; 0465B9BE26CDD35F005558CD /* MainApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D81BE98F0CB588F5FC577A13 /* MainApp.swift */; }; - 046C5CD526A3F89A00AC5349 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 046C5CD426A3F89A00AC5349 /* icon.icns */; }; 046C5CDF26A3F89A00AC5349 /* ShareExtension-Mac.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 046C5CD226A3F89A00AC5349 /* ShareExtension-Mac.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 046C5CE626A3FE8C00AC5349 /* App in Frameworks */ = {isa = PBXBuildFile; productRef = 046C5CE526A3FE8C00AC5349 /* App */; }; 047AD6F22724C934004FD5CF /* App in Frameworks */ = {isa = PBXBuildFile; productRef = 047AD6F12724C934004FD5CF /* App */; }; @@ -34,12 +33,8 @@ 260BBE4168E3C57D6D2E225D /* App in Frameworks */ = {isa = PBXBuildFile; productRef = 7DD0EF4D497D71D248C7B0DF /* App */; }; 4214F6EF2714D2260096B644 /* SafariExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 42FF1B16271154A700B38C38 /* SafariExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 4214F6F22714D28E0096B644 /* SafariExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 42FF1B20271154A700B38C38 /* SafariExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 4225D59227164F82002A680F /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 4225D59127164F82002A680F /* fonts */; }; - 4225D59327164F82002A680F /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 4225D59127164F82002A680F /* fonts */; }; 42321E852714E6B00056429F /* scripts in Resources */ = {isa = PBXBuildFile; fileRef = 42321E822714E6B00056429F /* scripts */; }; 42321E862714E6B00056429F /* scripts in Resources */ = {isa = PBXBuildFile; fileRef = 42321E822714E6B00056429F /* scripts */; }; - 42321E872714E6B00056429F /* styles in Resources */ = {isa = PBXBuildFile; fileRef = 42321E832714E6B00056429F /* styles */; }; - 42321E882714E6B00056429F /* styles in Resources */ = {isa = PBXBuildFile; fileRef = 42321E832714E6B00056429F /* styles */; }; 42321E892714E6B00056429F /* views in Resources */ = {isa = PBXBuildFile; fileRef = 42321E842714E6B00056429F /* views */; }; 42321E8A2714E6B00056429F /* views in Resources */ = {isa = PBXBuildFile; fileRef = 42321E842714E6B00056429F /* views */; }; 42704E7328E6BDB000C8C73E /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42704E7228E6BDAF00C8C73E /* SnapshotHelper.swift */; }; @@ -192,7 +187,6 @@ 042F48DB26DFD10E00BF98FC /* iOSLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSLaunchTests.swift; sourceTree = ""; }; 042F48DD26DFD10E00BF98FC /* iOSUITests.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = iOSUITests.plist; sourceTree = ""; }; 046C5CD226A3F89A00AC5349 /* ShareExtension-Mac.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "ShareExtension-Mac.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; - 046C5CD426A3F89A00AC5349 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = ""; }; 046C5CDB26A3F89A00AC5349 /* ShareExtensionMac.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = ShareExtensionMac.plist; sourceTree = ""; }; 046C5CDC26A3F89A00AC5349 /* ShareExtensionMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShareExtensionMac.entitlements; sourceTree = ""; }; 047AA41F297A17FB00F0BEBF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = ""; }; @@ -215,9 +209,7 @@ 082449FB9F5F3730EE0D8D3F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 0BE7F7C593222747A96AA4E7 /* Omnivore.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Omnivore.plist; sourceTree = ""; }; 1A39D8FDA25447FDBF07E24B /* Omnivore.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Omnivore.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 4225D59127164F82002A680F /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = fonts; sourceTree = ""; }; 42321E822714E6B00056429F /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = ""; }; - 42321E832714E6B00056429F /* styles */ = {isa = PBXFileReference; lastKnownFileType = folder; path = styles; sourceTree = ""; }; 42321E842714E6B00056429F /* views */ = {isa = PBXFileReference; lastKnownFileType = folder; path = views; sourceTree = ""; }; 42704E7228E6BDAF00C8C73E /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnapshotHelper.swift; sourceTree = ""; }; 42E2BFB128E458E0007F29B2 /* AppStoreScreenshots.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppStoreScreenshots.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -473,9 +465,7 @@ 42FF1AEC271154A600B38C38 /* Resources */ = { isa = PBXGroup; children = ( - 4225D59127164F82002A680F /* fonts */, 42321E822714E6B00056429F /* scripts */, - 42321E832714E6B00056429F /* styles */, 42321E842714E6B00056429F /* views */, 42FF1AED271154A600B38C38 /* _locales */, 42FF1AEE271154A600B38C38 /* images */, @@ -511,7 +501,6 @@ B330B55BAF36E624637EE3BE /* ShareExtension */ = { isa = PBXGroup; children = ( - 046C5CD426A3F89A00AC5349 /* icon.icns */, FF9F2334402E6B10A665F1A7 /* ShareExtensionViewController.swift */, 04E9706E26BDE47D002A523D /* ShareExtension.js */, ); @@ -878,7 +867,6 @@ buildActionMask = 2147483647; files = ( 04E9707226BDE5F1002A523D /* ShareExtension.js in Resources */, - 046C5CD526A3F89A00AC5349 /* icon.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -909,9 +897,7 @@ buildActionMask = 2147483647; files = ( 42321E892714E6B00056429F /* views in Resources */, - 42321E872714E6B00056429F /* styles in Resources */, 42321E852714E6B00056429F /* scripts in Resources */, - 4225D59227164F82002A680F /* fonts in Resources */, 42FF1B37271154A700B38C38 /* images in Resources */, 42FF1B39271154A700B38C38 /* manifest.json in Resources */, 42FF1B35271154A700B38C38 /* _locales in Resources */, @@ -923,9 +909,7 @@ buildActionMask = 2147483647; files = ( 42321E8A2714E6B00056429F /* views in Resources */, - 42321E882714E6B00056429F /* styles in Resources */, 42321E862714E6B00056429F /* scripts in Resources */, - 4225D59327164F82002A680F /* fonts in Resources */, 42FF1B38271154A700B38C38 /* images in Resources */, 42FF1B3A271154A700B38C38 /* manifest.json in Resources */, 42FF1B36271154A700B38C38 /* _locales in Resources */, diff --git a/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-400.woff2 b/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-400.woff2 deleted file mode 100644 index b5db4467b..000000000 Binary files a/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-400.woff2 and /dev/null differ diff --git a/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-600.woff2 b/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-600.woff2 deleted file mode 100644 index 924ae728d..000000000 Binary files a/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-600.woff2 and /dev/null differ diff --git a/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-700.woff2 b/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-700.woff2 deleted file mode 100644 index f6215ed24..000000000 Binary files a/apple/Sources/SafariExtension/Resources/fonts/inter-v3-latin-700.woff2 and /dev/null differ diff --git a/apple/Sources/SafariExtension/Resources/styles/cta-popup.css b/apple/Sources/SafariExtension/Resources/styles/cta-popup.css deleted file mode 100644 index ef2ac515b..000000000 --- a/apple/Sources/SafariExtension/Resources/styles/cta-popup.css +++ /dev/null @@ -1,101 +0,0 @@ -/** - * Fonts - */ - -@font-face { - font-style: normal; - font-weight: 400; - font-family: Inter; - src: - local(""), - url("/fonts/inter-v3-latin-400.woff2") format("woff2"); -} - -@font-face { - font-style: normal; - font-weight: 600; - font-family: Inter; - src: - local(""), - url("/fonts/inter-v3-latin-600.woff2") format("woff2"); -} - -@font-face { - font-style: normal; - font-weight: 700; - font-family: Inter; - src: - local(""), - url("/fonts/inter-v3-latin-700.woff2") format("woff2"); -} - -/** - * Other - */ - -html, -body { - width: 100%; - height: 100%; -} - -body { - margin: 0; -} - -.cta-container { - position: relative; - overflow: hidden; - box-sizing: border-box; - width: 100%; - height: 100%; - padding: 24px 12px; - background: linear-gradient(150deg, #fff 55%, #ffde8c 55%); - background-color: #fff; - color: #3d3d3d; - font-family: Inter, sans-serif; - text-align: center; -} - -.cta-container__wrapper { - position: relative; - z-index: 1; -} - -.cta-container__title { - padding: 0 24px 24px; - font-weight: 600; - font-size: 16px; -} - -.cta-container__icon { - vertical-align: unset; - margin-bottom: -4px; - fill: none; -} - -.cta-container__link { - display: flex; - align-items: center; - justify-content: center; - width: 184px; - height: 34px; - margin: 36px auto 14px; - border-radius: 40px; - background-color: #fff; - color: inherit; - font-weight: 700; - font-size: 12px; - text-decoration: none; - cursor: pointer; -} - -.cta-container__text { - margin: 0; - font-size: 12px; -} - -.cta-container__textlink { - color: inherit; - font-weight: 700; -} diff --git a/apple/Sources/ShareExtension/icon.icns b/apple/Sources/ShareExtension/icon.icns deleted file mode 100644 index 84ae85cdf..000000000 Binary files a/apple/Sources/ShareExtension/icon.icns and /dev/null differ diff --git a/pkg/extension/src/fonts/inter-v3-latin-400.woff2 b/pkg/extension/src/fonts/inter-v3-latin-400.woff2 deleted file mode 100644 index b5db4467b..000000000 Binary files a/pkg/extension/src/fonts/inter-v3-latin-400.woff2 and /dev/null differ diff --git a/pkg/extension/src/fonts/inter-v3-latin-600.woff2 b/pkg/extension/src/fonts/inter-v3-latin-600.woff2 deleted file mode 100644 index 924ae728d..000000000 Binary files a/pkg/extension/src/fonts/inter-v3-latin-600.woff2 and /dev/null differ diff --git a/pkg/extension/src/fonts/inter-v3-latin-700.woff2 b/pkg/extension/src/fonts/inter-v3-latin-700.woff2 deleted file mode 100644 index f6215ed24..000000000 Binary files a/pkg/extension/src/fonts/inter-v3-latin-700.woff2 and /dev/null differ diff --git a/pkg/extension/src/views/toast.html b/pkg/extension/src/views/toast.html index fd022e2a8..c09979d78 100644 --- a/pkg/extension/src/views/toast.html +++ b/pkg/extension/src/views/toast.html @@ -304,6 +304,7 @@ fill: #898989; } .omnivore-save-button button { + margin-top: 10px; color: #333333; } #omnivore-toast-container #omnivore-edit-labels-list button { diff --git a/pkg/extension/webpack.js b/pkg/extension/webpack.js index a6993cac2..63afd87c9 100644 --- a/pkg/extension/webpack.js +++ b/pkg/extension/webpack.js @@ -1,48 +1,42 @@ /* Credit: https://github.com/paulmwatson/web-ext-environments.git */ -const CopyPlugin = require('copy-webpack-plugin'); -const DotenvPlugin = require('dotenv-webpack'); -const replaceWithProcessEnv = require('./replace-with-process-env.js'); -const { CleanWebpackPlugin } = require('clean-webpack-plugin'); -const path = require('path'); +const CopyPlugin = require('copy-webpack-plugin') +const DotenvPlugin = require('dotenv-webpack') +const replaceWithProcessEnv = require('./replace-with-process-env.js') +const { CleanWebpackPlugin } = require('clean-webpack-plugin') +const path = require('path') -const env = process.env.EXT_ENV || 'local'; +const env = process.env.EXT_ENV || 'local' module.exports = () => { - const dotenvPath = __dirname + '/.env.' + env; - const envVars = require('dotenv').config({ path: dotenvPath }).parsed; + const dotenvPath = __dirname + '/.env.' + env + const envVars = require('dotenv').config({ path: dotenvPath }).parsed return { entry: path.resolve(__dirname, 'src') + '/scripts/background.js', - mode: (process.env.EXT_ENV === 'production') ? 'production' : 'development', - devtool: (process.env.EXT_ENV === 'production') ? undefined : 'source-map', + mode: process.env.EXT_ENV === 'production' ? 'production' : 'development', + devtool: process.env.EXT_ENV === 'production' ? undefined : 'source-map', output: { filename: 'scripts/background.js', - path: path.resolve(__dirname, 'dist') + path: path.resolve(__dirname, 'dist'), }, plugins: [ new CleanWebpackPlugin(), - new DotenvPlugin( - { - path: dotenvPath - } - ), - new CopyPlugin( - { - patterns: [ - { - from: 'src/manifest.json', - transform (content) { - return replaceWithProcessEnv(content.toString(), envVars); - } + new DotenvPlugin({ + path: dotenvPath, + }), + new CopyPlugin({ + patterns: [ + { + from: 'src/manifest.json', + transform(content) { + return replaceWithProcessEnv(content.toString(), envVars) }, - { from: 'src/images', to: 'images' }, - { from: 'src/scripts', to: 'scripts' }, - { from: 'src/styles', to: 'styles' }, - { from: 'src/fonts', to: 'fonts' }, - { from: 'src/views', to: 'views' }, - { from: 'src/_locales', to: '_locales' } - ] - } - ) - ] - }; -}; + }, + { from: 'src/images', to: 'images' }, + { from: 'src/scripts', to: 'scripts' }, + { from: 'src/views', to: 'views' }, + { from: 'src/_locales', to: '_locales' }, + ], + }), + ], + } +}