From b3c3963be23e72d0a1cc14c896320b3b62998012 Mon Sep 17 00:00:00 2001 From: Almog Lemberg Date: Mon, 11 Apr 2022 16:15:50 +0300 Subject: [PATCH 1/9] Added scrollbar css --- src/assets/scrollbar-button-down.svg | 1 + src/assets/scrollbar-button-left.svg | 1 + src/assets/scrollbar-button-right.svg | 1 + src/assets/scrollbar-button-up.svg | 1 + src/assets/scrollbar-track-horizonal.svg | 1 + src/assets/scrollbar-track-vertical.svg | 1 + src/index.css | 57 ++++++++++++++++++++++++ 7 files changed, 63 insertions(+) create mode 100644 src/assets/scrollbar-button-down.svg create mode 100644 src/assets/scrollbar-button-left.svg create mode 100644 src/assets/scrollbar-button-right.svg create mode 100644 src/assets/scrollbar-button-up.svg create mode 100644 src/assets/scrollbar-track-horizonal.svg create mode 100644 src/assets/scrollbar-track-vertical.svg diff --git a/src/assets/scrollbar-button-down.svg b/src/assets/scrollbar-button-down.svg new file mode 100644 index 000000000..173fda716 --- /dev/null +++ b/src/assets/scrollbar-button-down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/scrollbar-button-left.svg b/src/assets/scrollbar-button-left.svg new file mode 100644 index 000000000..d6a4df4f4 --- /dev/null +++ b/src/assets/scrollbar-button-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/scrollbar-button-right.svg b/src/assets/scrollbar-button-right.svg new file mode 100644 index 000000000..a20630bde --- /dev/null +++ b/src/assets/scrollbar-button-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/scrollbar-button-up.svg b/src/assets/scrollbar-button-up.svg new file mode 100644 index 000000000..f9f93f438 --- /dev/null +++ b/src/assets/scrollbar-button-up.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/scrollbar-track-horizonal.svg b/src/assets/scrollbar-track-horizonal.svg new file mode 100644 index 000000000..956d17171 --- /dev/null +++ b/src/assets/scrollbar-track-horizonal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/scrollbar-track-vertical.svg b/src/assets/scrollbar-track-vertical.svg new file mode 100644 index 000000000..72a4d37b9 --- /dev/null +++ b/src/assets/scrollbar-track-vertical.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/index.css b/src/index.css index 69487a7a7..da0892bd3 100644 --- a/src/index.css +++ b/src/index.css @@ -1,3 +1,60 @@ #root { height: 100%; } + +/* Scrollbar */ + +::-webkit-scrollbar { + width: 16px; +} +::-webkit-scrollbar:horizontal { + height: 17px; +} + +::-webkit-scrollbar { + width: 16px; +} +::-webkit-scrollbar:horizontal { + height: 17px; +} +::-webkit-scrollbar-corner { + background: #dfdfdf; +} + +::-webkit-scrollbar-thumb { + background-position: 50%; + background-repeat: no-repeat; + background-color: #c8d6fb; + background-size: 7px; + border: 1px solid #fff; + border-radius: 2px; + box-shadow: inset -3px 0 #bad1fc, inset 1px 1px #b7caf5; + background-image: url(./assets/scrollbar-track-vertical.svg); +} + +::-webkit-scrollbar-thumb:horizontal { + background-image: url(./assets/scrollbar-track-horizonal.svg); +} + +::-webkit-scrollbar-button:horizontal:start:decrement, +::-webkit-scrollbar-button:horizontal:end:increment, +::-webkit-scrollbar-button:vertical:start:decrement, +::-webkit-scrollbar-button:vertical:end:increment { + display: block; +} +::-webkit-scrollbar-button:vertical:start { + height: 17px; + background-image: url(./assets/scrollbar-button-up.svg); +} +::-webkit-scrollbar-button:vertical:end { + height: 17px; + background-image: url(./assets/scrollbar-button-down.svg); +} +::-webkit-scrollbar-button:horizontal:start { + width: 16px; + background-image: url(./assets/scrollbar-button-left.svg); +} +::-webkit-scrollbar-button:horizontal:end { + width: 16px; + background-image: url(./assets/scrollbar-button-right.svg); +} From 152729397de7e7a5cdf8fa955b43c98285d8a2df Mon Sep 17 00:00:00 2001 From: Almog Lemberg Date: Mon, 11 Apr 2022 20:18:43 +0300 Subject: [PATCH 2/9] Added hover and active css, fixed cursor issue --- src/index.css | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/index.css b/src/index.css index da0892bd3..7243fe0df 100644 --- a/src/index.css +++ b/src/index.css @@ -2,8 +2,18 @@ height: 100%; } +textarea { + cursor: auto; +} + /* Scrollbar */ +/* CSS taken from: https://botoxparty.github.io/XP.css/ */ + +::-webkit-scrollbar-track { + background-color: #f3f7f0; +} + ::-webkit-scrollbar { width: 16px; } @@ -17,6 +27,7 @@ ::-webkit-scrollbar:horizontal { height: 17px; } + ::-webkit-scrollbar-corner { background: #dfdfdf; } @@ -28,10 +39,22 @@ background-size: 7px; border: 1px solid #fff; border-radius: 2px; - box-shadow: inset -3px 0 #bad1fc, inset 1px 1px #b7caf5; + box-shadow: inset -2px 0 #bad1fc, inset 1px 1px #b7caf5; background-image: url(./assets/scrollbar-track-vertical.svg); } +::-webkit-scrollbar-thumb:hover { + filter: brightness(0.4); + background-color: #cbe4fb; + box-shadow: inset -2px 0 #ddeaf5, inset 1px 1px #ddeaf5; +} + +::-webkit-scrollbar-thumb:active { + background-color: rgb(176, 193, 237); + box-shadow: inset -2px 0 #a6b7e6, inset 1px 1px #a6b7e6; + filter: brightness(0); +} + ::-webkit-scrollbar-thumb:horizontal { background-image: url(./assets/scrollbar-track-horizonal.svg); } @@ -42,6 +65,7 @@ ::-webkit-scrollbar-button:vertical:end:increment { display: block; } + ::-webkit-scrollbar-button:vertical:start { height: 17px; background-image: url(./assets/scrollbar-button-up.svg); From eaceac9a9ad4a93b99ce3f65591a85ce86c66531 Mon Sep 17 00:00:00 2001 From: Almog Lemberg Date: Wed, 13 Apr 2022 10:48:29 +0300 Subject: [PATCH 3/9] svg files location and name changes --- src/assets/scrollbar-button-down.svg | 1 - src/assets/scrollbar-button-left.svg | 1 - src/assets/scrollbar-button-right.svg | 1 - src/assets/scrollbar-button-up.svg | 1 - src/assets/scrollbar-track-horizonal.svg | 1 - src/assets/scrollbar-track-vertical.svg | 1 - src/assets/scrollbar/button-down.svg | 119 ++++++++++++++++++++++ src/assets/scrollbar/button-left.svg | 117 +++++++++++++++++++++ src/assets/scrollbar/button-right.svg | 120 ++++++++++++++++++++++ src/assets/scrollbar/button-up.svg | 123 +++++++++++++++++++++++ src/assets/scrollbar/track-horizonal.svg | 9 ++ src/assets/scrollbar/track-vertical.svg | 7 ++ src/index.css | 12 +-- 13 files changed, 501 insertions(+), 12 deletions(-) delete mode 100644 src/assets/scrollbar-button-down.svg delete mode 100644 src/assets/scrollbar-button-left.svg delete mode 100644 src/assets/scrollbar-button-right.svg delete mode 100644 src/assets/scrollbar-button-up.svg delete mode 100644 src/assets/scrollbar-track-horizonal.svg delete mode 100644 src/assets/scrollbar-track-vertical.svg create mode 100644 src/assets/scrollbar/button-down.svg create mode 100644 src/assets/scrollbar/button-left.svg create mode 100644 src/assets/scrollbar/button-right.svg create mode 100644 src/assets/scrollbar/button-up.svg create mode 100644 src/assets/scrollbar/track-horizonal.svg create mode 100644 src/assets/scrollbar/track-vertical.svg diff --git a/src/assets/scrollbar-button-down.svg b/src/assets/scrollbar-button-down.svg deleted file mode 100644 index 173fda716..000000000 --- a/src/assets/scrollbar-button-down.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/scrollbar-button-left.svg b/src/assets/scrollbar-button-left.svg deleted file mode 100644 index d6a4df4f4..000000000 --- a/src/assets/scrollbar-button-left.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/scrollbar-button-right.svg b/src/assets/scrollbar-button-right.svg deleted file mode 100644 index a20630bde..000000000 --- a/src/assets/scrollbar-button-right.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/scrollbar-button-up.svg b/src/assets/scrollbar-button-up.svg deleted file mode 100644 index f9f93f438..000000000 --- a/src/assets/scrollbar-button-up.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/scrollbar-track-horizonal.svg b/src/assets/scrollbar-track-horizonal.svg deleted file mode 100644 index 956d17171..000000000 --- a/src/assets/scrollbar-track-horizonal.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/scrollbar-track-vertical.svg b/src/assets/scrollbar-track-vertical.svg deleted file mode 100644 index 72a4d37b9..000000000 --- a/src/assets/scrollbar-track-vertical.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/scrollbar/button-down.svg b/src/assets/scrollbar/button-down.svg new file mode 100644 index 000000000..b09d57e7b --- /dev/null +++ b/src/assets/scrollbar/button-down.svg @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/scrollbar/button-left.svg b/src/assets/scrollbar/button-left.svg new file mode 100644 index 000000000..d2fdbbc9c --- /dev/null +++ b/src/assets/scrollbar/button-left.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/scrollbar/button-right.svg b/src/assets/scrollbar/button-right.svg new file mode 100644 index 000000000..8ccce69d4 --- /dev/null +++ b/src/assets/scrollbar/button-right.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/scrollbar/button-up.svg b/src/assets/scrollbar/button-up.svg new file mode 100644 index 000000000..a4caac66c --- /dev/null +++ b/src/assets/scrollbar/button-up.svg @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/scrollbar/track-horizonal.svg b/src/assets/scrollbar/track-horizonal.svg new file mode 100644 index 000000000..8b15baa37 --- /dev/null +++ b/src/assets/scrollbar/track-horizonal.svg @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/src/assets/scrollbar/track-vertical.svg b/src/assets/scrollbar/track-vertical.svg new file mode 100644 index 000000000..a52df6b7c --- /dev/null +++ b/src/assets/scrollbar/track-vertical.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/index.css b/src/index.css index 7243fe0df..acf54d15e 100644 --- a/src/index.css +++ b/src/index.css @@ -40,7 +40,7 @@ textarea { border: 1px solid #fff; border-radius: 2px; box-shadow: inset -2px 0 #bad1fc, inset 1px 1px #b7caf5; - background-image: url(./assets/scrollbar-track-vertical.svg); + background-image: url(./assets/scrollbar/track-vertical.svg); } ::-webkit-scrollbar-thumb:hover { @@ -56,7 +56,7 @@ textarea { } ::-webkit-scrollbar-thumb:horizontal { - background-image: url(./assets/scrollbar-track-horizonal.svg); + background-image: url(./assets/scrollbar/track-horizonal.svg); } ::-webkit-scrollbar-button:horizontal:start:decrement, @@ -68,17 +68,17 @@ textarea { ::-webkit-scrollbar-button:vertical:start { height: 17px; - background-image: url(./assets/scrollbar-button-up.svg); + background-image: url(./assets/scrollbar/button-up.svg); } ::-webkit-scrollbar-button:vertical:end { height: 17px; - background-image: url(./assets/scrollbar-button-down.svg); + background-image: url(./assets/scrollbar/button-down.svg); } ::-webkit-scrollbar-button:horizontal:start { width: 16px; - background-image: url(./assets/scrollbar-button-left.svg); + background-image: url(./assets/scrollbar/button-left.svg); } ::-webkit-scrollbar-button:horizontal:end { width: 16px; - background-image: url(./assets/scrollbar-button-right.svg); + background-image: url(./assets/scrollbar/button-right.svg); } From 1c941838603a5130947ff7a63f4b0e6d8d08b5c7 Mon Sep 17 00:00:00 2001 From: Almog Lemberg Date: Wed, 13 Apr 2022 16:36:38 +0300 Subject: [PATCH 4/9] Scrollbar CSS moved into external js file --- src/WinXP/apps/Notepad/index.js | 38 ++-------------- src/WinXP/apps/Notepad/utils.js | 32 +++++++++++++ src/WinXP/index.js | 3 ++ src/index.css | 77 ------------------------------- src/scrollbar.js | 80 +++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 112 deletions(-) create mode 100644 src/WinXP/apps/Notepad/utils.js create mode 100644 src/scrollbar.js diff --git a/src/WinXP/apps/Notepad/index.js b/src/WinXP/apps/Notepad/index.js index 5c05977e6..b374cd222 100644 --- a/src/WinXP/apps/Notepad/index.js +++ b/src/WinXP/apps/Notepad/index.js @@ -5,6 +5,7 @@ import styled from 'styled-components'; import { WindowDropDowns } from 'components'; import { getDropDownData } from './dropDownData'; +import { getNotepadIframeStyle } from './utils'; import { Context as AppContext } from '../../index'; import { ADD_APP } from '../../constants/actions'; @@ -242,46 +243,13 @@ export default function Notepad({ onClose, isFocus }) { }); } - const frameInitialContent = ` - - - - -
`; - return (
- - + +