diff --git a/Base/res/fonts/CsillaBold7x10.font b/Base/res/fonts/CsillaBold10.font similarity index 100% rename from Base/res/fonts/CsillaBold7x10.font rename to Base/res/fonts/CsillaBold10.font diff --git a/Base/res/fonts/CsillaThin7x10.font b/Base/res/fonts/CsillaRegular10.font similarity index 100% rename from Base/res/fonts/CsillaThin7x10.font rename to Base/res/fonts/CsillaRegular10.font diff --git a/Base/res/fonts/Csilla12.font b/Base/res/fonts/CsillaRegular12.font similarity index 100% rename from Base/res/fonts/Csilla12.font rename to Base/res/fonts/CsillaRegular12.font diff --git a/Base/res/fonts/Katica10.font b/Base/res/fonts/KaticaRegular10.font similarity index 100% rename from Base/res/fonts/Katica10.font rename to Base/res/fonts/KaticaRegular10.font diff --git a/Base/res/fonts/Katica12.font b/Base/res/fonts/KaticaRegular12.font similarity index 100% rename from Base/res/fonts/Katica12.font rename to Base/res/fonts/KaticaRegular12.font diff --git a/Base/res/fonts/LizaBold8x10.font b/Base/res/fonts/LizaBlack10.font similarity index 100% rename from Base/res/fonts/LizaBold8x10.font rename to Base/res/fonts/LizaBlack10.font diff --git a/Base/res/fonts/LizaBold18x24.font b/Base/res/fonts/LizaBlack24.font similarity index 100% rename from Base/res/fonts/LizaBold18x24.font rename to Base/res/fonts/LizaBlack24.font diff --git a/Base/res/fonts/LizaBold26x36.font b/Base/res/fonts/LizaBlack36.font similarity index 100% rename from Base/res/fonts/LizaBold26x36.font rename to Base/res/fonts/LizaBlack36.font diff --git a/Base/res/fonts/LizaRegular8x10.font b/Base/res/fonts/LizaBold10.font similarity index 100% rename from Base/res/fonts/LizaRegular8x10.font rename to Base/res/fonts/LizaBold10.font diff --git a/Base/res/fonts/LizaRegular18x24.font b/Base/res/fonts/LizaBold24.font similarity index 100% rename from Base/res/fonts/LizaRegular18x24.font rename to Base/res/fonts/LizaBold24.font diff --git a/Base/res/fonts/LizaRegular26x36.font b/Base/res/fonts/LizaBold36.font similarity index 100% rename from Base/res/fonts/LizaRegular26x36.font rename to Base/res/fonts/LizaBold36.font diff --git a/Base/res/fonts/LizaThin8x10.font b/Base/res/fonts/LizaRegular10.font similarity index 100% rename from Base/res/fonts/LizaThin8x10.font rename to Base/res/fonts/LizaRegular10.font diff --git a/Base/res/fonts/LizaThin18x24.font b/Base/res/fonts/LizaRegular24.font similarity index 100% rename from Base/res/fonts/LizaThin18x24.font rename to Base/res/fonts/LizaRegular24.font diff --git a/Base/res/fonts/LizaThin26x36.font b/Base/res/fonts/LizaRegular36.font similarity index 100% rename from Base/res/fonts/LizaThin26x36.font rename to Base/res/fonts/LizaRegular36.font diff --git a/Base/res/fonts/Pebbleton14.font b/Base/res/fonts/PebbletonRegular14.font similarity index 100% rename from Base/res/fonts/Pebbleton14.font rename to Base/res/fonts/PebbletonRegular14.font diff --git a/Libraries/LibGfx/Font.cpp b/Libraries/LibGfx/Font.cpp index eb8f187753..dba9d9feb4 100644 --- a/Libraries/LibGfx/Font.cpp +++ b/Libraries/LibGfx/Font.cpp @@ -60,7 +60,7 @@ struct [[gnu::packed]] FontFileHeader Font& Font::default_font() { static Font* s_default_font; - static const char* default_font_path = "/res/fonts/Katica10.font"; + static const char* default_font_path = "/res/fonts/KaticaRegular10.font"; if (!s_default_font) { s_default_font = Font::load_from_file(default_font_path).leak_ref(); ASSERT(s_default_font); @@ -71,7 +71,7 @@ Font& Font::default_font() Font& Font::default_fixed_width_font() { static Font* s_default_fixed_width_font; - static const char* default_fixed_width_font_path = "/res/fonts/CsillaThin7x10.font"; + static const char* default_fixed_width_font_path = "/res/fonts/CsillaRegular10.font"; if (!s_default_fixed_width_font) { s_default_fixed_width_font = Font::load_from_file(default_fixed_width_font_path).leak_ref(); ASSERT(s_default_fixed_width_font); @@ -82,7 +82,7 @@ Font& Font::default_fixed_width_font() Font& Font::default_bold_fixed_width_font() { static Font* font; - static const char* default_bold_fixed_width_font_path = "/res/fonts/CsillaBold7x10.font"; + static const char* default_bold_fixed_width_font_path = "/res/fonts/CsillaBold10.font"; if (!font) { font = Font::load_from_file(default_bold_fixed_width_font_path).leak_ref(); ASSERT(font); diff --git a/Libraries/LibWeb/CSS/StyleProperties.cpp b/Libraries/LibWeb/CSS/StyleProperties.cpp index 2e15aa949d..3198e5c87f 100644 --- a/Libraries/LibWeb/CSS/StyleProperties.cpp +++ b/Libraries/LibWeb/CSS/StyleProperties.cpp @@ -116,7 +116,7 @@ void StyleProperties::load_font() const if (font_weight == "lighter") weight = "Thin"; else if (font_weight == "normal") - weight = ""; + weight = "Regular"; else if (font_weight == "bold") weight = "Bold"; else {