Merge branch 'master' into master

Author: gskinner

dev/sass/styles.scss

@@ -78,6 +78,20 @@ html, body {
 	}
 }
 
+// TODO: revisit for support in browsers other than Chrome & Safari:
+*::-webkit-scrollbar {
+	width: 0.5em;
+	height: 0.5em;
+}
+*::-webkit-scrollbar-track {
+	background: rgba($mid, 0.25);
+}
+
+*::-webkit-scrollbar-thumb {
+	background-color: $mid;
+	border-radius: 0.5em;
+}
+
 .app .sidebar, .container .header, .tooltip  {
 	-moz-osx-font-smoothing: grayscale;
 	-webkit-font-smoothing: antialiased;

dev/sass/views/tools.scss

@@ -13,7 +13,7 @@
 		color: rgba($doc-black, 0.25);
 		z-index: 10;
 		&:hover {
-			color: $theme-color;
+			color: $doc-darkest !important;
 		}
 	}
 

index.html

@@ -174,7 +174,7 @@ <h1>Text</h1>
 <textarea>
 RegExr was created by gskinner.com, and is proudly hosted by Media Temple.
 
-Edit the Expression & Text to see matches. Roll over matches or the expression for details. PCRE & Javascript flavors of RegEx are supported.
+Edit the Expression & Text to see matches. Roll over matches or the expression for details. PCRE & JavaScript flavors of RegEx are supported.
 
 The side bar includes a Cheatsheet, full Reference, and Help. You can also Save & Share with the Community, and view patterns you create or favorite in My Patterns.