From f7c16704a23e4e43256c642f12763ff57ae37cf2 Mon Sep 17 00:00:00 2001 From: haxy Date: Tue, 16 Jul 2024 23:23:32 +0300 Subject: [PATCH 01/10] cant see bar anymore --- index.jsx | 2 ++ lib/components/sideicon.jsx | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 lib/components/sideicon.jsx diff --git a/index.jsx b/index.jsx index e26cdb3b..0c9a8816 100644 --- a/index.jsx +++ b/index.jsx @@ -30,6 +30,7 @@ import * as DataWidgetLoader from "./lib/components/data/data-widget-loader.jsx" import * as DataWidget from "./lib/components/data/data-widget.jsx"; import * as Utils from "./lib/utils"; import * as Settings from "./lib/settings"; +import MyIcon from "./lib/components/sideicon.jsx"; const refreshFrequency = false; @@ -128,6 +129,7 @@ function render({ output, error }) { windows={windows} skhdMode={skhdMode} > + diff --git a/lib/components/sideicon.jsx b/lib/components/sideicon.jsx new file mode 100644 index 00000000..6f99c710 --- /dev/null +++ b/lib/components/sideicon.jsx @@ -0,0 +1,16 @@ +import React from 'react'; + +const MyIcon = () => ( + + + +); + +export default MyIcon; From 478d5c77a7a97dd6089efc0609736efa398fbe33 Mon Sep 17 00:00:00 2001 From: haxy Date: Wed, 17 Jul 2024 11:37:49 +0300 Subject: [PATCH 02/10] icon appears --- index.jsx | 4 ++-- lib/components/side-icon.jsx | 17 +++++++++++++++++ lib/components/sideicon.jsx | 16 ---------------- 3 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 lib/components/side-icon.jsx delete mode 100644 lib/components/sideicon.jsx diff --git a/index.jsx b/index.jsx index 0c9a8816..2a1db2b9 100644 --- a/index.jsx +++ b/index.jsx @@ -30,7 +30,7 @@ import * as DataWidgetLoader from "./lib/components/data/data-widget-loader.jsx" import * as DataWidget from "./lib/components/data/data-widget.jsx"; import * as Utils from "./lib/utils"; import * as Settings from "./lib/settings"; -import MyIcon from "./lib/components/sideicon.jsx"; +import SideIcon from "./lib/components/side-icon.jsx"; const refreshFrequency = false; @@ -129,7 +129,7 @@ function render({ output, error }) { windows={windows} skhdMode={skhdMode} > - + diff --git a/lib/components/side-icon.jsx b/lib/components/side-icon.jsx new file mode 100644 index 00000000..7a731392 --- /dev/null +++ b/lib/components/side-icon.jsx @@ -0,0 +1,17 @@ +import * as Uebersicht from "uebersicht"; + +const { React } = Uebersicht; + +const SideIcon = () => ( + + + +); + +export default SideIcon; diff --git a/lib/components/sideicon.jsx b/lib/components/sideicon.jsx deleted file mode 100644 index 6f99c710..00000000 --- a/lib/components/sideicon.jsx +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; - -const MyIcon = () => ( - - - -); - -export default MyIcon; From 28961d83ce4e8a9b14eba033ed92969cf180de9d Mon Sep 17 00:00:00 2001 From: haxy Date: Wed, 17 Jul 2024 22:25:39 +0300 Subject: [PATCH 03/10] added styles and changed component name --- lib/components/side-icon.jsx | 3 +++ lib/styles/components/side-icon.js | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 lib/styles/components/side-icon.js diff --git a/lib/components/side-icon.jsx b/lib/components/side-icon.jsx index 7a731392..0eb47a57 100644 --- a/lib/components/side-icon.jsx +++ b/lib/components/side-icon.jsx @@ -2,8 +2,11 @@ import * as Uebersicht from "uebersicht"; const { React } = Uebersicht; +export { sideIconStyles as styles } from "../../lib/styles/components/side-icon"; + const SideIcon = () => ( Date: Wed, 17 Jul 2024 22:30:38 +0300 Subject: [PATCH 04/10] exporting component instead of just icon --- index.jsx | 4 ++-- lib/components/side-icon.jsx | 5 ++--- lib/styles/components/side-icon.js | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/index.jsx b/index.jsx index 2a1db2b9..94929576 100644 --- a/index.jsx +++ b/index.jsx @@ -30,7 +30,7 @@ import * as DataWidgetLoader from "./lib/components/data/data-widget-loader.jsx" import * as DataWidget from "./lib/components/data/data-widget.jsx"; import * as Utils from "./lib/utils"; import * as Settings from "./lib/settings"; -import SideIcon from "./lib/components/side-icon.jsx"; +import * as SideIcon from "./lib/components/side-icon.jsx"; const refreshFrequency = false; @@ -129,7 +129,7 @@ function render({ output, error }) { windows={windows} skhdMode={skhdMode} > - + diff --git a/lib/components/side-icon.jsx b/lib/components/side-icon.jsx index 0eb47a57..9817ffbb 100644 --- a/lib/components/side-icon.jsx +++ b/lib/components/side-icon.jsx @@ -3,8 +3,7 @@ import * as Uebersicht from "uebersicht"; const { React } = Uebersicht; export { sideIconStyles as styles } from "../../lib/styles/components/side-icon"; - -const SideIcon = () => ( +export const Component = () => ( ( ); -export default SideIcon; +// export default SideIcon; diff --git a/lib/styles/components/side-icon.js b/lib/styles/components/side-icon.js index 71c8b8c0..677ed2f0 100644 --- a/lib/styles/components/side-icon.js +++ b/lib/styles/components/side-icon.js @@ -1,5 +1,5 @@ export const sideIconStyles = /* css */ ` .side-icon { - margin-right: 30px; + margin-left: 30px; } `; \ No newline at end of file From d074019b98249928fdad2e3aac1be63e5d13e96a Mon Sep 17 00:00:00 2001 From: haxy Date: Wed, 17 Jul 2024 22:31:00 +0300 Subject: [PATCH 05/10] editing styles works!! --- index.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/index.jsx b/index.jsx index 94929576..31c3ffba 100644 --- a/index.jsx +++ b/index.jsx @@ -78,6 +78,7 @@ Utils.injectStyles("simple-bar-index-styles", [ Graph.styles, DataWidgetLoader.styles, settings.customStyles.styles, + SideIcon.styles, ]); function render({ output, error }) { From c1960fa42618b835ea663f0783b226b9766577ac Mon Sep 17 00:00:00 2001 From: haxy Date: Wed, 17 Jul 2024 22:39:04 +0300 Subject: [PATCH 06/10] works, just need to add this in settings --- lib/styles/components/side-icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/styles/components/side-icon.js b/lib/styles/components/side-icon.js index 677ed2f0..984ec15b 100644 --- a/lib/styles/components/side-icon.js +++ b/lib/styles/components/side-icon.js @@ -1,5 +1,5 @@ export const sideIconStyles = /* css */ ` .side-icon { - margin-left: 30px; + margin: 5px 5px 5px 10px; } `; \ No newline at end of file From 80c0b9a9de568598ece5bf943660dcef5fa3570e Mon Sep 17 00:00:00 2001 From: haxy Date: Sat, 20 Jul 2024 13:32:26 +0300 Subject: [PATCH 07/10] chnaged icon to apple icon --- lib/components/side-icon.jsx | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/components/side-icon.jsx b/lib/components/side-icon.jsx index 9817ffbb..4c1a4772 100644 --- a/lib/components/side-icon.jsx +++ b/lib/components/side-icon.jsx @@ -5,15 +5,12 @@ const { React } = Uebersicht; export { sideIconStyles as styles } from "../../lib/styles/components/side-icon"; export const Component = () => ( - + fill="currentColor" + className="side-icon" + xmlns="http://www.w3.org/2000/svg" + width="19.51px" + height="24px" + viewBox="0 0 256 315"> + ); - -// export default SideIcon; From ca2ea9a579f29f2f45f70e194bb24b89959ea92b Mon Sep 17 00:00:00 2001 From: haxy Date: Sat, 20 Jul 2024 13:35:08 +0300 Subject: [PATCH 08/10] changed icon to apple icon --- lib/components/side-icon.jsx | 4 ++-- lib/styles/components/side-icon.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/components/side-icon.jsx b/lib/components/side-icon.jsx index 4c1a4772..80d45d62 100644 --- a/lib/components/side-icon.jsx +++ b/lib/components/side-icon.jsx @@ -8,8 +8,8 @@ export const Component = () => ( fill="currentColor" className="side-icon" xmlns="http://www.w3.org/2000/svg" - width="19.51px" - height="24px" + width="20px" + height="20px" viewBox="0 0 256 315"> diff --git a/lib/styles/components/side-icon.js b/lib/styles/components/side-icon.js index 984ec15b..28074d29 100644 --- a/lib/styles/components/side-icon.js +++ b/lib/styles/components/side-icon.js @@ -1,5 +1,5 @@ export const sideIconStyles = /* css */ ` .side-icon { - margin: 5px 5px 5px 10px; + margin: 3px 5px 5px 5px; } `; \ No newline at end of file From 3544a85d1e2dcf9b3d0595174adfe589a5582cbc Mon Sep 17 00:00:00 2001 From: haxy Date: Wed, 31 Jul 2024 14:03:07 +0300 Subject: [PATCH 09/10] centered applei icon inside conatiner --- lib/components/side-icon.jsx | 6 ++++-- lib/styles/components/side-icon.js | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/components/side-icon.jsx b/lib/components/side-icon.jsx index 80d45d62..45f39bf4 100644 --- a/lib/components/side-icon.jsx +++ b/lib/components/side-icon.jsx @@ -4,13 +4,15 @@ const { React } = Uebersicht; export { sideIconStyles as styles } from "../../lib/styles/components/side-icon"; export const Component = () => ( +
+
); diff --git a/lib/styles/components/side-icon.js b/lib/styles/components/side-icon.js index 28074d29..e2cc2bea 100644 --- a/lib/styles/components/side-icon.js +++ b/lib/styles/components/side-icon.js @@ -1,5 +1,21 @@ export const sideIconStyles = /* css */ ` .side-icon { - margin: 3px 5px 5px 5px; + margin: auto; +} + +.icon-container { +border: 1px solid #333; + border-radius: 15%; + display: flex; + align-items: center; + justify-content: center; + // height: 30px; + // width: 30px; + margin: 0 10px 0 0; + // background-color: #333; + color: #fff; + font-size: 20px; + cursor: pointer; + transition: background-color 0.3s; } `; \ No newline at end of file From b6867dedd8c6ded0d1425197766bcf9631605ed9 Mon Sep 17 00:00:00 2001 From: haxy Date: Sun, 4 Aug 2024 21:55:18 +0300 Subject: [PATCH 10/10] removed borders and centered icon properly --- lib/styles/components/side-icon.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/styles/components/side-icon.js b/lib/styles/components/side-icon.js index e2cc2bea..b2abe104 100644 --- a/lib/styles/components/side-icon.js +++ b/lib/styles/components/side-icon.js @@ -4,18 +4,10 @@ export const sideIconStyles = /* css */ ` } .icon-container { -border: 1px solid #333; - border-radius: 15%; display: flex; align-items: center; justify-content: center; - // height: 30px; - // width: 30px; - margin: 0 10px 0 0; - // background-color: #333; + margin: 0 10px 0 5px; color: #fff; - font-size: 20px; - cursor: pointer; - transition: background-color 0.3s; } `; \ No newline at end of file