manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

🧑‍💻 Enhance components class names

Browse source
This commit is contained in:
Manuel Cillero 2023-10-19 19:09:34 +02:00
parent fc3836593e
commit b172108ec0
11 changed files with 123 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

44
pagetop/src/base/component.rs
View file

@ -1,36 +1,52 @@
use crate::core::component::{Context, ContextOp};
use crate::html::{JavaScript, StyleSheet};
use crate::Weight;
// Context parameters.
pub const PARAM_INCLUDE_ICONS: &str = "base.include.icon";
pub const PARAM_INCLUDE_FLEX_ASSETS: &str = "base.include.flex";
pub const PARAM_INCLUDE_MENU_ASSETS: &str = "base.include.menu";
pub const PARAM_BASE_ASSETS_WEIGHT: &str = "base.assets.weight";
pub const PARAM_BASE_INCLUDE_ICONS: &str = "base.include.icon";
pub const PARAM_BASE_INCLUDE_FLEX_ASSETS: &str = "base.include.flex";
pub const PARAM_BASE_INCLUDE_MENU_ASSETS: &str = "base.include.menu";
pub(crate) fn add_assets_for_base(cx: &mut Context) {
let weight = cx.get_param::<Weight>(PARAM_BASE_ASSETS_WEIGHT).unwrap_or(-90);
cx.alter(ContextOp::AddStyleSheet(
StyleSheet::at("/base/css/root.css").with_version("0.0.1"),
StyleSheet::at("/base/css/root.css")
.with_version("0.0.1")
.with_weight(weight),
));
if let Some(true) = cx.get_param::<bool>(PARAM_INCLUDE_ICONS) {
if let Some(true) = cx.get_param::<bool>(PARAM_BASE_INCLUDE_ICONS) {
cx.alter(ContextOp::AddStyleSheet(
StyleSheet::at("/base/css/icons.min.css").with_version("1.11.1"),
StyleSheet::at("/base/css/icons.min.css")
.with_version("1.11.1")
.with_weight(weight),
));
}
if let Some(true) = cx.get_param::<bool>(PARAM_INCLUDE_FLEX_ASSETS) {
if let Some(true) = cx.get_param::<bool>(PARAM_BASE_INCLUDE_FLEX_ASSETS) {
cx.alter(ContextOp::AddStyleSheet(
StyleSheet::at("/base/css/flex.css").with_version("0.0.1"),
StyleSheet::at("/base/css/flex.css")
.with_version("0.0.1")
.with_weight(weight),
));
}
if let Some(true) = cx.get_param::<bool>(PARAM_INCLUDE_MENU_ASSETS) {
if let Some(true) = cx.get_param::<bool>(PARAM_BASE_INCLUDE_MENU_ASSETS) {
cx.alter(ContextOp::AddStyleSheet(
StyleSheet::at("/base/css/menu.css").with_version("0.0.1"),
StyleSheet::at("/base/css/menu.css")
.with_version("0.0.1")
.with_weight(weight),
))
.alter(ContextOp::AddJavaScript(
JavaScript::at("/base/js/menu.js").with_version("0.0.1"),
JavaScript::at("/base/js/menu.js")
.with_version("0.0.1")
.with_weight(weight),
));
}
cx.alter(ContextOp::AddStyleSheet(
StyleSheet::at("/base/css/looks.css")
.with_version("0.0.1")
.with_weight(weight),
));
}
// By default, 1 pixel = 0.0625em.

2
pagetop/src/base/component/flex/container.rs
View file

@ -46,7 +46,7 @@ impl ComponentTrait for Container {
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
cx.set_param::<bool>(PARAM_INCLUDE_FLEX_ASSETS, true);
cx.set_param::<bool>(PARAM_BASE_INCLUDE_FLEX_ASSETS, true);
let gap = match self.gap() {
flex::Gap::Default => None,

2
pagetop/src/base/component/icon.rs
View file

@ -29,7 +29,7 @@ impl ComponentTrait for Icon {
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
cx.set_param::<bool>(PARAM_INCLUDE_ICONS, true);
cx.set_param::<bool>(PARAM_BASE_INCLUDE_ICONS, true);
PrepareMarkup::With(html! { i class=[self.classes().get()] {} })
}

4
pagetop/src/base/component/image.rs
View file

@ -2,8 +2,8 @@ use crate::prelude::*;
new_handle!(COMPONENT_IMAGE);
const IMG_FLUID: &str = "img-fluid";
const IMG_FIXED: &str = "img-fixed";
const IMG_FLUID: &str = "pt-img__fluid";
const IMG_FIXED: &str = "pt-img__fixed";
#[derive(Default)]
pub enum ImageSize {

4
pagetop/src/base/component/menu/menu_main.rs
View file

@ -42,8 +42,8 @@ impl ComponentTrait for Menu {
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
cx.set_param::<bool>(PARAM_INCLUDE_MENU_ASSETS, true);
cx.set_param::<bool>(PARAM_INCLUDE_ICONS, true);
cx.set_param::<bool>(PARAM_BASE_INCLUDE_MENU_ASSETS, true);
cx.set_param::<bool>(PARAM_BASE_INCLUDE_ICONS, true);
PrepareMarkup::With(html! {
div id=[self.id()] class="pt-menu__container" {

6
pagetop/src/base/component/powered_by.rs
View file

@ -37,7 +37,7 @@ impl ComponentTrait for PoweredBy {
}
fn id(&self) -> Option<String> {
Some("powered-by".to_owned())
Some("pt-powered-by".to_owned())
}
fn weight(&self) -> Weight {
@ -53,7 +53,7 @@ impl ComponentTrait for PoweredBy {
PoweredByLogo::Color => {
let logo_txt = L10n::t("pagetop_logo", &LOCALES_PAGETOP);
html! {
span class="pagetop-logo" aria-label=[logo_txt.into_string(cx)] {
span class="pt-pagetop__logo" aria-label=[logo_txt.into_string(cx)] {
img src="/base/pagetop-logo.svg" alt=[logo_txt.into_string(cx)] {}
}
}
@ -123,7 +123,7 @@ impl PoweredBy {
let logo_txt = L10n::t("pagetop_logo", &LOCALES_PAGETOP);
let logo_rgb = format!("rgb({},{},{})", r, g, b);
html! {
span class="pagetop-logo" aria-label=[logo_txt.into_string(cx)] {
span class="pt-pagetop__logo" aria-label=[logo_txt.into_string(cx)] {
svg viewBox="0 0 1614 1614" xmlns="http://www.w3.org/2000/svg" role="img" {
path fill=(logo_rgb) d="M 1573,357 L 1415,357 C 1400,357 1388,369 1388,383 L 1388,410 1335,410 1335,357 C 1335,167 1181,13 992,13 L 621,13 C 432,13 278,167 278,357 L 278,410 225,410 225,383 C 225,369 213,357 198,357 L 40,357 C 25,357 13,369 13,383 L 13,648 C 13,662 25,674 40,674 L 198,674 C 213,674 225,662 225,648 L 225,621 278,621 278,1256 C 278,1446 432,1600 621,1600 L 992,1600 C 1181,1600 1335,1446 1335,1256 L 1335,621 1388,621 1388,648 C 1388,662 1400,674 1415,674 L 1573,674 C 1588,674 1600,662 1600,648 L 1600,383 C 1600,369 1588,357 1573,357 L 1573,357 1573,357 Z M 66,410 L 172,410 172,621 66,621 66,410 66,410 Z M 1282,357 L 1282,488 C 1247,485 1213,477 1181,464 L 1196,437 C 1203,425 1199,409 1186,401 1174,394 1158,398 1150,411 L 1133,440 C 1105,423 1079,401 1056,376 L 1075,361 C 1087,352 1089,335 1079,324 1070,313 1054,311 1042,320 L 1023,335 C 1000,301 981,263 967,221 L 1011,196 C 1023,189 1028,172 1021,160 1013,147 997,143 984,150 L 953,168 C 945,136 941,102 940,66 L 992,66 C 1152,66 1282,197 1282,357 L 1282,357 1282,357 Z M 621,66 L 674,66 674,225 648,225 C 633,225 621,237 621,251 621,266 633,278 648,278 L 674,278 674,357 648,357 C 633,357 621,369 621,383 621,398 633,410 648,410 L 674,410 674,489 648,489 C 633,489 621,501 621,516 621,530 633,542 648,542 L 664,542 C 651,582 626,623 600,662 583,653 563,648 542,648 469,648 410,707 410,780 410,787 411,794 412,801 388,805 361,806 331,806 L 331,357 C 331,197 461,66 621,66 L 621,66 621,66 Z M 621,780 C 621,824 586,859 542,859 498,859 463,824 463,780 463,736 498,701 542,701 586,701 621,736 621,780 L 621,780 621,780 Z M 225,463 L 278,463 278,569 225,569 225,463 225,463 Z M 992,1547 L 621,1547 C 461,1547 331,1416 331,1256 L 331,859 C 367,859 400,858 431,851 454,888 495,912 542,912 615,912 674,853 674,780 674,747 662,718 642,695 675,645 706,594 720,542 L 780,542 C 795,542 807,530 807,516 807,501 795,489 780,489 L 727,489 727,410 780,410 C 795,410 807,398 807,383 807,369 795,357 780,357 L 727,357 727,278 780,278 C 795,278 807,266 807,251 807,237 795,225 780,225 L 727,225 727,66 887,66 C 889,111 895,155 905,196 L 869,217 C 856,224 852,240 859,253 864,261 873,266 882,266 887,266 891,265 895,263 L 921,248 C 937,291 958,331 983,367 L 938,403 C 926,412 925,429 934,440 939,447 947,450 954,450 960,450 966,448 971,444 L 1016,408 C 1043,438 1074,465 1108,485 L 1084,527 C 1076,539 1081,555 1093,563 1098,565 1102,566 1107,566 1116,566 1125,561 1129,553 L 1155,509 C 1194,527 1237,538 1282,541 L 1282,1256 C 1282,1416 1152,1547 992,1547 L 992,1547 992,1547 Z M 1335,463 L 1388,463 1388,569 1335,569 1335,463 1335,463 Z M 1441,410 L 1547,410 1547,621 1441,621 1441,410 1441,410 Z" {}
path fill=(logo_rgb) d="M 1150,1018 L 463,1018 C 448,1018 436,1030 436,1044 L 436,1177 C 436,1348 545,1468 701,1468 L 912,1468 C 1068,1468 1177,1348 1177,1177 L 1177,1044 C 1177,1030 1165,1018 1150,1018 L 1150,1018 1150,1018 Z M 912,1071 L 1018,1071 1018,1124 912,1124 912,1071 912,1071 Z M 489,1071 L 542,1071 542,1124 489,1124 489,1071 489,1071 Z M 701,1415 L 700,1415 C 701,1385 704,1352 718,1343 731,1335 759,1341 795,1359 802,1363 811,1363 818,1359 854,1341 882,1335 895,1343 909,1352 912,1385 913,1415 L 912,1415 701,1415 701,1415 701,1415 Z M 1124,1177 C 1124,1296 1061,1384 966,1408 964,1365 958,1320 922,1298 894,1281 856,1283 807,1306 757,1283 719,1281 691,1298 655,1320 649,1365 647,1408 552,1384 489,1296 489,1177 L 569,1177 C 583,1177 595,1165 595,1150 L 595,1071 859,1071 859,1150 C 859,1165 871,1177 886,1177 L 1044,1177 C 1059,1177 1071,1165 1071,1150 L 1071,1071 1124,1071 1124,1177 1124,1177 1124,1177 Z" {}

10
pagetop/src/base/component/site_branding.rs
View file

@ -56,16 +56,16 @@ impl ComponentTrait for SiteBranding {
let slogan = self.slogan().prepare(cx);
PrepareMarkup::With(html! {
div id=[self.id()] {
div class="site-branding-wrapper" {
div class="site-branding-logo" {
div class="pt-branding__wrapper" {
div class="pt-branding__logo" {
(self.logo().prepare(cx))
}
div class="site-branding-text" {
div class="site-branding-name" {
div class="pt-branding__text" {
div class="pt-branding__name" {
a href=(self.frontpage()(cx)) title=(title) rel="home" { (self.name()) }
}
@if !slogan.is_empty() {
div class="site-branding-slogan" {
div class="pt-branding__slogan" {
(slogan)
}
}

6
pagetop/src/base/theme/inception.rs
View file

@ -30,11 +30,13 @@ impl ThemeTrait for Inception {
.alter_context(ContextOp::AddStyleSheet(
StyleSheet::at("/base/css/normalize.min.css")
.with_version("8.0.1")
.with_weight(-99),
.with_weight(-90),
))
.alter_context(ContextOp::AddAssetsForBase)
.alter_context(ContextOp::AddStyleSheet(
StyleSheet::at("/base/css/styles.css").with_version("0.0.1"),
StyleSheet::at("/base/css/styles.css")
.with_version("0.0.1")
.with_weight(-90),
));
}
}

46
pagetop/static/base/css/looks.css Normal file
View file

@ -0,0 +1,46 @@
/* Image component */
.pt-img__fluid {
max-width: 100%;
height: auto;
}
/* SiteBranding component */
.pt-branding__wrapper {
display: flex;
align-items: flex-end;
column-gap: var(--pt-gap-0-75);
}
.pt-branding__name {
letter-spacing: 0.02em;
font-size: var(--pt-font-size-xl);
}
.pt-branding__slogan {
font-size: var(--pt-font-size-l);
}
/* SM - Applies <= 568px */
@media (max-width: 35.5em) {
.pt-branding__logo {
display: none;
}
}
/* LG - Applies <= 992px */
@media (max-width: 62em) {
.pt-branding__slogan {
font-size: var(--pt-font-size-l);
}
}
/* PoweredBy component */
#pt-powered-by {
text-align: center;
}
#pt-powered-by .pt-pagetop__logo img,
#pt-powered-by .pt-pagetop__logo svg {
margin-left: .275em;
height: 1.275em;
vertical-align: middle;
}

30
pagetop/static/base/css/root.css
View file

@ -1,16 +1,24 @@
:root {
--pt-font-sans: system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans","Liberation Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
--pt-font-serif: "Lora","georgia",serif;
--pt-font-monospace: SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;
--pt-font-family: var(--pt-font-sans);
--pt-font-size-base: 1rem;
--pt-font-size-xxl: 1.875rem;
--pt-font-size-xl: 1.375rem;
--pt-font-size-l: 1.125rem;
--pt-font-size-s: 0.875rem;
--pt-font-size-xs: 0.8125rem;
--pt-font-size-xxs: 0.75rem;
--pt-font-weight: 400;
--pt-line-height-base: 1.5;
--pt-color-bg: #fff;
--pt-color: #212529;
/*
--font-sans: "metropolis",sans-serif;
--font-serif: "Lora","georgia",serif;
--font-size-base: 1rem;
*/
--font-size-xxl: 1.875rem;
--font-size-xl: 1.425rem;
--font-size-l: 1.125rem;
/*
--font-size-s: 0.875rem;
--font-size-xs: 0.8125rem;
--font-size-xxs: 0.75rem;
--pt-color-rgb: 33,37,41;
--pt-main--bg-rgb: 255,255,255;
--pt-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
--line-height-base: 1.6875rem;
--line-height-s: 1.125rem;
--max-width: 84.375rem;

63
pagetop/static/base/css/styles.css
View file

@ -1,54 +1,11 @@
/* LAYOUT */
.region {
position: relative;
}
/* COMPONENTS */
/* Image component */
.img-fluid {
max-width: 100%;
height: auto;
}
/* SiteBranding component */
.site-branding-wrapper {
display: flex;
align-items: flex-end;
column-gap: var(--pt-gap-0-75);
}
.site-branding-name {
letter-spacing: 0.02em;
font-size: var(--font-size-xxl);
}
.site-branding-slogan {
font-size: var(--font-size-xl);
}
/* SM - Applies <= 568px */
@media (max-width: 35.5em) {
.site-branding-logo {
display: none;
}
}
/* LG - Applies <= 992px */
@media (max-width: 62em) {
.site-branding-slogan {
font-size: var(--font-size-l);
}
}
/* PoweredBy component */
#powered-by {
text-align: center;
}
#powered-by .pagetop-logo img,
#powered-by .pagetop-logo svg {
margin-left: .275em;
height: 1.275em;
vertical-align: middle;
body {
margin: 0;
font-family: var(--pt-font-family);
font-size: var(--pt-font-size-base);
font-weight: var(--pt-font-weight);
line-height: var(--pt-line-height-base);
color: var(--pt-color);
background-color: var(--pt-color-bg);
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: transparent;
}