Merge branch 'rio-theme' into leftie

src/scss/themes/rio-grayscale.scss

@@ -1,54 +1,4 @@
-$main-theme-color: #999999;
+@import "rio.scss"
-$body-bg-color: #4D4D4D;
-$anchor-color: #2A5858;
-$main-text-color: #000000;
-$border-color: #9EEEEE;
-$main-bg-color: #FFFFFF;
-$secondary-text-color: #444444;
-$toast-border: #9EEEEE;
-$toast-bg: #999999;
-$focus-outline: #55AAAA;
-$compose-background: lighten($main-theme-color, 32%);
-
-@import "_base.scss";
-
-$scrollbar-face: #FFFFFF !default;
-$scrollbar-face-hover: #FFFFFF !default;
-$scrollbar-face-active: #FFFFFF !default;
-$scrollbar-track: #999999 !default;
-@import "_scrollbars.scss";
-
-:root {
-
-	/* idea is navbar as rio's right-click menu */
-	--nav-bg: #E9FFE9;
-	--nav-border: #88CC88;
-	--nav-active-bg: #448844;
-	--nav-a-selected-bg: #448844;
-	--nav-a-selected-active-bg: #448844;
-	--nav-text-color: #000000;
-	--nav-text-color-hover: #FFFFFF;
-	--nav-a-bg-hover: #448844;
-	--nav-a-selected-border: #88CCCC;
-	--nav-a-border-hover: #88CCCC;
-
-	--settings-list-item-text: #{$anchor-color};
-}
-
-a, a.main-nav-link.svelte-my25xk, .settings-list-item {
-	text-decoration: underline;
-}
-a.mention.u-url, a:hover, a:active, ::selection {
-	background: #CCCCCC;
-}
-a.mention.u-url:hover, a.mention.u-url:active {
-	background: #2A5858;
-	color: #CCCCCC;
-}
-a.status-author-name, a.status-header-author {
-	text-decoration: none;
-	border-bottom: solid 1px #000000;
-}
 
 img {
 	filter: grayscale(100%);

src/scss/themes/rio.scss

@@ -38,10 +38,10 @@ $scrollbar-track: #999999 !default;
 a, a.main-nav-link.svelte-my25xk, .settings-list-item {
 	text-decoration: underline;
 }
-a.mention.u-url, a:hover, a:active, ::selection {
+a.mention.u-url, a:hover, a:active, a:focus, ::selection {
 	background: #CCCCCC;
 }
-a.mention.u-url:hover, a.mention.u-url:active {
+a.mention.u-url:hover, a.mention.u-url:active, a.mention.u-url:focus, a::selection, a ::selection {
 	background: #2A5858;
 	color: #CCCCCC;
 }

src/scss/themes/sam-sepia.scss

@@ -1,61 +1,4 @@
-$main-theme-color: #99994C;
+@import "sam.scss"
-$body-bg-color: #FFFFFF;
-$main-bg-color: #FFFFEA;
-$main-text-color: #000000;
-$border-color: #99994C;
-$secondary-text-color: #444444;
-$anchor-color: #444400;
-$toast-border: #99994C;
-$toast-bg: #444400;
-$focus-outline: #99994C;
-$compose-background: lighten($main-theme-color, 32%);
-@import "_base.scss";
-
-$scrollbar-face: #FFFFEA;
-$scrollbar-face-hover: #FFFFEA;
-$scrollbar-face-active: #FFFFEA;
-$scrollbar-track: #99994C;
-@import "_scrollbars.scss";
-
-:root {
-	--deemphasized-text-color: #666666;
-
-	/* idea is navbar as Sam's command window */
-	--nav-bg: #EAFFFF;
-	--nav-border: #88CCCC;
-	--nav-active-bg: #9EEEEE;
-	--nav-a-selected-bg: #9EEEEE;
-	--nav-a-selected-active-bg: #9EEEEE;
-	--nav-text-color: #000000;
-	--nav-text-color-hover: #000000;
-	--nav-a-bg-hover: #9EEEEE;
-	--nav-a-selected-border: #88CCCC;
-	--nav-a-border-hover: #88CCCC;
-
-	--button-bg: #FFFFD1;
-	--button-bg-active: #FFFFE9;
-	--button-bg-hover: #FFFFE9;
-	--button-primary-bg: #FFFFD1;
-	--button-primary-bg-active: #FFFFE9;
-	--button-primary-bg-hover: #FFFFE9;
-
-	--settings-list-item-text: #{$anchor-color};
-}
-
-a, a.main-nav-link.svelte-my25xk, .settings-list-item {
-	text-decoration: underline;
-}
-a.mention.u-url, a:hover, a:active, ::selection {
-	background: #EEEE9E;
-}
-a.mention.u-url:hover, a.mention.u-url:active {
-	background: #444400;
-	color: #EEEE9E;
-}
-a.status-author-name, a.status-header-author {
-	text-decoration: none;
-	border-bottom: solid 1px #444400;
-}
 
 img {
 	filter: sepia(100%);

src/scss/themes/sam.scss

@@ -45,10 +45,10 @@ $scrollbar-track: #99994C;
 a, a.main-nav-link.svelte-my25xk, .settings-list-item {
 	text-decoration: underline;
 }
-a.mention.u-url, a:hover, a:active, ::selection {
+a.mention.u-url, a:hover, a:active, a:focus, ::selection {
 	background: #EEEE9E;
 }
-a.mention.u-url:hover, a.mention.u-url:active {
+a.mention.u-url:hover, a.mention.u-url:active, a.mention.u-url:focus, a::selection, a ::selection {
 	background: #444400;
 	color: #EEEE9E;
 }