Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add stone theme to WebHost #645

Merged
merged 7 commits into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added WebHostLib/static/static/backgrounds/stone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions WebHostLib/static/styles/player-settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ html{
font-weight: normal;
width: 100%;
margin-bottom: 0.5rem;
color: #ffffff;
text-shadow: 1px 1px 4px #000000;
}

Expand All @@ -58,20 +57,14 @@ html{
font-weight: normal;
width: 100%;
margin-bottom: 0.5rem;
color: #ffe993;
text-transform: lowercase;
text-shadow: 1px 1px 2px #000000;
}

#player-settings h3, #player-settings h4, #player-settings h5, #player-settings h6{
color: #ffffff;
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
}

#player-settings a{
color: #ffef00;
}

#player-settings input:not([type]){
border: 1px solid #000000;
padding: 3px;
Expand Down
65 changes: 65 additions & 0 deletions WebHostLib/static/styles/themes/stone.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
html{
background-image: url('../../static/backgrounds/stone.png');
background-repeat: repeat;
background-size: 275px 275px;
}

body{
color: #ffffff;
}

#base-header {
background: url('../../static/backgrounds/header/stone-header.png') repeat-x;
}

.markdown {
background-color: rgba(0, 0, 0, 0.66) !important;
}

h1{
color: #cccbc3;
}

h2{
color: #aad79c;
}

h3, h4, h5,h6{
color: #ffffff;
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
}

table th{

}

table td{

}

a{
color: #96e2ff;
}

pre{
margin-top: 0;
padding: 0.5rem 0.25rem;
border-radius: 6px;
color: #000000;
}

pre code{
border: none;
}

code{
border-radius: 4px;
padding-left: 0.25rem;
padding-right: 0.25rem;
color: #000000;
}

pre, code{
background-color: #e4ffdb;
border: 1px solid #2d3435;
}
5 changes: 5 additions & 0 deletions WebHostLib/templates/header/stoneHeader.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% block head %}
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/themes/stone.css") }}" />
{% endblock %}

{% include 'header/baseHeader.html' %}
2 changes: 1 addition & 1 deletion worlds/AutoWorld.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class WebWorld:
tutorials: List[Tutorial]

# Choose a theme for your /game/* pages
# Available: dirt, grass, grassFlowers, ice, jungle, ocean, partyTime
# Available: dirt, grass, grassFlowers, ice, jungle, ocean, partyTime, stone
theme = "grass"

# display a link to a bug report page, most likely a link to a GitHub issue page.
Expand Down
3 changes: 2 additions & 1 deletion worlds/rogue-legacy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@


class LegacyWeb(WebWorld):
theme = "stone"
tutorials = [Tutorial(
"Multiworld Setup Guide",
"A guide to setting up the Rogue Legacy Randomizer software on your computer. This guide covers single-player, multiworld, and related software.",
Expand Down Expand Up @@ -153,7 +154,7 @@ def generate_basic(self):
self.world.push_precollected(self.world.create_item(ItemName.architect, self.player))
elif self.world.architect[self.player] != "disabled":
itempool += [self.create_item(ItemName.architect)]

# Fill item pool with the remaining
for _ in range(len(itempool), total_required_locations):
item = self.world.random.choice(list(misc_items_table.keys()))
Expand Down