From 53184ce8de4162c629e5e4c664756c4f8570c59c Mon Sep 17 00:00:00 2001 From: Joshua Reilly Date: Tue, 26 Jan 2016 15:51:48 -0700 Subject: [PATCH 1/5] Wrap directory and path in quotes to handle spaces in directory names --- kiwi.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiwi.bat b/kiwi.bat index ea3996b9a..fae553af4 100755 --- a/kiwi.bat +++ b/kiwi.bat @@ -1,2 +1,2 @@ @echo off -node %~dp0\server\helpers\launcher.js %* \ No newline at end of file +node "%~dp0\server\helpers\launcher.js" %* \ No newline at end of file From 7e8d8b43fd0e61cfea734092ac61741baaec2727 Mon Sep 17 00:00:00 2001 From: Joshua Reilly Date: Fri, 5 Feb 2016 09:56:43 -0700 Subject: [PATCH 2/5] Theme scrollbars in webkit browsers. At least partially satisfies issue #824. --- client/assets/themes/basic/style.css | 32 ++++++++++++++++++++++++++ client/assets/themes/cli/style.css | 8 ++++++- client/assets/themes/mini/style.css | 32 ++++++++++++++++++++++++++ client/assets/themes/relaxed/style.css | 32 ++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 1 deletion(-) diff --git a/client/assets/themes/basic/style.css b/client/assets/themes/basic/style.css index ffeb5d8a5..e1f3bc0d5 100644 --- a/client/assets/themes/basic/style.css +++ b/client/assets/themes/basic/style.css @@ -486,4 +486,36 @@ #kiwi .settings_container .settings-category-list a.active { border-left: solid 4px #a6c42c; color: #36C; +} + +#kiwi ::-webkit-scrollbar { + height: 9px; + width: 9px; +} +#kiwi ::-webkit-scrollbar-button { + width: 0; + height: 0; + display: none; +} +#kiwi ::-webkit-scrollbar-corner { background-color:transparent; } +#kiwi ::-webkit-scrollbar-track { background-clip:padding-box; } +#kiwi ::-webkit-scrollbar-track:hover { + background-color: rgba(0,0,0,0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.10); +} +#kiwi ::-webkit-scrollbar-track:active { + background-color: rgba(0,0,0,0.05); + -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.14), inset -1px -1px 0 rgba(0,0,0,0.07); +} +#kiwi ::-webkit-scrollbar-thumb { + background-color: rgba(0,0,0,0.2); + -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10), inset 0 -1px 0 rgba(0,0,0,0.07); +} +#kiwi ::-webkit-scrollbar-thumb:hover { + background-color: rgba(0,0,0,0.4); + -webkit-box-shadow: inset 1px 1px 1px rgba(0,0,0,0.25); +} +#kiwi ::-webkit-scrollbar-thumb:active { + background-color: rgba(0,0,0,0.5); + -webkit-box-shadow: inset 1px 1px 3px rgba(0,0,0,0.35); } \ No newline at end of file diff --git a/client/assets/themes/cli/style.css b/client/assets/themes/cli/style.css index c17aab394..6891cbc10 100644 --- a/client/assets/themes/cli/style.css +++ b/client/assets/themes/cli/style.css @@ -467,4 +467,10 @@ #kiwi .settings_container .settings-category-list a.active { border-left: solid 4px #df6b26; color: #6d6d6d; -} \ No newline at end of file +} + +#kiwi ::-webkit-scrollbar { width: 9px; } +#kiwi ::-webkit-scrollbar-track { background-color:rgba(70,70,70,1); } +#kiwi ::-webkit-scrollbar-thumb { background-color: rgba(215,215,215,0.4); } +#kiwi ::-webkit-scrollbar-thumb:hover { background-color: rgba(215,215,215,0.5); } +#kiwi ::-webkit-scrollbar-thumb:active { background-color: rgba(215,215,215,0.6); } \ No newline at end of file diff --git a/client/assets/themes/mini/style.css b/client/assets/themes/mini/style.css index 7a036a9c8..244155130 100644 --- a/client/assets/themes/mini/style.css +++ b/client/assets/themes/mini/style.css @@ -422,4 +422,36 @@ #kiwi .settings_container .settings-category-list a.active { border-left: solid 4px #76bd2b; color: #555; +} + +#kiwi ::-webkit-scrollbar { + height: 9px; + width: 9px; +} +#kiwi ::-webkit-scrollbar-button { + width: 0; + height: 0; + display: none; +} +#kiwi ::-webkit-scrollbar-corner { background-color:transparent; } +#kiwi ::-webkit-scrollbar-track { background-clip:padding-box; } +#kiwi ::-webkit-scrollbar-track:hover { + background-color: rgba(0,0,0,0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.10); +} +#kiwi ::-webkit-scrollbar-track:active { + background-color: rgba(0,0,0,0.05); + -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.14), inset -1px -1px 0 rgba(0,0,0,0.07); +} +#kiwi ::-webkit-scrollbar-thumb { + background-color: rgba(0,0,0,0.2); + -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10), inset 0 -1px 0 rgba(0,0,0,0.07); +} +#kiwi ::-webkit-scrollbar-thumb:hover { + background-color: rgba(0,0,0,0.4); + -webkit-box-shadow: inset 1px 1px 1px rgba(0,0,0,0.25); +} +#kiwi ::-webkit-scrollbar-thumb:active { + background-color: rgba(0,0,0,0.5); + -webkit-box-shadow: inset 1px 1px 3px rgba(0,0,0,0.35); } \ No newline at end of file diff --git a/client/assets/themes/relaxed/style.css b/client/assets/themes/relaxed/style.css index 5d1fd7bbc..5a8b519e4 100644 --- a/client/assets/themes/relaxed/style.css +++ b/client/assets/themes/relaxed/style.css @@ -588,4 +588,36 @@ #kiwi .settings_container .settings-category-list a.active { border-left: solid 4px #a6c42c; color: #36C; +} + +#kiwi ::-webkit-scrollbar { + height: 9px; + width: 9px; +} +#kiwi ::-webkit-scrollbar-button { + width: 0; + height: 0; + display: none; +} +#kiwi ::-webkit-scrollbar-corner { background-color:transparent; } +#kiwi ::-webkit-scrollbar-track { background-clip:padding-box; } +#kiwi ::-webkit-scrollbar-track:hover { + background-color: rgba(0,0,0,0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.10); +} +#kiwi ::-webkit-scrollbar-track:active { + background-color: rgba(0,0,0,0.05); + -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.14), inset -1px -1px 0 rgba(0,0,0,0.07); +} +#kiwi ::-webkit-scrollbar-thumb { + background-color: rgba(0,0,0,0.2); + -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10), inset 0 -1px 0 rgba(0,0,0,0.07); +} +#kiwi ::-webkit-scrollbar-thumb:hover { + background-color: rgba(0,0,0,0.4); + -webkit-box-shadow: inset 1px 1px 1px rgba(0,0,0,0.25); +} +#kiwi ::-webkit-scrollbar-thumb:active { + background-color: rgba(0,0,0,0.5); + -webkit-box-shadow: inset 1px 1px 3px rgba(0,0,0,0.35); } \ No newline at end of file From 71c4bd5704ff2ecc2fa2ae03b6bb30f13a4dba36 Mon Sep 17 00:00:00 2001 From: Joshua Reilly Date: Fri, 5 Feb 2016 10:05:04 -0700 Subject: [PATCH 3/5] Set the height in case we have horizontal scrollbars --- client/assets/themes/cli/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/assets/themes/cli/style.css b/client/assets/themes/cli/style.css index 6891cbc10..0b175d9cf 100644 --- a/client/assets/themes/cli/style.css +++ b/client/assets/themes/cli/style.css @@ -469,7 +469,10 @@ color: #6d6d6d; } -#kiwi ::-webkit-scrollbar { width: 9px; } +#kiwi ::-webkit-scrollbar { + height: 9px; + width: 9px; +} #kiwi ::-webkit-scrollbar-track { background-color:rgba(70,70,70,1); } #kiwi ::-webkit-scrollbar-thumb { background-color: rgba(215,215,215,0.4); } #kiwi ::-webkit-scrollbar-thumb:hover { background-color: rgba(215,215,215,0.5); } From 9b60d5c359343039d7e0da6fd065cbe879a5fc4e Mon Sep 17 00:00:00 2001 From: Joshua Reilly Date: Mon, 22 Feb 2016 14:49:26 -0700 Subject: [PATCH 4/5] Resolves #845 --- client/assets/css/style.css | 2 +- client/src/index.html.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/assets/css/style.css b/client/assets/css/style.css index 3f0fa9b5c..a04666aa2 100644 --- a/client/assets/css/style.css +++ b/client/assets/css/style.css @@ -280,7 +280,7 @@ html, body { height:100%; } #kiwi .controlbox .input .input_wrap { display:inline; } /* The textarea input */ -#kiwi .controlbox .input .inp { white-space: nowrap; } +/*#kiwi .controlbox .input .inp { white-space: nowrap; }*/ /* Nick change dialog showed when clicking the nick label */ diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl index 3725651fc..aa74ce04b 100644 --- a/client/src/index.html.tmpl +++ b/client/src/index.html.tmpl @@ -63,7 +63,7 @@
-
+
From 7d6782231b7a01d2766790105ddeda57dab73a41 Mon Sep 17 00:00:00 2001 From: Joshua Reilly Date: Mon, 22 Feb 2016 15:03:50 -0700 Subject: [PATCH 5/5] Remove --- client/assets/css/style.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/client/assets/css/style.css b/client/assets/css/style.css index a04666aa2..f05938374 100644 --- a/client/assets/css/style.css +++ b/client/assets/css/style.css @@ -279,10 +279,6 @@ html, body { height:100%; } /* Wrapper div around the text area input */ #kiwi .controlbox .input .input_wrap { display:inline; } -/* The textarea input */ -/*#kiwi .controlbox .input .inp { white-space: nowrap; }*/ - - /* Nick change dialog showed when clicking the nick label */ #kiwi .controlbox .nickchange { position: absolute;