From daa9be8f79413c08fc30e5ae6aefa7b119388016 Mon Sep 17 00:00:00 2001 From: Andrey Marakulin Date: Tue, 8 Mar 2022 17:22:08 +0300 Subject: [PATCH 01/13] New place for settings --- css/bottom-menu.css | 1 - css/header.css | 17 +++++++++++++++++ css/main-grid.css | 5 +++++ js/bookmarks.js | 2 +- js/bottom-menu.js | 15 ++------------- js/settings.js | 2 ++ manifest.json | 2 +- newtab.html | 9 ++++++++- 8 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 css/header.css diff --git a/css/bottom-menu.css b/css/bottom-menu.css index f57e3cc..7efe2d5 100644 --- a/css/bottom-menu.css +++ b/css/bottom-menu.css @@ -4,7 +4,6 @@ height: 20px; color: white; text-shadow: 0 0 3px black; - flex-direction: row-reverse; } .bottom-menu-left { diff --git a/css/header.css b/css/header.css new file mode 100644 index 0000000..9952fe8 --- /dev/null +++ b/css/header.css @@ -0,0 +1,17 @@ +#header-row { + padding-top: 10px; +} + +.header-item-left { + height: 20px; + color: white; + text-shadow: 0 0 3px black; +} + +.header-item-right { + padding-left: 3px; + padding-right: 5px; + filter: invert(1) drop-shadow(0px 0px 3px rgb(0 0 0 / 0.4)); + width: 18px; + height: 18px; +} \ No newline at end of file diff --git a/css/main-grid.css b/css/main-grid.css index 4f22ed2..0e14bfe 100644 --- a/css/main-grid.css +++ b/css/main-grid.css @@ -8,6 +8,11 @@ body { } .app-container { + padding: 0; + transition: margin 500ms, padding 500ms; +} + +.content { padding: 100px 0 0 0; transition: margin 500ms, padding 500ms; } diff --git a/js/bookmarks.js b/js/bookmarks.js index adaeb0a..2a94975 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -221,7 +221,7 @@ function beautyfyView() { } else if (states[3] >= windowWidth) { key = 4 } - $('.app-container').css('padding-right', keys[key]['pb']).css('padding-left', keys[key]['pb']) + $('.content').css('padding-right', keys[key]['pb']).css('padding-left', keys[key]['pb']) $('.grid-item').css('padding-right', keys[key]['pi']).css('padding-left', keys[key]['pi']) $('.pseudo-grid-item').css('padding-right', keys[key]['pi']).css('padding-left', keys[key]['pi']) }) diff --git a/js/bottom-menu.js b/js/bottom-menu.js index 2532aae..14fdedc 100644 --- a/js/bottom-menu.js +++ b/js/bottom-menu.js @@ -1,4 +1,4 @@ -function updateNottomMenuBinds() { +function updateBottomMenuBinds() { $('#chrome-downloads').off('click').on('click', () => {openLink('chrome://downloads/')}) $('#chrome-bookmarks').off('click').on('click', () => {openLink('chrome://bookmarks/')}) $('#chrome-history').off('click').on('click', () => {openLink('chrome://history/')}) @@ -12,7 +12,6 @@ function addBootomMenu(cols) { let item = document.createElement('div') item.id = 'grid-item-settings' chrome.storage.local.get(['show-quick'], function (res) { - item = makeSettingsButton(item) if (res['show-quick']) { item = makeBottonMenuLeft(item) } @@ -21,7 +20,7 @@ function addBootomMenu(cols) { grid_row.id = 'row-settings' grid.appendChild(grid_row).className = 'grid-row' $('#grid-item-settings').css("width", (220 * cols - 20).toString() + "px") - updateNottomMenuBinds() + updateBottomMenuBinds() }) } @@ -51,16 +50,6 @@ function makeBottonMenuLeft(parent) { return parent } -function makeSettingsButton(parent) { - let bottom_menu = document.createElement('div') - let settings = document.createElement('img') - settings.id = 'settings-open-button' - settings.src = 'images/icons/settings.svg' - bottom_menu.appendChild(settings).className = 'bm-item right' - parent.appendChild(bottom_menu).className = 'bottom-menu-right' - return parent -} - function deleteBottomMenu() { if (document.getElementById('row-settings')) { document.getElementById('row-settings').remove() diff --git a/js/settings.js b/js/settings.js index 6a26489..43da58d 100644 --- a/js/settings.js +++ b/js/settings.js @@ -2,12 +2,14 @@ function openSettings() { $('.app-container').css('margin-right', '370px') $('.settings.window').css('right', '0px') $('.settings.cancel-overlay').css('right', '370px') + $('#settings-open-button').css('opacity', '0') } function closeSettings() { $('.app-container').css('margin-right', '0px') $('.settings.window').css('right', '-500px') $('.settings.cancel-overlay').css('right', '5000px') + $('#settings-open-button').css('opacity', '1') } $('#range-rows').on('input', function (e) { diff --git a/manifest.json b/manifest.json index a6133a9..0411376 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Pulchra bookmarks", "description": "Pulchra bookmarks extension", - "version": "0.5.0", + "version": "0.5.1", "manifest_version": 3, "minimum_chrome_version": "96", "chrome_url_overrides": { diff --git a/newtab.html b/newtab.html index 66df178..fa47895 100644 --- a/newtab.html +++ b/newtab.html @@ -9,12 +9,19 @@ +
- +
+
+
+
+ +
+
From 17e5b4d97af425b202e71e86a8f4e454c32a68d1 Mon Sep 17 00:00:00 2001 From: Andrey Marakulin Date: Tue, 8 Mar 2022 18:39:41 +0300 Subject: [PATCH 02/13] Development of header --- css/header.css | 16 +- js/app.js | 1 + js/header.js | 39 + manifest.json | 3 +- newtab.html | 4 +- third-js/jquery-ui-1.12.1.js | 18706 +++++++++++++++++++++++++++++ third-js/jquery-ui.css | 1312 ++ third-js/jquery-ui.structure.css | 886 ++ third-js/jquery-ui.theme.css | 443 + 9 files changed, 21406 insertions(+), 4 deletions(-) create mode 100644 js/header.js create mode 100644 third-js/jquery-ui-1.12.1.js create mode 100644 third-js/jquery-ui.css create mode 100644 third-js/jquery-ui.structure.css create mode 100644 third-js/jquery-ui.theme.css diff --git a/css/header.css b/css/header.css index 9952fe8..955c7ef 100644 --- a/css/header.css +++ b/css/header.css @@ -3,9 +3,11 @@ } .header-item-left { - height: 20px; + /*height: 20px;*/ color: white; text-shadow: 0 0 3px black; + /*text-overflow: ellipsis;*/ + /*overflow:hidden;*/ } .header-item-right { @@ -14,4 +16,14 @@ filter: invert(1) drop-shadow(0px 0px 3px rgb(0 0 0 / 0.4)); width: 18px; height: 18px; -} \ No newline at end of file +} + +.header-item-right:hover { + cursor: pointer; + opacity: 0.6; +} + +/*.bottom-menu-left {*/ +/* text-overflow: ellipsis;*/ +/* overflow:hidden;*/ +/*}*/ diff --git a/js/app.js b/js/app.js index 99811f3..38f70ba 100644 --- a/js/app.js +++ b/js/app.js @@ -28,6 +28,7 @@ function initSettingsValues(fromfile = false) { $(window).on('ready', () => { // load change initSettingsValues() beautyfyView() + dumpBookmarks() }) $(window).on('resize', () => { diff --git a/js/header.js b/js/header.js new file mode 100644 index 0000000..36e5193 --- /dev/null +++ b/js/header.js @@ -0,0 +1,39 @@ +$('#search').change(function () { + $('#bookmarks').empty() + dumpBookmarks($('#search').val()) +}) + +function dumpBookmarks(query) { + chrome.bookmarks.getTree((bookmarkTreeNodes) => { + $('#bookmarks').append(dumpTreeNodes(bookmarkTreeNodes[0]["children"][0]["children"], query)) + }) +} + +function dumpTreeNodes(bookmarkNodes, query) { + let list = $('