Skip to content

Commit 8cf9d8f

Browse files
authored
Merge pull request #37 from Respo/contained
tricky support for container styles
2 parents 1df6885 + 869fef3 commit 8cf9d8f

File tree

6 files changed

+154
-71
lines changed

6 files changed

+154
-71
lines changed

Cargo.lock

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo_respo/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ readme = "README.md"
1414
[dependencies]
1515
memoize = "0.4.2"
1616
respo = { path = "../respo/" }
17-
js-sys = "0.3.69"
17+
js-sys = "0.3.76"
1818
wasm-bindgen = "0.2.93"
1919
console_error_panic_hook = "0.1.7"
20-
uuid = { version = "1.10.0", features = ["v4", "js"] }
21-
serde = { version = "1.0.210", features = ["derive", "rc"] }
22-
serde_json = "1.0.128"
20+
uuid = { version = "1.11.0", features = ["v4", "js"] }
21+
serde = { version = "1.0.216", features = ["derive", "rc"] }
22+
serde_json = "1.0.133"
2323
respo_state_derive = { path = "../respo_state_derive" }
2424

2525
[dependencies.web-sys]
26-
version = "0.3.70"
26+
version = "0.3.76"
2727
features = [
2828
"console",
2929
'Document',

demo_respo/src/main.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::rc::Rc;
1414

1515
use inner_text::comp_inner_text;
1616
use respo::css::respo_style;
17-
use respo::{space, RespoAction};
17+
use respo::{contained_styles, space, RespoAction};
1818
use web_sys::Node;
1919

2020
use respo::ui::ui_global;
@@ -64,7 +64,7 @@ impl RespoApp for App {
6464

6565
Ok(
6666
div()
67-
.class(ui_global())
67+
.class(ui_global() + " " + &style_container())
6868
.style(respo_style().padding(12))
6969
.children([
7070
comp_counter(&states.pick("counter"), store.counted)?.to_node(),
@@ -97,3 +97,12 @@ fn main() {
9797

9898
app.render_loop().expect("app render");
9999
}
100+
101+
contained_styles!(
102+
style_container,
103+
(
104+
Some("@media only screen and (max-width: 600px)".to_owned()),
105+
"&",
106+
respo_style().background_color(respo::css::CssColor::Hsl(0, 0, 95))
107+
)
108+
);

respo/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "respo"
3-
version = "0.1.14"
3+
version = "0.1.15"
44
edition = "2021"
55
description = "a tiny virtual DOM library migrated from ClojureScript"
66
license = "Apache-2.0"
@@ -12,14 +12,14 @@ readme = "README.md"
1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

1414
[dependencies]
15-
js-sys = "0.3.69"
15+
js-sys = "0.3.76"
1616
wasm-bindgen = "0.2.93"
1717
lazy_static = "1.5.0"
1818
cirru_parser = "0.1.31"
1919
# cirru_parser = { path = "/Users/chenyong/repo/cirru/parser.rs" }
2020
rust-hsluv = "0.1.4"
21-
serde = { version = "1.0.210", features = ["derive", "rc"] }
22-
serde_json = "1.0.128"
21+
serde = { version = "1.0.216", features = ["derive", "rc"] }
22+
serde_json = "1.0.133"
2323
# respo_state_derive = { path = "../respo_state_derive" }
2424
respo_state_derive = "0.0.1"
2525

@@ -28,7 +28,7 @@ respo_state_derive = "0.0.1"
2828
crate-type = ["cdylib", "rlib"]
2929

3030
[dependencies.web-sys]
31-
version = "0.3.70"
31+
version = "0.3.76"
3232
features = [
3333
"console",
3434
'Document',

0 commit comments

Comments
 (0)