Merge pull request #19 from emsquared/textual6

Upgrade style for Textual 6
UbiquitousBear · Mar 13, 2016 · 1e11126 · 1e11126
2 parents 7967ef6 + 5494642
commit 1e11126
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 130 deletions.
diff --git a/Data/Settings/styleLocalizations.plist b/Data/Settings/styleLocalizations.plist
diff --git a/Data/Settings/styleSettings.plist b/Data/Settings/styleSettings.plist
@@ -14,7 +14,7 @@
 		<integer>0</integer>
 	</dict>
 	<key>Indentation Offset</key>
-	<integer>6</integer>
+	<integer>-1</integer>
 	<key>Underlying Window Color</key>
 	<string>#FFFFFF</string>
 	<key>Force Invert Sidebars</key>

diff --git a/Data/Templates/baseLayout.mustache b/Data/Templates/baseLayout.mustache
diff --git a/design.css b/design.css
@@ -87,6 +87,28 @@ body[dir=ltr] .time {
 	text-align: right;
 }
 
+/* Scrolling */
+
+body[customscroller="true"]::-webkit-scrollbar {
+	width: 17px;
+}
+
+body[customscroller="true"]::-webkit-scrollbar-track {
+	background: #fbfbfb;
+	box-shadow: inset 1px 0px 0px 0px #e8e8e8;
+}
+
+body[customscroller="true"]::-webkit-scrollbar-thumb {
+	background-color: #c1c1c1;
+	border: 4px solid transparent;
+	border-left: 5px solid transparent;
+	border-radius: 20px;
+	background-clip: content-box;
+}
+
+body[customscroller="true"]::-webkit-scrollbar-thumb:hover {
+	background-color: #7d7d7d;
+}
 
 /* Encryption Lock */
 

diff --git a/scripts.js b/scripts.js
@@ -222,7 +222,7 @@ Emoticons = {
 
 Textual.viewFinishedLoading = function()
 {
-	Textual.fadeInLoadingScreen(1.00, 0.95);
+	Textual.fadeOutLoadingScreen(1.00, 0.95);
 
 	setTimeout(function() {
 		Textual.scrollToBottomOfView();