Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

main
Bob Mottram 2020-07-28 12:23:29 +01:00
commit a111810b2b
14 changed files with 690 additions and 447 deletions

View File

@ -129,13 +129,6 @@ span.psw {
body, html { body, html {
background-color: var(--main-bg-color); background-color: var(--main-bg-color);
color: var(--main-fg-color); color: var(--main-fg-color);
background-image: url("/login-background.jpg");
background-size: cover;
-webkit-background-size: cover;
-moz-background-size: cover;
background-repeat: no-repeat;
background-position: center;
height: 100%; height: 100%;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
max-width: 60%; max-width: 60%;
@ -144,7 +137,6 @@ span.psw {
font-size: var(--font-size); font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
position: relative; position: relative;
top: 3%;
} }
.login-text { .login-text {
font-size: var(--font-size); font-size: var(--font-size);
@ -177,13 +169,6 @@ span.psw {
body, html { body, html {
background-color: var(--main-bg-color); background-color: var(--main-bg-color);
color: var(--main-fg-color); color: var(--main-fg-color);
background-image: url("/login-background.jpg");
background-size: cover;
-webkit-background-size: cover;
-moz-background-size: cover;
background-repeat: no-repeat;
background-position: center;
height: 100%; height: 100%;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
max-width: 95%; max-width: 95%;
@ -192,7 +177,6 @@ span.psw {
font-size: var(--font-size-mobile); font-size: var(--font-size-mobile);
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
position: relative; position: relative;
top: 5%;
} }
.login-text { .login-text {
font-size: var(--font-size-mobile); font-size: var(--font-size-mobile);

View File

@ -54,7 +54,6 @@ body, html {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
max-width: 100%; max-width: 100%;
min-width: 600px; min-width: 600px;
margin: 5% auto;
} }
a, u { a, u {
@ -89,40 +88,15 @@ a:link {
min-width: 200px; min-width: 200px;
} }
.followText {
font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
}
.imText { .imText {
font-size: var(--font-size4); font-size: var(--font-size4);
font-family: Arial, Helvetica, sans-serif;
color: var(--main-link-color); color: var(--main-link-color);
background: var(--link-bg-color);
} }
.pgp { .pgp {
font-size: var(--font-size5); font-size: var(--font-size5);
font-family: Arial, Helvetica, sans-serif;
color: var(--main-link-color); color: var(--main-link-color);
background: var(--link-bg-color); background: var(--link-bg-color);
font-family: 'monospace';
}
.button {
border-radius: 4px;
background-color: var(--button-background);
border: none;
color: var(--button-text);
text-align: center;
padding: 10px;
font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
width: 20%;
max-width: 200px;
min-width: 100px;
cursor: pointer;
margin: 30px;
} }
.button:hover { .button:hover {
@ -130,19 +104,8 @@ a:link {
color: white; color: white;
} }
input[type=text] {
width: var(--follow-text-entry-width);
clear: both;
font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
text-align: center;
color: var(--text-entry-foreground);
background-color: var(--text-entry-background);
}
.options { .options {
font-size: var(--font-size); font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
} }
.options img { .options img {
@ -152,26 +115,25 @@ input[type=text] {
@media screen and (min-width: 400px) { @media screen and (min-width: 400px) {
.followText { .followText {
font-size: var(--follow-text-size1); font-size: var(--follow-text-size1);
font-family: Arial, Helvetica, sans-serif;
} }
input[type=text] { input[type=text] {
width: var(--follow-text-entry-width); width: var(--follow-text-entry-width);
clear: both; clear: both;
font-size: 24px; font-size: 24px;
font-family: Arial, Helvetica, sans-serif;
text-align: center; text-align: center;
color: var(--text-entry-foreground); color: var(--text-entry-foreground);
background-color: var(--text-entry-background); background-color: var(--text-entry-background);
font-family: Arial, Helvetica, sans-serif;
} }
.button { .button {
border-radius: 4px; border-radius: 4px;
background-color: var(--button-background); background-color: var(--button-background);
font-family: Arial, Helvetica, sans-serif;
border: none; border: none;
color: var(--button-text); color: var(--button-text);
text-align: center; text-align: center;
padding: 10px; padding: 10px;
font-size: 24px; font-size: 24px;
font-family: Arial, Helvetica, sans-serif;
width: 20%; width: 20%;
max-width: 200px; max-width: 200px;
min-width: 100px; min-width: 100px;
@ -193,26 +155,25 @@ input[type=text] {
@media screen and (max-width: 1000px) { @media screen and (max-width: 1000px) {
.followText { .followText {
font-size: var(--follow-text-size2); font-size: var(--follow-text-size2);
font-family: Arial, Helvetica, sans-serif;
} }
input[type=text] { input[type=text] {
width: var(--follow-text-entry-width); width: var(--follow-text-entry-width);
clear: both; clear: both;
font-size: 40px; font-size: 40px;
font-family: Arial, Helvetica, sans-serif;
text-align: center; text-align: center;
color: var(--text-entry-foreground); color: var(--text-entry-foreground);
background-color: var(--text-entry-background); background-color: var(--text-entry-background);
font-family: Arial, Helvetica, sans-serif;
} }
.button { .button {
border-radius: 4px; border-radius: 4px;
background-color: var(--button-background); background-color: var(--button-background);
font-family: Arial, Helvetica, sans-serif;
border: none; border: none;
color: var(--button-text); color: var(--button-text);
text-align: center; text-align: center;
padding: 10px; padding: 10px;
font-size: 40px; font-size: 40px;
font-family: Arial, Helvetica, sans-serif;
width: 20%; width: 20%;
max-width: 200px; max-width: 200px;
min-width: 100px; min-width: 100px;

271
epicyon-search.css 100644
View File

@ -0,0 +1,271 @@
@charset "UTF-8";
:root {
--main-bg-color: #282c37;
--link-bg-color: #282c37;
--main-fg-color: #dddddd;
--main-link-color: #999;
--main-visited-color: #888;
--border-color: #505050;
--font-size-header: 18px;
--font-color-header: #ccc;
--font-size: 40px;
--font-size2: 24px;
--font-size3: 38px;
--font-size4: 22px;
--font-size5: 20px;
--text-entry-foreground: #ccc;
--text-entry-background: #111;
--time-color: #aaa;
--button-text: #FFFFFF;
--button-background: #999;
--button-selected: #666;
--hashtag-margin: 2%;
--hashtag-vertical-spacing1: 50px;
--hashtag-vertical-spacing2: 100px;
--hashtag-vertical-spacing3: 100px;
--hashtag-vertical-spacing4: 150px;
--hashtag-size1: 30px;
--hashtag-size2: 40px;
--follow-text-size1: 24px;
--follow-text-size2: 40px;
--follow-text-entry-width: 90%;
}
@font-face {
font-family: 'Bedstead';
font-style: normal;
font-weight: normal;
font-display: block;
src: url('./fonts/bedstead.otf') format('opentype');
}
body, html {
background-color: var(--main-bg-color);
color: var(--main-fg-color);
height: 100%;
font-family: Arial, Helvetica, sans-serif;
max-width: 100%;
min-width: 600px;
margin: 5% auto;
}
a, u {
color: var(--main-fg-color);
}
a:visited{
color: var(--main-visited-color);
background: var(--link-bg-color);
font-weight: bold;
}
a:link {
color: var(--main-link-color);
background: var(--link-bg-color);
font-weight: bold;
}
.searchBanner {
background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0.5)), url("search_banner.png");
background-position: center;
background-repeat: no-repeat;
background-size: 90%;
}
.follow {
background-image: url("search-background.jpg");
background-size: cover;
-webkit-background-size: cover;
-moz-background-size: cover;
background-repeat: no-repeat;
background-position: center;
height: 100%;
background-position: center;
background-repeat: no-repeat;
background-size: cover;
position: relative;
background-color: var(--main-bg-color);
}
.followAvatar {
margin: 0% 0;
}
.followAvatar img {
border-radius: 10%;
width: 20%;
min-width: 200px;
}
.followText {
font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
}
.imText {
font-size: var(--font-size4);
font-family: Arial, Helvetica, sans-serif;
color: var(--main-link-color);
background: var(--link-bg-color);
}
.pgp {
font-size: var(--font-size5);
font-family: Arial, Helvetica, sans-serif;
color: var(--main-link-color);
background: var(--link-bg-color);
font-family: 'monospace';
}
.button {
border-radius: 4px;
background-color: var(--button-background);
border: none;
color: var(--button-text);
text-align: center;
padding: 10px;
font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
width: 20%;
max-width: 200px;
min-width: 100px;
cursor: pointer;
margin: 30px;
}
.button:hover {
background-color: #555;
color: white;
}
input[type=text] {
width: var(--follow-text-entry-width);
clear: both;
font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
text-align: center;
color: var(--text-entry-foreground);
background-color: var(--text-entry-background);
}
.cwButton {
border-radius: 4px;
background-color: #999;
border: none;
color: var(--button-text);
text-align: center;
font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
padding: 2px;
cursor: pointer;
margin: 5px;
}
.cwText {
display: none;
}
.options {
font-size: var(--font-size);
font-family: Arial, Helvetica, sans-serif;
}
.options img {
width: 15%;
}
@media screen and (min-width: 400px) {
.hashtagswarm {
font-size: var(--hashtag-size1);
font-family: Arial, Helvetica, sans-serif;
margin: var(--hashtag-margin);
line-height: var(--hashtag-vertical-spacing1);
}
.followText {
font-size: var(--follow-text-size1);
font-family: Arial, Helvetica, sans-serif;
}
input[type=text] {
width: var(--follow-text-entry-width);
clear: both;
font-size: 24px;
font-family: Arial, Helvetica, sans-serif;
text-align: center;
color: var(--text-entry-foreground);
background-color: var(--text-entry-background);
}
.button {
border-radius: 4px;
background-color: var(--button-background);
border: none;
color: var(--button-text);
text-align: center;
padding: 10px;
font-size: 24px;
font-family: Arial, Helvetica, sans-serif;
width: 20%;
max-width: 200px;
min-width: 100px;
cursor: pointer;
margin: 30px;
}
input[type=checkbox]
{
-ms-transform: scale(2);
-moz-transform: scale(2);
-webkit-transform: scale(2);
-o-transform: scale(2);
transform: scale(2);
padding: 10px;
margin: 20px 30px;
}
}
@media screen and (max-width: 1000px) {
.hashtagswarm {
font-size: var(--hashtag-size2);
font-family: Arial, Helvetica, sans-serif;
margin: var(--hashtag-margin);
line-height: var(--hashtag-vertical-spacing3);
}
.followText {
font-size: var(--follow-text-size2);
font-family: Arial, Helvetica, sans-serif;
}
input[type=text] {
width: var(--follow-text-entry-width);
clear: both;
font-size: 40px;
font-family: Arial, Helvetica, sans-serif;
text-align: center;
color: var(--text-entry-foreground);
background-color: var(--text-entry-background);
}
.button {
border-radius: 4px;
background-color: var(--button-background);
border: none;
color: var(--button-text);
text-align: center;
padding: 10px;
font-size: 40px;
font-family: Arial, Helvetica, sans-serif;
width: 20%;
max-width: 200px;
min-width: 100px;
cursor: pointer;
margin: 30px;
}
input[type=checkbox]
{
-ms-transform: scale(4);
-moz-transform: scale(4);
-webkit-transform: scale(4);
-o-transform: scale(4);
transform: scale(4);
padding: 20px;
margin: 30px 40px;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 KiB

View File

@ -15,7 +15,7 @@ from shutil import copyfile
def getThemeFiles() -> []: def getThemeFiles() -> []:
return ('epicyon.css', 'login.css', 'follow.css', return ('epicyon.css', 'login.css', 'follow.css',
'suspended.css', 'calendar.css', 'blog.css', 'suspended.css', 'calendar.css', 'blog.css',
'options.css') 'options.css', 'search.css')
def getThemesList() -> []: def getThemesList() -> []:
@ -113,9 +113,11 @@ def setThemeFromDict(baseDir: str, name: str,
if bgParams.get('login'): if bgParams.get('login'):
setBackgroundFormat(baseDir, name, 'login', bgParams['login']) setBackgroundFormat(baseDir, name, 'login', bgParams['login'])
if bgParams.get('follow'): if bgParams.get('follow'):
setBackgroundFormat(baseDir, name, 'login', bgParams['follow']) setBackgroundFormat(baseDir, name, 'follow', bgParams['follow'])
if bgParams.get('options'): if bgParams.get('options'):
setBackgroundFormat(baseDir, name, 'login', bgParams['options']) setBackgroundFormat(baseDir, name, 'options', bgParams['options'])
if bgParams.get('search'):
setBackgroundFormat(baseDir, name, 'search', bgParams['search'])
def setBackgroundFormat(baseDir: str, name: str, def setBackgroundFormat(baseDir: str, name: str,
@ -224,9 +226,10 @@ def setThemeDefault(baseDir: str):
"dummyValue": "1234" "dummyValue": "1234"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -258,9 +261,10 @@ def setThemeBlue(baseDir: str):
"*src": "url('./fonts/Domestic_Manners.woff2') format('woff2')" "*src": "url('./fonts/Domestic_Manners.woff2') format('woff2')"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -302,9 +306,10 @@ def setThemeNight(baseDir: str):
"*src": fontStr "*src": fontStr
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -355,9 +360,10 @@ def setThemeStarlight(baseDir: str):
"*src": "url('fonts/bgrove.woff2') format('woff2')" "*src": "url('fonts/bgrove.woff2') format('woff2')"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -405,9 +411,10 @@ def setThemeHenge(baseDir: str):
"*src": "url('fonts/bgrove.woff2') format('woff2')" "*src": "url('fonts/bgrove.woff2') format('woff2')"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -435,9 +442,10 @@ def setThemeZen(baseDir: str):
"dropdown-bg-color-hover": "#444" "dropdown-bg-color-hover": "#444"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -461,9 +469,10 @@ def setThemeHighVis(baseDir: str):
"*src": "url('./fonts/LinBiolinum_Rah.woff2') format('woff2')" "*src": "url('./fonts/LinBiolinum_Rah.woff2') format('woff2')"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -523,9 +532,10 @@ def setThemeLCD(baseDir: str):
"*src": "url('./fonts/LcdSolid.woff2') format('woff2')" "*src": "url('./fonts/LcdSolid.woff2') format('woff2')"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -572,9 +582,10 @@ def setThemePurple(baseDir: str):
"*src": fontStr "*src": fontStr
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -617,9 +628,10 @@ def setThemeHacker(baseDir: str):
"image-corners": "0%" "image-corners": "0%"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)
@ -669,9 +681,10 @@ def setThemeLight(baseDir: str):
"*src": "url('./fonts/ElectrumADFExp-Regular.otf') format('opentype')" "*src": "url('./fonts/ElectrumADFExp-Regular.otf') format('opentype')"
} }
bgParams = { bgParams = {
"login": 'jpg', "login": "jpg",
"follow": 'jpg', "follow": "jpg",
"options": 'jpg' "options": "jpg",
"search": "jpg"
} }
setThemeFromDict(baseDir, name, themeParams, bgParams) setThemeFromDict(baseDir, name, themeParams, bgParams)

File diff suppressed because it is too large Load Diff