Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/matthunz/blitz into accesskit
Browse files Browse the repository at this point in the history
  • Loading branch information
matthunz committed Jun 30, 2024
2 parents 0ce74dd + 5495da2 commit 709d505
Show file tree
Hide file tree
Showing 24 changed files with 940 additions and 174 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.79
- run: perl -pi.bak -e 's/opt-level = 2/opt-level = 0/g' Cargo.toml
- run: sudo apt install libgtk-3-dev libxdo-dev
- run: cargo build --workspace

Expand All @@ -39,6 +40,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- run: perl -pi.bak -e 's/opt-level = 2/opt-level = 0/g' Cargo.toml
- run: sudo apt install libgtk-3-dev libxdo-dev
- run: cargo build --workspace
- run: cargo test --workspace
Expand All @@ -63,6 +65,7 @@ jobs:
with:
toolchain: nightly
components: clippy
- run: perl -pi.bak -e 's/opt-level = 2/opt-level = 0/g' Cargo.toml
- run: sudo apt install libgtk-3-dev libxdo-dev
- run: cargo clippy --workspace -- -D warnings

Expand All @@ -84,22 +87,25 @@ jobs:
matrix:
platform:
- {
name: windows,
target: x86_64-pc-windows-msvc,
os: windows-latest,
cross: false,
command: "test",
args: "--all --tests",
setup: ""
setup: perl -pi.bak -e 's/opt-level = 2/opt-level = 0/g' Cargo.toml
}
- {
target: x86_64-apple-darwin,
name: macos,
target: aarch64-apple-darwin,
os: macos-latest,
cross: false,
command: "test",
args: "--all --tests",
setup: ""
setup: perl -pi.bak -e 's/opt-level = 2/opt-level = 0/g' Cargo.toml
}
- {
name: linux,
target: x86_64-unknown-linux-gnu,
os: ubuntu-latest,
cross: false,
Expand All @@ -111,9 +117,12 @@ jobs:
libgtk-3-dev \
libudev-dev \
libpango1.0-dev \
libxdo-dev"
libxdo-dev;
perl -pi.bak -e 's/opt-level = 2/opt-level = 0/g' Cargo.toml"
}

name: Test (${{ matrix.platform.name }})

steps:
- uses: actions/checkout@v4
- name: install stable
Expand Down Expand Up @@ -143,6 +152,7 @@ jobs:

- name: Setup
run: ${{ matrix.platform.setup }}
shell: bash

- name: test
run: |
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ members = ["packages/blitz", "packages/dom", "packages/dioxus-blitz"]
resolver = "2"

[workspace.dependencies]
style = { git = "https://github.com/servo/stylo", rev = "039959d" } # 2024-05-15
style_config = { git = "https://github.com/servo/stylo", rev = "039959d" } # 2024-05-15
style_traits = { git = "https://github.com/servo/stylo", rev = "039959d" } # 2024-05-15
selectors = { git = "https://github.com/servo/stylo", rev = "039959d" } # 2024-05-15
style = { git = "https://github.com/dioxuslabs/stylo", rev = "10767f4" } # 2024-05-15 + dioxus patches
style_config = { git = "https://github.com/dioxuslabs/stylo", rev = "10767f4" } # 2024-05-15 + dioxus patches
style_traits = { git = "https://github.com/dioxuslabs/stylo", rev = "10767f4" } # 2024-05-15 + dioxus patches
selectors = { git = "https://github.com/dioxuslabs/stylo", rev = "10767f4" } # 2024-05-15 + dioxus patches
html5ever = "0.27" # needs to match stylo markup5ever version
taffy = { version = "0.5.1" }
parley = { git = "https://github.com/nicoburns/parley", rev = "482d0fbd59eceaa68cc879e0102a7a9a87636a0d" }
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ Blitz is currently **experimental**. We are actively working on bringing into a
- [x] Inline (partial support - implementation still immature)
- [x] Block
- [x] Flexbox
- [ ] Grid (implemented, but needs to be enabled in Stylo)
- [x] Grid
- [ ] Named grid lines
- [ ] Subgrid
- [ ] Table
- [ ] Z-index
- [ ] Additional CSS features
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
113 changes: 113 additions & 0 deletions examples/assets/gosub.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@

<!DOCTYPE html>
<html lang="en">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style>
body {
color: #ffffff;
background-color: #121212;
font-family: "Arial", sans-serif;
margin: 0;
padding: 0;
}
.layout {
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}
h1 {
font-size: 6em;
padding: 0;
margin: 0;
}
blockquote {
font-size: 1.5em;
margin-top: 0;
padding-top: 20px;
}
p {
font-size: 1.2em;
}
#quote {
font-size: 1.5em;
padding-bottom: 20px;
}

.links {
list-style-type: none;
}
.links li {
padding: 5px;
}

a {
color: cyan;
text-decoration: none;
border-bottom: 2px solid #6e40c9;
transition: border-bottom 0.3s ease-in-out;
}

a:link {
text-decoration: none;
}

a:visited {
text-decoration: none;
}

a:hover {
text-decoration: none;
}

a:active {
text-decoration: none;
}

.logo {
width: 25%;
min-width: 200px;
max-width: 400px;
}

h1 {
font-size: 72px;
background: rgb(96,243,236);
background: linear-gradient(180deg, rgba(96,243,236,1) 40%, rgba(30,84,231,1) 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}

.small {
font-size: 10px;
}
</style>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />

<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">

<title>Gosub - The gateway to optimized searching and browsing</title>
</head>

<body>
<div class="layout">
<h1>Gosub</h1>
<p id="quote">The gateway to optimized searching and browsing</p>

<img class="logo" src="gosub-logo.svg" alt="Gosub Logo">
<blockquote>
Join us on the journey to a new web browser
</blockquote>

<ul class="links">
<li><a id="link1" href="https://github.com/gosub-browser"><i class="fa-brands fa-github"></i> GitHub <i class="small fa-solid fa-arrow-up-right-from-square"></i></a>
<li><a id="link2" href="https://chat.gosub.io"><i class="fa-brands fa-discord"></i> Global Discord <i class="small fa-solid fa-arrow-up-right-from-square"></i></a>
<li><a id="link3" href="https://chat.developer.gosub.io"><i class="fa-solid fa-comments"></i> Developer chat - Zulip <i class="small fa-solid fa-arrow-up-right-from-square"></i></a>
</ul>
</div>
</body>
</html>
12 changes: 12 additions & 0 deletions examples/assets/gosub_reduced.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<body style="color: #ffffff;background-color: #121212;">
<div style="display: flex;flex-direction: column;align-items: center;text-align: center;">
<div>
<div>GitHub</div>
<div>Global Discord</div>
<div>Developer chat - Zudivp</div>
</div>
</div>
</body>
</html>
Loading

0 comments on commit 709d505

Please sign in to comment.