diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt index 816aba5dd..7166982a0 100644 --- a/web/CMakeLists.txt +++ b/web/CMakeLists.txt @@ -43,10 +43,6 @@ set(WEB_IMAGES assets/img/modern-tortoise.png assets/img/music.svg assets/img/package.svg - assets/img/pause-circle-active.svg - assets/img/pause-circle-idle.svg - assets/img/play-circle-active.svg - assets/img/play-circle-idle.svg assets/img/README.md assets/img/router.svg assets/img/type.svg) diff --git a/web/assets/css/transmission-app.scss b/web/assets/css/transmission-app.scss index 2925d045a..beae4e616 100644 --- a/web/assets/css/transmission-app.scss +++ b/web/assets/css/transmission-app.scss @@ -26,7 +26,6 @@ --dialog-logo-padding: calc(var(--dialog-padding) * 0.66); --dialog-padding: 20px; --logo-size: 64px; - --pauseresume-size: 20px; --popup-top: 82px; // TODO: ugly that this is hardcoded --toolbar-height: 50px; @@ -65,10 +64,6 @@ --image-chevron-up: url('../img/chevron-up.svg'); --image-lock-fill: url('../img/lock-fill.svg'); --image-magnet: url('../img/magnet.svg'); - --image-pause-circle-active: url('../img/pause-circle-active.svg'); - --image-pause-circle-idle: url('../img/pause-circle-idle.svg'); - --image-play-circle-active: url('../img/play-circle-active.svg'); - --image-play-circle-idle: url('../img/play-circle-idle.svg'); --app-image-url: url('../img/box.svg'); --audio-image-url: url('../img/music.svg'); @@ -622,7 +617,7 @@ a { grid-area: peers; } - .torrent-progress { + .torrent-progress-bar { display: flex; flex-direction: row; grid-area: progressbar; @@ -664,32 +659,6 @@ a { background-repeat: no-repeat; } - .torrent-pauseresume-button { - background-position: center center; - background-repeat: no-repeat; - background-size: var(--pauseresume-size); - margin-left: calc(var(--pauseresume-size) / 2); - width: var(--pauseresume-size); - - &[data-action='pause'] { - background-image: var(--image-pause-circle-idle); - - &:active, - &:hover { - background-image: var(--image-pause-circle-active); - } - } - - &[data-action='resume'] { - background-image: var(--image-play-circle-idle); - - &:active, - &:hover { - background-image: var(--image-play-circle-active); - } - } - } - .torrent-progress-bar { font-size: 14px; position: relative; diff --git a/web/assets/img/README.md b/web/assets/img/README.md index 478ee234a..63664d8f2 100644 --- a/web/assets/img/README.md +++ b/web/assets/img/README.md @@ -7,10 +7,6 @@ license: Apache-2.0 license - horizontal-rule.svg -- pause-circle-active.svg -- pause-circle-idle.svg -- play-circle-active.svg -- play-circle-idle.svg - router.svg ## [Feather Icons](https://github.com/feathericons/feather) diff --git a/web/assets/img/pause-circle-active.svg b/web/assets/img/pause-circle-active.svg deleted file mode 100644 index 7493ad671..000000000 --- a/web/assets/img/pause-circle-active.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/web/assets/img/pause-circle-idle.svg b/web/assets/img/pause-circle-idle.svg deleted file mode 100644 index 00ed842e3..000000000 --- a/web/assets/img/pause-circle-idle.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - <?xmlversion="1.0"encoding="UTF-8"?><!--Generator:AppleNativeCoreSVG232.5--><!DOCTYPEsvgPUBLIC"-//W3C//DTDSVG1.1//EN""http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svgversion="1.1"xmlns="http://www.w3.org/2000/svg"xmlns:xlink="http://www.w3.org/1999/xlink"width="60"height="59.7949"><g><rectheight="59.7949"opacity="0"width="60"x="0"y="0"/><pathd="M29.882859.7656C46.230559.765659.765646.201259.765629.8828C59.765613.535246.2012029.85350C13.53520013.5352029.8828C046.201213.564559.765629.882859.7656Z"fill="#808080"/><pathd="M21.357441.6602C19.863341.660219.189540.839819.189539.668L19.189520.0391C19.189518.896519.863318.076221.357418.0762L24.316418.0762C25.839818.076226.513718.896526.513720.0391L26.513739.668C26.513740.839825.839841.660224.316441.6602ZM35.507841.6602C33.984441.660233.310540.839833.310539.668L33.310520.0391C33.310518.896533.984418.076235.507818.0762L38.466818.0762C39.931618.076240.605518.896540.605520.0391L40.605539.668C40.605540.839839.931641.660238.466841.6602Z"fill="#ffffff"/></g></svg> - - - - - - diff --git a/web/assets/img/play-circle-active.svg b/web/assets/img/play-circle-active.svg deleted file mode 100644 index 998a49a5e..000000000 --- a/web/assets/img/play-circle-active.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/web/assets/img/play-circle-idle.svg b/web/assets/img/play-circle-idle.svg deleted file mode 100644 index 83bcf27c2..000000000 --- a/web/assets/img/play-circle-idle.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - <?xmlversion="1.0"encoding="UTF-8"?><!--Generator:AppleNativeCoreSVG232.5--><!DOCTYPEsvgPUBLIC"-//W3C//DTDSVG1.1//EN""http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svgversion="1.1"xmlns="http://www.w3.org/2000/svg"xmlns:xlink="http://www.w3.org/1999/xlink"width="60"height="59.7949"><g><rectheight="59.7949"opacity="0"width="60"x="0"y="0"/><pathd="M29.882859.7656C46.230559.765659.765646.201259.765629.8828C59.765613.535246.2012029.85350C13.53520013.5352029.8828C046.201213.564559.765629.882859.7656Z"fill="#808080"/><pathd="M24.316441.6895C22.910242.539121.298841.865221.298840.4004L21.298819.3945C21.298817.95923.027317.343824.316418.1055L41.513728.3008C42.744129.033242.773430.79141.513731.5527Z"fill="#ffffff"/></g></svg> - - - - - - diff --git a/web/src/torrent-row.js b/web/src/torrent-row.js index 96d323f96..2d4be4faa 100644 --- a/web/src/torrent-row.js +++ b/web/src/torrent-row.js @@ -217,14 +217,7 @@ export class TorrentRendererFull { render(controller, torrent, root) { const is_stopped = torrent.isStopped(); root.classList.toggle('paused', is_stopped); - const { - button, - labels, - name, - peer_details, - progressbar, - progress_details, - } = root; + const { labels, name, peer_details, progressbar, progress_details } = root; // name setTextContent(name, torrent.getName()); @@ -243,10 +236,6 @@ export class TorrentRendererFull { TorrentRendererHelper.renderProgressbar(controller, torrent, progressbar); progressbar.classList.add('full'); - // pause/resume button - button.alt = is_stopped ? 'Resume' : 'Pause'; - button.dataset.action = is_stopped ? 'resume' : 'pause'; - // peer details TorrentRendererFull.renderPeerDetails(torrent, peer_details); } @@ -261,7 +250,7 @@ export class TorrentRendererFull { ['name', 'torrent-name'], ['labels', 'torrent-labels'], ['progress_details', 'torrent-progress-details'], - ['progress', 'torrent-progress'], + ['progressbar', 'torrent-progress-bar full'], ['peer_details', 'torrent-peer-details'], ]; @@ -274,16 +263,6 @@ export class TorrentRendererFull { TorrentRendererHelper.updateIcon(root.icon, torrent); - const progressbar = document.createElement('div'); - progressbar.className = 'torrent-progress-bar full'; - - const button = document.createElement('a'); - button.className = 'torrent-pauseresume-button'; - - root.progress.append(progressbar, button); - root.progressbar = progressbar; - root.button = button; - return root; } } diff --git a/web/src/transmission.js b/web/src/transmission.js index 24ca88fa5..6a94aa6fe 100644 --- a/web/src/transmission.js +++ b/web/src/transmission.js @@ -781,20 +781,6 @@ TODO: fix this when notifications get fixed this.setCurrentPopup(null); } - // handle the per-row pause/resume button - if (event_.target.classList.contains('torrent-pauseresume-button')) { - switch (event_.target.dataset.action) { - case 'pause': - this._stopTorrents([row.getTorrent()]); - break; - case 'resume': - this._startTorrents([row.getTorrent()]); - break; - default: - break; - } - } - // Prevents click carrying to parent element // which deselects all on click event_.stopPropagation();