Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added attribution for Netlify #575

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Added attribution for Netlify #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/web/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/web/src/scripts/console.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function collapseConsole() {
consoleElement.classList.add("collapsed")

mainContentElement.style.flex = "1 0"
consoleElement.style.flex = `0 39px`
consoleElement.style.flex = `0 43px`
minMaxBtn.children[0].children[0].setAttribute("d", "M344 0H488c13.3 0 24 10.7 24 24V168c0 9.7-5.8 18.5-14.8 22.2s-19.3 1.7-26.2-5.2l-39-39-87 87c-9.4 9.4-24.6 9.4-33.9 0l-32-32c-9.4-9.4-9.4-24.6 0-33.9l87-87L327 41c-6.9-6.9-8.9-17.2-5.2-26.2S334.3 0 344 0zM168 512H24c-13.3 0-24-10.7-24-24V344c0-9.7 5.8-18.5 14.8-22.2s19.3-1.7 26.2 5.2l39 39 87-87c9.4-9.4 24.6-9.4 33.9 0l32 32c9.4 9.4 9.4 24.6 0 33.9l-87 87 39 39c6.9 6.9 8.9 17.2 5.2 26.2s-12.5 14.8-22.2 14.8z")
minMaxBtn.children[0].classList.add("expand-arrows")
minMaxBtn.children[0].classList.remove("collapse-arrows")
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/scripts/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ function onmousemoveY(e) {
// DOWN
if (deltaY > 0) {
const h = Math.round(parseInt(getComputedStyle(b).height) - deltaY)
b.style.flex = `0 ${h < 50 ? 39 : h}px`
b.style.flex = `0 ${h < 55 ? 43 : h}px`
t.style.flex = "1 0"

if (h < 39) {
if (h < 43) {
consoleElement.classList.remove("expanded")
consoleElement.classList.add("collapsed")

Expand All @@ -183,7 +183,7 @@ function onmousemoveY(e) {
// UP
if (deltaY < 0) {
const h = Math.round(parseInt(getComputedStyle(t).height) + deltaY)
t.style.flex = `0 ${h < 220 ? 210 : h}px`
t.style.flex = `0 ${h < 225 ? 210 : h}px`
b.style.flex = "1 0"

if (h > 714) {
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/styles/_control-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
width: fit-content;
opacity: 1;
transform: scaleX(1);
margin-top: .5rem;
transition: opacity 250ms var(--trans-bouncy), transform 250ms var(--trans-bouncy);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/styles/_examples-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
height: 0;
opacity: 0;
font-size: var(--fs-p);
line-height: var(--lh-sub-header);
// line-height: var(--lh-p);
max-width: 60ch;
overflow-y: scroll;
overflow-x: hidden;
Expand Down
14 changes: 13 additions & 1 deletion packages/web/src/styles/_settings-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,19 @@
width: 100%;
text-align: center;

p {
.project-links {
margin-bottom: 1rem;

p {
margin-bottom: .5rem;
}

.netlify-link {
a {
font-weight: bold;
}
}

}

.footer-links {
Expand All @@ -252,6 +263,7 @@
align-items: center;
justify-content: center;


a {
font-size: 1.2rem;
padding: 0 1rem;
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/styles/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
--lh-h2: 4rem;
--lh-h3: 3.5rem;
--lh-sub-header: 3rem;
--lh-p: 1.8rem;
--lh-footer: 1.25rem;
--lh-p: 2.2rem;
--lh-footer: 1.4rem;
--lh-i: 2rem;

/*colors*/
Expand Down Expand Up @@ -177,7 +177,7 @@ h3 {
p,
li {
font-size: var(--fs-p);
line-height: var(--lh-sub-header);
line-height: var(--lh-p);
font-weight: var(--fw-regular);
}

Expand Down
9 changes: 7 additions & 2 deletions packages/web/src/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,8 +973,13 @@ <h3 class="settings__preferences">Preferences</h3>
</div>

<footer>
<p><a href="https://www.thingweb.io/" target="_blank" id="thingweb-link">© 2023 The Eclipse Thingweb
Project</a></p>
<div class="project-links">
<p class="thingweb-link"><a href="https://www.thingweb.io/" target="_blank" id="thingweb-link">© 2024 The Eclipse Thingweb
Project</a></p>
<p class="netlify-link">This site is powered by <a href="https://www.netlify.com" target="_blank"
id="netlify-link">Netlify</a></p>
</div>

<div class="footer-links">
<a href="https://www.eclipse.org" target="_blank" id="eclipse-link">Eclipse</a>
<a href="https://www.eclipse.org/legal/privacy.php" target="_blank" id="privacy-link">Privacy
Expand Down
Loading