Relintai/mourne_rcpp_fw
1
0
Fork 0
mirror of https://github.com/Relintai/mourne_rcpp_fw.git synced 2024-12-23 21:16:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ported the building editor's ui (at least what I could for now).

Browse Source
This commit is contained in:
Relintai 2021-11-16 18:55:29 +01:00
parent 3042f4e37b
commit c85911b12a
5 changed files with 756 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"master": "b8b2d5a3a6ce3556ee465290260ce0a902e1a40a"}} {"engine": {"master": "fd7bcb43cbf925731fee5c1b96166bf207dcbdd7"}}

183
app/buildings/building_controller.cpp
View File

@ -3,12 +3,15 @@
#include "core/html/form_validator.h" #include "core/html/form_validator.h"
#include "core/html/html_builder.h" #include "core/html/html_builder.h"
#include "core/http/cookie.h" #include "core/http/cookie.h"
#include "core/http/http_enums.h"
#include "core/http/http_session.h" #include "core/http/http_session.h"
#include "core/http/request.h" #include "core/http/request.h"
#include "core/http/session_manager.h" #include "core/http/session_manager.h"
#include "building_model.h" #include "building_model.h"
#include "../html_macros.h"
void BuildingController::handle_request_default(Request *request) { void BuildingController::handle_request_default(Request *request) {
} }
@ -20,11 +23,31 @@ void BuildingController::admin_handle_request_main(Request *request) {
return; return;
} else if (seg == "new") { } else if (seg == "new") {
request->push_path(); request->push_path();
admin_render_building(request, Ref<Building>()); Ref<Building> b;
b.instance();
admin_render_building(request, b);
return; return;
} else if (seg == "edit") { } else if (seg == "edit") {
request->push_path(); request->push_path();
admin_render_building(request, Ref<Building>());
String seg_building_id = request->get_current_path_segment();
if (!seg_building_id.is_int()) {
request->send_error(HTTP_STATUS_CODE_404_NOT_FOUND);
return;
}
int bid = seg_building_id.to_int();
Ref<Building> b = BuildingModel::get_singleton()->get_building(bid);
if (!b.is_valid()) {
request->send_error(HTTP_STATUS_CODE_404_NOT_FOUND);
return;
}
admin_render_building(request, b);
return; return;
} }
@ -83,6 +106,12 @@ void BuildingController::admin_render_building_list(Request *request) {
} }
void BuildingController::admin_render_building(Request *request, Ref<Building> building) { void BuildingController::admin_render_building(Request *request, Ref<Building> building) {
if (!building.is_valid()) {
RLOG_ERR("admin_render_building: !building.is_valid()\n");
request->send_error(HTTP_STATUS_CODE_500_INTERNAL_SERVER_ERROR);
return;
}
Vector<Ref<Building> > buildings = BuildingModel::get_singleton()->get_all(); Vector<Ref<Building> > buildings = BuildingModel::get_singleton()->get_all();
HTMLBuilder b; HTMLBuilder b;
@ -92,6 +121,156 @@ void BuildingController::admin_render_building(Request *request, Ref<Building> b
b.fdiv("Building Editor", "top_menu"); b.fdiv("Building Editor", "top_menu");
b.br(); b.br();
b.form_post(request->get_url_root());
bool show_post = false; //request->get_method() == HTTP_METHOD_POST && validation errors;
ADMIN_EDIT_INPUT_TEXT("Name:", "name", show_post, building->name, request->get_parameter("name"));
ADMIN_EDIT_INPUT_TEXTAREA("Description:", "description", show_post, building->description, request->get_parameter("description"));
b.div("row_edit");
b.fdiv("Icon:", "edit_name");
//todo I'm not sure yet how this worked originally
//b.div("edit_input")->f()->input_image("icon", building->icon)->f()->cdiv();
b.div("edit_input")->f()->w("TODO")->cdiv();
b.cdiv();
ADMIN_EDIT_INPUT_TEXT("Rank:", "rank", show_post, String::num(building->rank), request->get_parameter("rank"));
Vector<Ref<Building> > nrbs = BuildingModel::get_singleton()->get_all();
b.div("row_edit");
b.fdiv("Next Rank:", "edit_name");
b.div("edit_input");
{
b.select("next_rank", "drop");
{
int current_id = building->id;
int current_nr = building->next_rank;
b.foption(String::num(0), "- None -", current_nr == 0);
for (int i = 0; i < nrbs.size(); ++i) {
Ref<Building> build = nrbs[i];
int id = build->id;
if (id == current_id) {
continue;
}
b.foption(String::num(id), build->name + " R" + String::num(build->rank), current_nr == id);
}
}
b.cselect();
}
b.cdiv();
b.cdiv();
ADMIN_EDIT_INPUT_TEXT("Time to Build:", "time_to_build", show_post, String::num(building->time_to_build), request->get_parameter("time_to_build"));
ADMIN_EDIT_LINE_SPACER();
ADMIN_EDIT_INPUT_TEXT("Score:", "score", show_post, String::num(building->score), request->get_parameter("score"));
ADMIN_EDIT_INPUT_TEXT("Defense:", "defense", show_post, String::num(building->defense), request->get_parameter("defense"));
//TODO
/*
int ability;
<div class="row_edit">
<div class="edit_name">
Ability:
</div>
<div class="edit_input">
<?=form_dropdown('ability', $opt_ability, $sability, $attr_drop); ?>
</div>
</div>
*/
b.div("row_edit");
b.fdiv("Ability:", "edit_name");
b.div("edit_input")->f()->w("TODO")->cdiv();
b.cdiv();
ADMIN_EDIT_LINE_SPACER();
ADMIN_EDIT_INPUT_TEXT("Cost Food:", "cost_food", show_post, String::num(building->cost_food), request->get_parameter("cost_food"));
ADMIN_EDIT_INPUT_TEXT("Cost Wood:", "cost_wood", show_post, String::num(building->cost_wood), request->get_parameter("cost_wood"));
ADMIN_EDIT_INPUT_TEXT("Cost Stone:", "cost_stone", show_post, String::num(building->cost_stone), request->get_parameter("cost_stone"));
ADMIN_EDIT_INPUT_TEXT("Cost Iron:", "cost_iron", show_post, String::num(building->cost_iron), request->get_parameter("cost_iron"));
ADMIN_EDIT_INPUT_TEXT("Cost Mana:", "cost_mana", show_post, String::num(building->cost_food), request->get_parameter("cost_mana"));
ADMIN_EDIT_LINE_SPACER();
/*
int creates;
int num_creates;
<div class="row_edit">
<div class="edit_name">
Creates:
</div>
<div class="edit_input">
<?=form_dropdown($name_creates, $optcre, $screate, $attr_creates); ?>
X (max) <?=form_input($attr_num_creates); ?>
</div>
</div>
*/
b.div("row_edit");
b.fdiv("Creates:", "edit_name");
b.div("edit_input")->f()->w("TODO")->cdiv();
b.cdiv();
ADMIN_EDIT_LINE_SPACER();
ADMIN_EDIT_INPUT_TEXT("Mod Max Food:", "mod_max_food", show_post, String::num(building->mod_max_food), request->get_parameter("mod_max_food"));
ADMIN_EDIT_INPUT_TEXT("Mod Max Wood:", "mod_max_wood", show_post, String::num(building->mod_max_wood), request->get_parameter("mod_max_wood"));
ADMIN_EDIT_INPUT_TEXT("Mod Max Stone:", "mod_max_stone", show_post, String::num(building->mod_max_stone), request->get_parameter("mod_max_stone"));
ADMIN_EDIT_INPUT_TEXT("Mod Max Iron:", "mod_max_iron", show_post, String::num(building->mod_max_iron), request->get_parameter("mod_max_iron"));
ADMIN_EDIT_INPUT_TEXT("Mod Max Mana:", "mod_max_mana", show_post, String::num(building->mod_max_mana), request->get_parameter("mod_max_mana"));
ADMIN_EDIT_LINE_SPACER();
ADMIN_EDIT_INPUT_TEXT("Mod Rate Food:", "mod_rate_food", show_post, String::num(building->mod_rate_food), request->get_parameter("mod_rate_food"));
ADMIN_EDIT_INPUT_TEXT("Mod Rate Wood:", "mod_rate_wood", show_post, String::num(building->mod_rate_wood), request->get_parameter("mod_rate_wood"));
ADMIN_EDIT_INPUT_TEXT("Mod Rate Stone:", "mod_rate_stone", show_post, String::num(building->mod_rate_stone), request->get_parameter("mod_rate_stone"));
ADMIN_EDIT_INPUT_TEXT("Mod Rate Iron:", "mod_rate_iron", show_post, String::num(building->mod_rate_iron), request->get_parameter("mod_rate_iron"));
ADMIN_EDIT_INPUT_TEXT("Mod Rate Mana:", "mod_rate_mana", show_post, String::num(building->mod_rate_mana), request->get_parameter("mod_rate_mana"));
ADMIN_EDIT_LINE_SPACER();
ADMIN_EDIT_INPUT_TEXT("Mod Percent Food:", "mod_percent_food", show_post, String::num(building->mod_percent_food), request->get_parameter("mod_percent_food"));
ADMIN_EDIT_INPUT_TEXT("Mod Percent Wood:", "mod_percent_wood", show_post, String::num(building->mod_percent_wood), request->get_parameter("mod_percent_wood"));
ADMIN_EDIT_INPUT_TEXT("Mod Percent Stone:", "mod_percent_stone", show_post, String::num(building->mod_percent_stone), request->get_parameter("mod_percent_stone"));
ADMIN_EDIT_INPUT_TEXT("Mod Percent Iron:", "mod_percent_iron", show_post, String::num(building->mod_percent_iron), request->get_parameter("mod_percent_iron"));
ADMIN_EDIT_INPUT_TEXT("Mod Percent Mana:", "mod_percent_mana", show_post, String::num(building->mod_percent_mana), request->get_parameter("mod_percent_mana"));
ADMIN_EDIT_LINE_SPACER();
//TODO <?=form_dropdown($name_assign1, $optass, $assign1, $attr_assign); ?>
ADMIN_EDIT_INPUT_TEXT("Assignment 1:", "assignment1", show_post, String::num(building->assignment1), request->get_parameter("assignment1"));
ADMIN_EDIT_INPUT_TEXT("Assignment 2:", "assignment2", show_post, String::num(building->assignment2), request->get_parameter("assignment2"));
ADMIN_EDIT_INPUT_TEXT("Assignment 3:", "assignment3", show_post, String::num(building->assignment3), request->get_parameter("assignment3"));
ADMIN_EDIT_INPUT_TEXT("Assignment 4:", "assignment4", show_post, String::num(building->assignment4), request->get_parameter("assignment4"));
ADMIN_EDIT_INPUT_TEXT("Assignment 5:", "assignment5", show_post, String::num(building->assignment5), request->get_parameter("assignment5"));
ADMIN_EDIT_LINE_SPACER();
//TODO <?=form_dropdown($name_req_tech, $optreqtech, $selreqtech, $attr_req_tech); ?>
ADMIN_EDIT_INPUT_TEXT("Required Technology:", "req_tech", show_post, String::num(building->req_tech), request->get_parameter("req_tech"));
ADMIN_EDIT_LINE_SPACER();
//TODO <?=form_dropdown($name_tech_group, $opttechgroup, $seltechgroup, $attr_assign);?>
ADMIN_EDIT_INPUT_TEXT("Technology Group:", "tech_group", show_post, String::num(building->tech_group), request->get_parameter("tech_group"));
ADMIN_EDIT_LINE_SPACER();
//TODO <?=form_dropdown($name_tech_secondary_group, $opttechgroup, $seltechsecgroup, $attr_tech_secondary_group); ?>
ADMIN_EDIT_INPUT_TEXT("Secondary Technology Group:", "tech_secondary_group", show_post, String::num(building->tech_secondary_group), request->get_parameter("tech_secondary_group"));
b.div("edit_submit")->f()->input_submit("Save", "submit")->f()->cdiv();
b.cform();
request->body += b.result; request->body += b.result;
} }

19
app/html_macros.h Normal file
View File

@ -0,0 +1,19 @@
#ifndef HTML_MACROS_H
#define HTML_MACROS_H
#define ADMIN_EDIT_INPUT_TEXT(p_edit_name, p_var_name, p_show_post, p_var, p_request_var) \
b.div("row_edit"); \
b.fdiv(p_edit_name, "edit_name"); \
b.div("edit_input")->f()->input_text(p_var_name, p_show_post ? p_request_var : p_var, "", "input")->f()->cdiv(); \
b.cdiv();
#define ADMIN_EDIT_INPUT_TEXTAREA(p_edit_name, p_var_name, p_show_post, p_var, p_request_var) \
b.div("row_edit_textbox"); \
b.fdiv(p_edit_name, "edit_name"); \
b.div("edit_input")->f()->ftextarea(p_var_name, p_show_post ? p_request_var : p_var, "textarea")->cdiv(); \
b.cdiv();
#define ADMIN_EDIT_LINE_SPACER() \
b.fdiv("", "edit_spacer");
#endif

365
www/css/base.css
View File

@ -1,56 +1,51 @@
img img {
{
vertical-align: middle; vertical-align: middle;
} }
a a {
{
color: #A8A8A8; color: #A8A8A8;
style: none; style: none;
text-decoration: none; text-decoration: none;
} }
a:hover a:hover {
{
color: white; color: white;
} }
.nofloat .nofloat {
{
float: none; float: none;
height: 10px; height: 10px;
width: 10px; width: 10px;
} }
body body {
{
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
background-color: #292929; background-color: #292929;
color: #A8A8A8; color: #A8A8A8;
} }
.content .content {
{
width: 970px; width: 970px;
margin: 0px auto; margin: 0px auto;
} }
.resources .resources {
{
height: 22px; height: 22px;
width: 970px; width: 970px;
margin: 2px auto 0px auto; margin: 2px auto 0px auto;
} }
.num_res .num_res {
{
float: right; float: right;
padding-right: 5px; padding-right: 5px;
} }
.res_wood_container,.res_food_container,.res_stone_container,.res_iron_container,.res_mana_container .res_wood_container,
{ .res_food_container,
.res_stone_container,
.res_iron_container,
.res_mana_container {
float: left; float: left;
height: 20px; height: 20px;
width: 190px; width: 190px;
@ -59,59 +54,68 @@ body
border-width: 1px; border-width: 1px;
} }
.res_food_container .res_food_container {
{
border-left-style: solid; border-left-style: solid;
border-color: #0D0F0B; border-color: #0D0F0B;
border-width: 1px; border-width: 1px;
} }
.separator .separator {
{
float: left; float: left;
font-size: 12px; font-size: 12px;
color: #A8A8A8; color: #A8A8A8;
} }
.res_icon .res_icon {
{
float: left; float: left;
font-size: 12px; font-size: 12px;
color: #A8A8A8; color: #A8A8A8;
padding: 2px 4px 0px 5px; padding: 2px 4px 0px 5px;
} }
.res_food,.res_wood,.res_stone,.res_iron,.res_mana .res_food,
{ .res_wood,
.res_stone,
.res_iron,
.res_mana {
float: left; float: left;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
color: #A8A8A8; color: #A8A8A8;
} }
.res_food_max,.res_wood_max,.res_stone_max,.res_iron_max,.res_mana_max .res_food_max,
{ .res_wood_max,
.res_stone_max,
.res_iron_max,
.res_mana_max {
float: left; float: left;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
color: #A8A8A8; color: #A8A8A8;
} }
.res_food_max,.res_wood_max,.res_stone_max,.res_iron_max,.res_mana_max,.res_food,.res_wood,.res_stone .res_food_max,
,.res_iron,.res_mana,.separator .res_wood_max,
{ .res_stone_max,
.res_iron_max,
.res_mana_max,
.res_food,
.res_wood,
.res_stone,
.res_iron,
.res_mana,
.separator {
padding-top: 2px; padding-top: 2px;
} }
.event_container .event_container {
{
width: 100%; width: 100%;
height: 22px; height: 22px;
margin: 5px 0px; margin: 5px 0px;
} }
.event .event {
{
margin: 0px auto 5px auto; margin: 0px auto 5px auto;
width: 930px; width: 930px;
border: 1px solid #363634; border: 1px solid #363634;
@ -120,47 +124,41 @@ body
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
.event_first .event_first {
{
background-color: #191C16; background-color: #191C16;
} }
/* vllage view */ /* vllage view */
.village_grid .village_grid {
{
width: 996px; width: 996px;
margin: 0px auto; margin: 0px auto;
padding: 15px 0px 0px 10px; padding: 15px 0px 0px 10px;
} }
.grid_entry .grid_entry {
{
float: left; float: left;
border: 1px solid black; border: 1px solid black;
} }
.grid_entry:hover,.grid_entry_selected .grid_entry:hover,
{ .grid_entry_selected {
border-color: white; border-color: white;
} }
.grid_row .grid_row {
{
height: 50px; height: 50px;
} }
/* village select */ /* village select */
.village_container .village_container {
{
width: 100%; width: 100%;
margin-top: 5px; margin-top: 5px;
padding-top: 15px; padding-top: 15px;
} }
.village_row .village_row {
{
width: 650px; width: 650px;
height: 18px; height: 18px;
margin: 0px auto 2px auto; margin: 0px auto 2px auto;
@ -169,28 +167,24 @@ body
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
.first_village_row .first_village_row {
{
background-color: #191C16; background-color: #191C16;
} }
.village_name,.village_score .village_name,
{ .village_score {
float: left; float: left;
} }
.village_name .village_name {
{
width: 300px; width: 300px;
} }
.village_score .village_score {
{
width: 100px; width: 100px;
} }
.village_action .village_action {
{
float: right; float: right;
width: 100px; width: 100px;
text-align: center; text-align: center;
@ -198,8 +192,7 @@ body
/* village settings */ /* village settings */
.village_settings_row .village_settings_row {
{
width: 650px; width: 650px;
height: 18px; height: 18px;
margin: 0px auto 2px auto; margin: 0px auto 2px auto;
@ -208,32 +201,27 @@ body
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
.first_village_settings_row .first_village_settings_row {
{
background-color: #191C16; background-color: #191C16;
} }
.settings_container .settings_container {
{
width: 100%; width: 100%;
margin-top: 5px; margin-top: 5px;
padding-top: 15px; padding-top: 15px;
} }
.settings_name .settings_name {
{
float: left; float: left;
} }
.settings_input .settings_input {
{
float: right; float: right;
width: 185px; width: 185px;
text-align: center; text-align: center;
} }
.settings_submit .settings_submit {
{
width: 105px; width: 105px;
height: 25px; height: 25px;
margin: 10px auto 30px auto; margin: 10px auto 30px auto;
@ -243,8 +231,7 @@ body
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
.back .back {
{
width: 970px; width: 970px;
margin: 5px auto 5px auto; margin: 5px auto 5px auto;
border: 1px solid #363634; border: 1px solid #363634;
@ -255,23 +242,21 @@ body
/* village menu */ /* village menu */
.village_menu_container .village_menu_container {
{
width: 100%; width: 100%;
height: 30px; height: 30px;
background-color: #141412; background-color: #141412;
} }
.village_menu .village_menu {
{
height: 20px; height: 20px;
width: 900px; width: 900px;
padding-top: 5px; padding-top: 5px;
margin: 0px auto; margin: 0px auto;
} }
.village_menuentry,.village_menuentry_first .village_menuentry,
{ .village_menuentry_first {
float: left; float: left;
width: 175px; width: 175px;
text-align: center; text-align: center;
@ -280,15 +265,13 @@ body
border-width: 1px; border-width: 1px;
} }
.village_menuentry_first .village_menuentry_first {
{
border-left-style: solid; border-left-style: solid;
} }
/* Village Log */ /* Village Log */
.log_list .log_list {
{
width: 470px; width: 470px;
height: 18px; height: 18px;
margin: 0px auto 2px auto; margin: 0px auto 2px auto;
@ -297,27 +280,23 @@ body
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
.log_list_first .log_list_first {
{
background-color: #191C16; background-color: #191C16;
} }
.log_list_new .log_list_new {
{
float: left; float: left;
width: 120px; width: 120px;
height: 18px; height: 18px;
} }
.log_list_attack .log_list_attack {
{
float: left; float: left;
width: 250px; width: 250px;
height: 18px; height: 18px;
} }
.log_list_delete .log_list_delete {
{
float: left; float: left;
height: 18px; height: 18px;
width: 100px; width: 100px;
@ -326,8 +305,7 @@ body
/* Log viewer */ /* Log viewer */
.log_data .log_data {
{
width: 600px; width: 600px;
margin: 0px auto 0px auto; margin: 0px auto 0px auto;
padding: 10px; padding: 10px;
@ -337,23 +315,21 @@ body
/* bulding */ /* bulding */
.building_menu_container .building_menu_container {
{
width: 100%; width: 100%;
height: 30px; height: 30px;
background-color: #141412; background-color: #141412;
} }
.building_menu .building_menu {
{
height: 20px; height: 20px;
width: 900px; width: 900px;
padding-top: 5px; padding-top: 5px;
margin: 0px auto; margin: 0px auto;
} }
.building_menuentry,.building_menuentry_first .building_menuentry,
{ .building_menuentry_first {
float: left; float: left;
width: 127px; width: 127px;
text-align: center; text-align: center;
@ -362,44 +338,35 @@ body
border-width: 1px; border-width: 1px;
} }
.building_menuentry_first .building_menuentry_first {
{
border-left-style: solid; border-left-style: solid;
} }
.building_header_container .building_header_container {
{
margin: 10px 0px 10px 0px; margin: 10px 0px 10px 0px;
/* height:95px; */ /* height:95px; */
width: 100%; width: 100%;
} }
.building_header .building_header {
{
width: 970px; width: 970px;
margin: 0px auto; margin: 0px auto;
} }
.building_header_art .building_header_art {}
{
} .building_header_text {
.building_header_text
{
margin-left: 20px; margin-left: 20px;
color: #9C9C9C; color: #9C9C9C;
} }
.building_container .building_container {
{
width: 100%; width: 100%;
margin-top: 5px; margin-top: 5px;
padding-top: 15px; padding-top: 15px;
} }
.building_header_back .building_header_back {
{
width: 970px; width: 970px;
margin: 5px auto 5px auto; margin: 5px auto 5px auto;
border: 1px solid #363634; border: 1px solid #363634;
@ -410,8 +377,12 @@ body
/* bulding data */ /* bulding data */
.building_data,.spell_data,.create_data,.research_data,.upgrade_data,.building_list_data .building_data,
{ .spell_data,
.create_data,
.research_data,
.upgrade_data,
.building_list_data {
width: 970px; width: 970px;
height: 22px; height: 22px;
margin: 0px auto 2px auto; margin: 0px auto 2px auto;
@ -420,33 +391,27 @@ body
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
.spell_data .spell_data {
{
height: 50px; height: 50px;
} }
.create_data .create_data {
{
height: 82px; height: 82px;
} }
.research_data .research_data {
{
height: 50px; height: 50px;
} }
.building_list_data .building_list_data {
{
height: 50px; height: 50px;
} }
.upgrade_data .upgrade_data {
{
height: 50px; height: 50px;
} }
.event_data .event_data {
{
width: 970px; width: 970px;
margin: auto 0px auto 20px; margin: auto 0px auto 20px;
padding: 10px 10px 5px 5px; padding: 10px 10px 5px 5px;
@ -456,25 +421,27 @@ body
/* costs */ /* costs */
.cost,.cost_icon .cost,
{ .cost_icon {
float: left; float: left;
} }
.costs,.cost .costs,
{ .cost {
padding-top: 5px; padding-top: 5px;
height: 15px; height: 15px;
} }
.cost_icon .cost_icon {
{
font-size: 12px; font-size: 12px;
padding-left: 5px; padding-left: 5px;
} }
.cost_food,.cost_wood,.cost_stone,.cost_iron,.cost_mana .cost_food,
{ .cost_wood,
.cost_stone,
.cost_iron,
.cost_mana {
float: left; float: left;
width: 100px; width: 100px;
padding: 0px 3px 0px 4px; padding: 0px 3px 0px 4px;
@ -485,8 +452,7 @@ body
text-align: right; text-align: right;
} }
.cost_spell .cost_spell {
{
float: left; float: left;
width: 88px; width: 88px;
padding: 0px 3px 0px 4px; padding: 0px 3px 0px 4px;
@ -497,8 +463,7 @@ body
text-align: right; text-align: right;
} }
.cost_unit .cost_unit {
{
float: left; float: left;
width: 583px; width: 583px;
padding: 0px 3px 0px 4px; padding: 0px 3px 0px 4px;
@ -506,8 +471,7 @@ body
text-align: right; text-align: right;
} }
.cost_unit_time .cost_unit_time {
{
float: left; float: left;
width: 601px; width: 601px;
padding: 0px 3px 0px 4px; padding: 0px 3px 0px 4px;
@ -515,16 +479,14 @@ body
text-align: right; text-align: right;
} }
.cost_unit_time_container .cost_unit_time_container {
{
height: 14px; height: 14px;
padding-top: 1px; padding-top: 1px;
border: 1px solid #363634; border: 1px solid #363634;
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
.cost_research .cost_research {
{
float: left; float: left;
width: 105px; width: 105px;
padding: 0px 3px 0px 4px; padding: 0px 3px 0px 4px;
@ -535,8 +497,7 @@ body
text-align: right; text-align: right;
} }
.cost_building_list .cost_building_list {
{
float: left; float: left;
width: 105px; width: 105px;
padding: 0px 3px 0px 4px; padding: 0px 3px 0px 4px;
@ -547,8 +508,7 @@ body
text-align: right; text-align: right;
} }
.cost_unit_container .cost_unit_container {
{
height: 14px; height: 14px;
padding-top: 1px; padding-top: 1px;
border: 1px solid #363634; border: 1px solid #363634;
@ -557,8 +517,7 @@ body
/* create */ /* create */
.create_unit_container .create_unit_container {
{
width: 315px; width: 315px;
height: 35px; height: 35px;
margin-top: 10px; margin-top: 10px;
@ -568,13 +527,11 @@ body
border-color: #363634; border-color: #363634;
} }
.create_unit .create_unit {
{
float: right; float: right;
} }
.create_name .create_name {
{
margin-bottom: 4px; margin-bottom: 4px;
border: 1px solid #363634; border: 1px solid #363634;
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
@ -582,16 +539,14 @@ body
text-align: center; text-align: center;
} }
.description .description {
{
font-size: 12px; font-size: 12px;
padding-top: 5px; padding-top: 5px;
} }
/* research */ /* research */
.research_header .research_header {
{
height: 22px; height: 22px;
width: 800px; width: 800px;
margin: 1px auto 5px auto; margin: 1px auto 5px auto;
@ -602,8 +557,7 @@ body
font-size: 18px; font-size: 18px;
} }
.research_description .research_description {
{
height: 15px; height: 15px;
margin-top: 20px; margin-top: 20px;
width: 800px; width: 800px;
@ -611,8 +565,7 @@ body
margin-bottom: 4px; margin-bottom: 4px;
} }
.research_box .research_box {
{
height: 35px; height: 35px;
width: 165px; width: 165px;
margin-top: 1px; margin-top: 1px;
@ -626,8 +579,7 @@ body
/* spell */ /* spell */
.spell_description .spell_description {
{
width: 800px; width: 800px;
height: 15px; height: 15px;
margin-top: 20px; margin-top: 20px;
@ -635,8 +587,7 @@ body
margin-bottom: 4px; margin-bottom: 4px;
} }
.spell_box .spell_box {
{
height: 35px; height: 35px;
width: 165px; width: 165px;
margin-top: 1px; margin-top: 1px;
@ -650,8 +601,7 @@ body
/* upgrade */ /* upgrade */
.cost_upgrade .cost_upgrade {
{
float: left; float: left;
width: 105px; width: 105px;
padding: 0px 3px 0px 4px; padding: 0px 3px 0px 4px;
@ -662,16 +612,14 @@ body
text-align: right; text-align: right;
} }
.upgrade_description .upgrade_description {
{
width: 800px; width: 800px;
height: 15px; height: 15px;
margin: 20px 0px 4px 0px; margin: 20px 0px 4px 0px;
font-size: 14px; font-size: 14px;
} }
.upgrade_box .upgrade_box {
{
width: 165px; width: 165px;
height: 35px; height: 35px;
margin-top: 1px; margin-top: 1px;
@ -685,22 +633,19 @@ body
/* stats */ /* stats */
.stat .stat {
{
float: left; float: left;
padding-top: 5px; padding-top: 5px;
height: 15px; height: 15px;
} }
.stat_icon .stat_icon {
{
float: left; float: left;
font-size: 12px; font-size: 12px;
padding-left: 5px; padding-left: 5px;
} }
.num_stat .num_stat {
{
float: left; float: left;
width: 165px; width: 165px;
padding: 0px 3px 0px 4px; padding: 0px 3px 0px 4px;
@ -711,8 +656,7 @@ body
text-align: right; text-align: right;
} }
.stats_data .stats_data {
{
width: 965px; width: 965px;
height: 120px; height: 120px;
margin: 0px auto 2px auto; margin: 0px auto 2px auto;
@ -721,8 +665,7 @@ body
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
.stat_header .stat_header {
{
height: 22px; height: 22px;
width: 800px; width: 800px;
margin: 12px auto 5px auto; margin: 12px auto 5px auto;
@ -735,8 +678,7 @@ body
/* cannot */ /* cannot */
.cannot .cannot {
{
width: 970px; width: 970px;
height: 30px; height: 30px;
margin: 0px auto; margin: 0px auto;
@ -748,8 +690,7 @@ body
/* Widget stuff */ /* Widget stuff */
.submit .submit {
{
width: 100px; width: 100px;
color: #9C9C9C; color: #9C9C9C;
background-color: #0D0F0B; background-color: #0D0F0B;
@ -759,8 +700,7 @@ body
transition: all 0.2s linear 0s; transition: all 0.2s linear 0s;
} }
.submit:hover .submit:hover {
{
color: #0D0F0B; color: #0D0F0B;
background-color: #9C9C9C; background-color: #9C9C9C;
border-color: #191C16; border-color: #191C16;
@ -768,23 +708,20 @@ body
border-right-color: #363634; border-right-color: #363634;
} }
.input .input {
{
color: #0D0F0B; color: #0D0F0B;
background-color: #9C9C9C; background-color: #9C9C9C;
border: 2px solid #191C16; border: 2px solid #191C16;
} }
.textarea .textarea {
{
color: #0D0F0B; color: #0D0F0B;
background-color: #9C9C9C; background-color: #9C9C9C;
border: 2px solid #191C16; border: 2px solid #191C16;
resize: none; resize: none;
} }
.drop .drop {
{
color: #0D0F0B; color: #0D0F0B;
background-color: #9C9C9C; background-color: #9C9C9C;
border: 2px solid #191C16; border: 2px solid #191C16;
@ -792,55 +729,47 @@ body
/* map stuff */ /* map stuff */
.map_entry .map_entry {
{
float: left; float: left;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
margin-bottom: -5px; margin-bottom: -5px;
} }
.map .map {
{
width: 600px; width: 600px;
height: 600px; height: 600px;
float: left; float: left;
} }
.map_vertical .map_vertical {
{
width: 650px; width: 650px;
height: 25px; height: 25px;
margin: 0px auto; margin: 0px auto;
} }
.map_horizontal .map_horizontal {
{
float: left; float: left;
height: 600px; height: 600px;
} }
.map_center .map_center {
{
height: 600px; height: 600px;
width: 800px; width: 800px;
} }
.map_nav .map_nav {
{
width: 700px; width: 700px;
margin: 0px auto; margin: 0px auto;
} }
.map_options .map_options {
{
width: 800px; width: 800px;
height: 40px; height: 40px;
margin: 0px auto; margin: 0px auto;
} }
.map_village .map_village {
{
float: left; float: left;
padding-left: 10px; padding-left: 10px;
border-left-style: solid; border-left-style: solid;
@ -848,8 +777,8 @@ body
border-width: 1px; border-width: 1px;
} }
.map_s_xy,.map_s_name .map_s_xy,
{ .map_s_name {
float: left; float: left;
margin-left: 10px; margin-left: 10px;
padding: 0px 10px; padding: 0px 10px;
@ -859,8 +788,7 @@ body
border-width: 1px; border-width: 1px;
} }
.map_s_name .map_s_name {
{
margin-left: 0px; margin-left: 0px;
border-left-style: none; border-left-style: none;
} }
@ -876,8 +804,7 @@ body
*/ */
/* Building Spacer */ /* Building Spacer */
.vertical_spacer .vertical_spacer {
{
width: 900px; width: 900px;
margin: 20px auto 20px auto; margin: 20px auto 20px auto;
border-top-style: solid; border-top-style: solid;