diff --git a/app/header/index.css b/app/header/index.css index 592fcae..33c79f9 100644 --- a/app/header/index.css +++ b/app/header/index.css @@ -66,16 +66,16 @@ header.error .js-error { display: block; } -header .js-sync { color: #888; width: 24px; height: 24px; right: 107px; top: 7px; box-shadow: inset 0 0 0 2px; transform: translateZ(0); } +header .js-sync { color: #888; width: 22px; height: 22px; right: 107px; top: 8px; box-shadow: inset 0 0 0 2px; transform: translateZ(0); } .js-sync, .js-sync:before, .js-sync:after { border-radius: 50%; background-color: inherit; } .js-sync:before, -.js-sync:after { width: 13px; height: 26px; position: absolute; content: ''; } +.js-sync:after { width: 12px; height: 24px; position: absolute; content: ''; } -.js-sync:before { top: -1px; left: -1px; transform-origin: 13px 13px; border-radius: 26px 0 0 26px; animation: spin 2s infinite ease 1.5s; } -.js-sync:after { top: -1px; left: 12px; transform-origin: 0 13px; border-radius: 0 26px 26px 0; animation: spin 2s infinite ease; } +.js-sync:before { top: -1px; left: -1px; transform-origin: 12px 12px; border-radius: 24px 0 0 24px; animation: spin 2s infinite ease 1.5s; } +.js-sync:after { top: -1px; left: 11px; transform-origin: 0 12px; border-radius: 0 24px 24px 0; animation: spin 2s infinite ease; } @keyframes spin { 0% { transform: rotate(0); } 100% { transform: rotate(360deg); }} diff --git a/app/touchbar/index.js b/app/touchbar/index.js index 7a2f2c2..3ac42cf 100644 --- a/app/touchbar/index.js +++ b/app/touchbar/index.js @@ -1,5 +1,5 @@ -const {TouchBar, getCurrentWindow} = require('electron').remote; -const {TouchBarButton, TouchBarSpacer} = TouchBar; +const { TouchBar, getCurrentWindow } = require('electron').remote; +const { TouchBarButton, TouchBarSpacer } = TouchBar; const { config, EVENT } = require('../services'); const $ = require('../util'); @@ -24,6 +24,7 @@ function initBar () { const btnAddressbar = new TouchBarButton({ label: 'Search or type url ', // these are nbsp chars + // image: './assets/tb-logo.png', click: () => $.trigger(EVENT.address.focus) }); @@ -49,6 +50,7 @@ function bookmarkExists (exists) { empty: './assets/tb-bookmark-outline.png', full: './assets/tb-bookmark.png', }; + btnBookmark.backgroundColor = exists ? '#555' : '#444'; btnBookmark.icon = exists ? icons.full : icons.empty; } diff --git a/assets/icon.png b/assets/icon.png index d564dfc..30da9b9 100644 Binary files a/assets/icon.png and b/assets/icon.png differ diff --git a/assets/tb-arrow-back.png b/assets/tb-arrow-back.png new file mode 100644 index 0000000..18dbcf9 Binary files /dev/null and b/assets/tb-arrow-back.png differ diff --git a/assets/tb-arrow-forward.png b/assets/tb-arrow-forward.png new file mode 100644 index 0000000..d272ce1 Binary files /dev/null and b/assets/tb-arrow-forward.png differ diff --git a/assets/tb-bookmark-outline.png b/assets/tb-bookmark-outline.png index 0082efb..3f9a28e 100644 Binary files a/assets/tb-bookmark-outline.png and b/assets/tb-bookmark-outline.png differ diff --git a/assets/tb-bookmark.png b/assets/tb-bookmark.png index be1537e..822dbdd 100644 Binary files a/assets/tb-bookmark.png and b/assets/tb-bookmark.png differ diff --git a/assets/tb-home.png b/assets/tb-home.png new file mode 100644 index 0000000..25a9565 Binary files /dev/null and b/assets/tb-home.png differ diff --git a/assets/tb-logo.png b/assets/tb-logo.png new file mode 100644 index 0000000..779c957 Binary files /dev/null and b/assets/tb-logo.png differ diff --git a/assets/tb-refresh.png b/assets/tb-refresh.png index 4aa6330..94b3d92 100644 Binary files a/assets/tb-refresh.png and b/assets/tb-refresh.png differ