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

Update Slint logo folder with new design #3432

Merged
merged 22 commits into from
Sep 11, 2023
Merged

Update Slint logo folder with new design #3432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5be5102
Update logos
aurindam Sep 8, 2023
d26663f
Update urls in README
aurindam Sep 8, 2023
37b0f63
Simplify the README
aurindam Sep 8, 2023
7ca69d3
Update README.md
aurindam Sep 8, 2023
a671dbc
Delete archive folder
aurindam Sep 8, 2023
5573754
Update .reuse/dep5
aurindam Sep 8, 2023
6504e24
rename logo files
aurindam Sep 8, 2023
6a3a938
Update logo names
aurindam Sep 8, 2023
5dece0c
flatten hierarchy (logo folder)
aurindam Sep 8, 2023
0d172ae
Update license_headers_check.rs
aurindam Sep 8, 2023
c9d8665
Update references to logo
aurindam Sep 8, 2023
5ad9c70
Some more
aurindam Sep 8, 2023
c01eb0e
More renaming of logo files
aurindam Sep 8, 2023
c0c67a2
Rename logos
aurindam Sep 8, 2023
8bfddbe
Update filenames for madewithslint logos
aurindam Sep 8, 2023
2d7d0f0
Update filenames of logos
aurindam Sep 8, 2023
4e64e1e
More fixes
aurindam Sep 8, 2023
86b50f2
Switch dark and light logo for MadeWithSlint
aurindam Sep 8, 2023
ef216b0
Fix failed screenshot test
aurindam Sep 9, 2023
61375f5
Fix typos
aurindam Sep 9, 2023
9ee2757
Update README.md
aurindam Sep 9, 2023
604f9af
Added logos with whitebg
aurindam Sep 11, 2023
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
Prev Previous commit
Next Next commit
Update references to logo
  • Loading branch information
@aurindam
aurindam committed Sep 8, 2023
commit c9d86658bc5fe11ae2947f02e23e36d0dc978004
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Copyright © SixtyFPS GmbH <info@slint.dev> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial -->
# ![Slint](./logo/slint-logo-full-light.svg#gh-light-mode-only)![Slint](./logo/slint-logo-full-white.svg#gh-dark-mode-only)
# ![Slint](./logo/slint_logo_full_light.svg#gh-light-mode-only)![Slint](./logo/slint_logo_full_dark.svg#gh-dark-mode-only)

<!-- cSpell: ignore ChipTrack Moiré Trolltech valign Woboq -->

Expand Down
2 changes: 1 addition & 1 deletion api/cpp/docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@

html_show_sourcelink = False

html_logo = "https://slint.dev/logo/slint-logo-small-light.svg"
html_logo = "https://slint.dev/logo/slint_logo_small_light.svg"

myst_enable_extensions = [
"html_image",
Expand Down
4 changes: 2 additions & 2 deletions api/cpp/tests/datastructures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ TEST_CASE("Image")
}

#ifndef SLINT_FEATURE_FREESTANDING
img = Image::load_from_path(SOURCE_DIR "/../../../logo/slint-logo-square-light-128x128.png");
img = Image::load_from_path(SOURCE_DIR "/../../../logo/slint_logo_simple_square_light_128x128.png");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[formatters] reported by reviewdog 🐶

Suggested change
img = Image::load_from_path(SOURCE_DIR "/../../../logo/slint_logo_simple_square_light_128x128.png");
img = Image::load_from_path(SOURCE_DIR
"/../../../logo/slint_logo_simple_square_light_128x128.png");

{
auto size = img.size();
REQUIRE(size.width == 128.);
Expand All @@ -171,7 +171,7 @@ TEST_CASE("Image")
{
auto actual_path = img.path();
REQUIRE(actual_path.has_value());
REQUIRE(*actual_path == SOURCE_DIR "/../../../logo/slint-logo-square-light-128x128.png");
REQUIRE(*actual_path == SOURCE_DIR "/../../../logo/slint_logo_simple_square_light_128x128.png");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[formatters] reported by reviewdog 🐶

Suggested change
REQUIRE(*actual_path == SOURCE_DIR "/../../../logo/slint_logo_simple_square_light_128x128.png");
REQUIRE(*actual_path
== SOURCE_DIR "/../../../logo/slint_logo_simple_square_light_128x128.png");

}
#endif

Expand Down
2 changes: 1 addition & 1 deletion api/cpp/tests/interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ SCENARIO("Value API")
{
REQUIRE(!value.to_image().has_value());
slint::Image image = slint::Image::load_from_path(
SOURCE_DIR "/../../../logo/slint-logo-square-light-128x128.png");
SOURCE_DIR "/../../../logo/slint_logo_simple_square_light_128x128.png");
REQUIRE(image.size().width == 128);
value = Value(image);
REQUIRE(value.type() == Value::Type::Image);
Expand Down
2 changes: 1 addition & 1 deletion api/rs/build/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ fn main() {
}
```
*/
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]
#![warn(missing_docs)]

#[cfg(not(feature = "default"))]
Expand Down
2 changes: 1 addition & 1 deletion api/rs/macros/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// cSpell:ignore punct

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]

extern crate proc_macro;
use std::path::Path;
Expand Down
2 changes: 1 addition & 1 deletion api/rs/slint/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ See the [documentation of the `Global` trait](Global) for an example.

#![warn(missing_docs)]
#![deny(unsafe_code)]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(clippy::needless_doctest_main)] // We document how to write a main function

Expand Down
4 changes: 2 additions & 2 deletions docs/reference/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"name": "Slint",
"url": "https://slint.dev",
"html": """
<img src="https://slint.dev/logo/slint-logo-small-light.svg">
<img src="https://slint.dev/logo/slint_logo_small_light.svg">
""",
"class": "",
},
Expand All @@ -89,7 +89,7 @@

html_show_sourcelink = False

html_logo = "https://slint.dev/logo/slint-logo-small-light.svg"
html_logo = "https://slint.dev/logo/slint_logo_small_light.svg"

myst_enable_extensions = [
"html_image", "colon_fence"
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/src/language/builtins/elements.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,11 @@ export component Example inherits Window {
height: 100px;
VerticalLayout {
Image {
source: @image-url("https://slint.dev/logo/slint-logo-full-light.svg");
source: @image-url("https://slint.dev/logo/slint_logo_full_lightt.svg");
// image-fit default is `contain` when in layout, preserving aspect ratio
}
Image {
source: @image-url("https://slint.dev/logo/slint-logo-full-light.svg");
source: @image-url("https://slint.dev/logo/slint_logo_full_light.svg");
colorize: red;
}
}
Expand All @@ -317,7 +317,7 @@ export component Example inherits Window {
height: 150px;
VerticalLayout {
Image {
source: @image-url("https://slint.dev/logo/slint-logo-full-light.svg");
source: @image-url("https://slint.dev/logo/slint_logo_full_light.svg");
width: 100px;
// implicit default, preserving aspect ratio:
// height: self.width * natural_height / natural_width;
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/src/language/syntax/types.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export component Example inherits Window {
preferred-width: 150px;
preferred-height: 50px;

in property <image> some_image: @image-url("https://slint.dev/logo/slint-logo-full-light.svg");
in property <image> some_image: @image-url("https://slint.dev/logo/slint_logo_full_light.svg");

Text {
text: "The image is " + some_image.width + "x" + some_image.height;
Expand Down
2 changes: 1 addition & 1 deletion docs/site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ <h4>Using NodeJS (beta)</h4>
<footer>
<div class="col-wrap">
<div class="col-6">
<p><img src="https://slint.dev/assets/img/slint-logo.svg" alt="Slint" width="141" height="47" class="footer-logo"></p>
<p><img src="https://slint.dev/logo/slint_logo_simple_light.svg" alt="Slint" width="141" height="47" class="footer-logo"></p>
<p class="some-links">
<a href="https://twitter.com/slint_ui"><img src="https://slint.dev/assets/img/icon-twitter.svg" alt="Twitter" width="40" height="40"></a>
<a href="https://www.linkedin.com/company/slint-ui/"><img src="https://slint.dev/assets/img/icon-linkedin.svg" alt="Linkedin" width="40" height="40"></a>
Expand Down
2 changes: 1 addition & 1 deletion examples/energy-monitor/ui/images.slint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ export global Images {
in property <image> cloudy: @image-url("assets/cloudy.svg");
in property <image> settings: @image-url("assets/settings.svg");
in property <image> information: @image-url("assets/information.svg");
in property <image> slint-logo: @image-url("../../../logo/slint-logo-simple-white.svg");
in property <image> slint-logo: @image-url("../../../logo/slint_logo_simple_dark.svg");
in property <image> spyrosoft-logo: @image-url("assets/spyrosoft-logo.svg");
}
2 changes: 1 addition & 1 deletion examples/ffmpeg/scene.slint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export component App inherits Window {
min-height: 300px;
title: "Slint FFmpeg Example";
background: #000000;
icon: @image-url("../../logo/slint-logo-small-light-128x128.png");
icon: @image-url("../../logo/slint_logo_small_light.png");

in property <image> video-frame <=> image.source;
in property <bool> playing;
Expand Down
2 changes: 1 addition & 1 deletion examples/gallery/gallery.slint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ component App inherits Window {
preferred-width: 700px;
preferred-height: 500px;
title: @tr("Slint Widgets Gallery");
icon: @image-url("../../logo/slint-logo-small-light-128x128.png");
icon: @image-url("../../logo/slint_logo_small_light.png");

HorizontalLayout {
side-bar := SideBar {
Expand Down
2 changes: 1 addition & 1 deletion examples/mcu-board-support/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// cSpell: ignore deque pico

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]
#![cfg_attr(not(feature = "std"), no_std)]

extern crate alloc;
Expand Down
2 changes: 1 addition & 1 deletion examples/opengl_texture/scene.slint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export component App inherits Window {
preferred-width: 500px;
preferred-height: 600px;
title: "Slint OpenGL Texture Example";
icon: @image-url("../../logo/slint-logo-small-light-128x128.png");
icon: @image-url("../../logo/slint_logo_small_light.png");

in property <image> texture <=> image.source;
out property <int> requested-texture-width: image.width/1phx;
Expand Down
2 changes: 1 addition & 1 deletion examples/opengl_underlay/scene.slint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export component App inherits Window {
preferred-width: 500px;
preferred-height: 600px;
title: "Slint OpenGL Underlay Example";
icon: @image-url("../../logo/slint-logo-small-light-128x128.png");
icon: @image-url("../../logo/slint_logo_small_light.png");

in property <bool> rotation-enabled <=> apply-rotation.checked;

Expand Down
2 changes: 1 addition & 1 deletion examples/printerdemo_mcu/ui/settings_page.slint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export component SettingsPage inherits Page {

}
Image {
source: DemoPalette.night-mode ? @image-url("slint-logo-square-dark-80x80.png") : @image-url("slint-logo-square-light-80x80.png");
source: DemoPalette.night-mode ? @image-url("slint_logo_simple_square_dark.png") : @image-url("slint_logo_simple_square_light.png");
width: 80px;
height: 80px;
x: parent.width - self.width;
Expand Down
2 changes: 1 addition & 1 deletion internal/backends/linuxkms/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint-ui.com/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint-ui.com/logo/slint_logo_simple_square_light.svg")]

#[cfg(target_os = "linux")]
mod fullscreenwindowadapter;
Expand Down
2 changes: 1 addition & 1 deletion internal/backends/qt/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// cSpell: ignore deinit fnbox qsize

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]
#![recursion_limit = "2048"]

extern crate alloc;
Expand Down
2 changes: 1 addition & 1 deletion internal/backends/selector/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]
#![cfg_attr(
not(any(
feature = "i-slint-backend-qt",
Expand Down
2 changes: 1 addition & 1 deletion internal/backends/testing/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]

use i_slint_core::graphics::euclid::{Point2D, Size2D};
use i_slint_core::graphics::FontRequest;
Expand Down
2 changes: 1 addition & 1 deletion internal/backends/winit/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]

extern crate alloc;

Expand Down
2 changes: 1 addition & 1 deletion internal/common/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]
#![cfg_attr(not(feature = "shared-fontdb"), no_std)]

pub mod builtin_structs;
Expand Down
2 changes: 1 addition & 1 deletion internal/compiler/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]
// It would be nice to keep the compiler free of unsafe code
#![deny(unsafe_code)]

Expand Down
2 changes: 1 addition & 1 deletion internal/compiler/parser-test-macro/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial

#![doc = include_str!("README.md")]
#![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
#![doc(html_logo_url = "https://slint.dev/logo/slint_logo_simple_square_light.svg")]

extern crate proc_macro;
use core::iter::IntoIterator;
Expand Down
Loading