diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index 97ca88043095..e6c4920af1f9 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -3034,10 +3034,6 @@ Signal Desktop makes use of the following open source projects. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -## sanitize-filename - - License: WTFPL OR ISC - ## sanitize.css License: CC0-1.0 diff --git a/package.json b/package.json index e3ffb3dbf0d4..17c5892e379c 100644 --- a/package.json +++ b/package.json @@ -156,7 +156,6 @@ "rimraf": "2.6.2", "ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#9b4ff947378ab11295d8718cae75e9a35ddb3e61", "rotating-file-stream": "2.1.5", - "sanitize-filename": "1.6.3", "sanitize.css": "11.0.0", "semver": "5.4.1", "sharp": "0.28.1", diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index 4aaa115c124d..c89f0c590d47 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -77,7 +77,3 @@ font-size: large; } } - -.call-manager-wrapper { - position: relative; -} diff --git a/stylesheets/_modal.scss b/stylesheets/_modal.scss deleted file mode 100644 index 49d7ec545dd3..000000000000 --- a/stylesheets/_modal.scss +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016-2020 Signal Messenger, LLC -// SPDX-License-Identifier: AGPL-3.0-only - -.modal { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - background-color: $color-black-alpha-20; - padding: 0 20px; - z-index: 100; - overflow-y: auto; - - .content { - position: relative; - max-width: 350px; - margin: 100px auto; - padding: 1em; - border-radius: 5px; - overflow: auto; - - @include light-theme { - background-color: $color-white; - box-shadow: 0px 3px 5px 0px $color-black-alpha-20; - } - @include dark-theme { - background-color: $color-gray-95; - box-shadow: 0px 3px 5px 0px $color-white-alpha-20; - } - } -} diff --git a/stylesheets/_progress.scss b/stylesheets/_progress.scss index 92b4c2f56ddc..cde537b4b002 100644 --- a/stylesheets/_progress.scss +++ b/stylesheets/_progress.scss @@ -10,26 +10,6 @@ } } .progress-bar-striped { - background-image: -webkit-linear-gradient( - 45deg, - $color-white-alpha-60 25%, - transparent 25%, - transparent 50%, - $color-white-alpha-60 50%, - $color-white-alpha-60 75%, - transparent 75%, - transparent - ); - background-image: -o-linear-gradient( - 45deg, - $color-white-alpha-60 25%, - transparent 25%, - transparent 50%, - $color-white-alpha-60 50%, - $color-white-alpha-60 75%, - transparent 75%, - transparent - ); background-image: linear-gradient( 45deg, $color-white-alpha-60 25%, @@ -40,30 +20,9 @@ transparent 75%, transparent ); - -webkit-background-size: 40px 40px; background-size: 40px 40px; } .progress-bar-striped { - background-image: -webkit-linear-gradient( - 45deg, - $color-white-alpha-60 25%, - transparent 25%, - transparent 50%, - $color-white-alpha-60 50%, - $color-white-alpha-60 75%, - transparent 75%, - transparent - ); - background-image: -o-linear-gradient( - 45deg, - $color-white-alpha-60 25%, - transparent 25%, - transparent 50%, - $color-white-alpha-60 50%, - $color-white-alpha-60 75%, - transparent 75%, - transparent - ); background-image: linear-gradient( 45deg, $color-white-alpha-60 25%, @@ -76,8 +35,6 @@ ); } .progress-bar.active { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } diff --git a/stylesheets/_recorder.scss b/stylesheets/_recorder.scss deleted file mode 100644 index fe041ce8566f..000000000000 --- a/stylesheets/_recorder.scss +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright 2016-2020 Signal Messenger, LLC -// SPDX-License-Identifier: AGPL-3.0-only - -.capture-audio { - text-align: center; - - .microphone { - height: 32px; - width: 32px; - text-align: center; - opacity: 0.5; - background: transparent; - padding: 0; - border: none; - - &:focus, - &:hover { - opacity: 1; - } - - outline: none; - - &:before { - content: ''; - display: inline-block; - height: 24px; - width: 24px; - - @include light-theme { - @include color-svg( - '../images/icons/v2/mic-outline-24.svg', - $color-gray-75 - ); - } - @include dark-theme { - @include color-svg( - '../images/icons/v2/mic-solid-24.svg', - $color-gray-15 - ); - } - } - } -} -.recorder { - button { - float: right; - width: 32px; - height: 32px; - border-radius: 32px; - margin-left: 5px; - opacity: 0.3; - text-align: center; - padding: 0; - - &:focus, - &:hover { - opacity: 1; - } - - outline: none; - - .icon { - display: inline-block; - width: 24px; - height: 24px; - } - } - - .finish { - background: lighten($color-accent-green, 20%); - border: 1px solid $color-accent-green; - - .icon { - @include color-svg( - '../images/icons/v2/check-24.svg', - $color-accent-green - ); - } - } - - .close { - background: lighten($color-accent-red, 20%); - border: 1px solid $color-accent-red; - - .icon { - @include color-svg('../images/icons/v2/x-24.svg', $color-accent-red); - } - } - - .time { - color: $color-gray-60; - float: right; - line-height: 36px; - padding: 0 10px; - transform: translateY(-2px); - - @keyframes pulse { - 0% { - opacity: 0; - } - 50% { - opacity: 1; - } - 100% { - opacity: 0; - } - } - - &::before { - content: ''; - display: inline-block; - border-radius: 10px; - width: 10px; - height: 10px; - background: $color-accent-red; - margin-right: 10px; - opacity: 0; - animation: pulse 2s infinite; - } - } -} diff --git a/stylesheets/_settings.scss b/stylesheets/_settings.scss deleted file mode 100644 index 3acfebb598f4..000000000000 --- a/stylesheets/_settings.scss +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright 2016-2020 Signal Messenger, LLC -// SPDX-License-Identifier: AGPL-3.0-only - -.settings { - user-select: none; - - &.modal { - padding: 0; - background-color: transparent; - z-index: 1; - - .content { - margin: 0; - margin-left: auto; - margin-right: auto; - - width: 100%; - max-width: 450px; - border-radius: 0; - box-shadow: 0px 0px 0px 0px; - } - } - hr { - margin: 10px 0; - - @include dark-theme { - border-color: $color-gray-45; - } - } - .device-name-settings { - text-align: center; - margin-bottom: 1em; - } - .syncSettings { - button { - float: right; - line-height: 36px; - padding: 0 20px; - margin: 0 0 20px 20px; - } - .synced_at { - @include font-body-2; - color: $color-gray-60; - } - .sync_failed { - display: none; - @include font-body-2; - color: $color-accent-red; - } - } - .restart-needed { - margin-top: 1em; - } - - .clear-data-settings { - button { - float: right; - line-height: 36px; - padding: 0 20px; - margin: 0 0 20px 20px; - } - .destructive { - background-color: $color-accent-red; - color: $color-white; - } - } - - .send-link-previews-setting { - margin-top: 0.75em; - } - .description { - margin-top: 0.3em; - margin-left: 1.5em; - } - .detail { - margin-top: 0.3em; - margin-left: 1.5em; - @include font-body-2; - color: $color-gray-60; - } - - .disappearing-messages-setting { - &__timer { - display: flex; - flex-direction: row; - align-items: center; - - &__label { - flex-grow: 1; - margin-right: 20px; - } - - margin-bottom: 10px; - - &__right { - position: relative; - &__info { - position: absolute; - - @include font-subtitle; - - padding-left: 14px; - } - } - - &--with-info { - margin-bottom: 16px; - } - } - - &__footer { - @include font-body-2; - color: $color-gray-60; - } - } -} diff --git a/stylesheets/manifest.scss b/stylesheets/manifest.scss index 02b52003bcbb..e7d37c3f6ca6 100644 --- a/stylesheets/manifest.scss +++ b/stylesheets/manifest.scss @@ -9,10 +9,7 @@ // Old style: components @import 'progress'; -@import 'modal'; -@import 'recorder'; @import 'emoji'; -@import 'settings'; // Old style: main view @import 'index'; diff --git a/yarn.lock b/yarn.lock index 473e5c04ea53..3df1216cc1e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16013,13 +16013,6 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-filename@1.6.3, sanitize-filename@^1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" - integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== - dependencies: - truncate-utf8-bytes "^1.0.0" - sanitize-filename@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.2.tgz#01b4fc8809f14e9d22761fe70380fe7f3f902185" @@ -16027,6 +16020,13 @@ sanitize-filename@^1.6.2: dependencies: truncate-utf8-bytes "^1.0.0" +sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + sanitize.css@11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-11.0.0.tgz#29bb394c0543616f31cd8c58fcba8323a60e2ef6"