Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	Cargo.toml
#	core/src/window/icon.rs
#	core/src/window/id.rs
#	core/src/window/position.rs
#	core/src/window/settings.rs
#	examples/integration/src/main.rs
#	examples/integration_opengl/src/main.rs
#	glutin/src/application.rs
#	native/src/subscription.rs
#	native/src/window.rs
#	runtime/src/window/action.rs
#	src/lib.rs
#	src/window.rs
#	winit/Cargo.toml
#	winit/src/application.rs
#	winit/src/icon.rs
#	winit/src/settings.rs
#	winit/src/window.rs

1 files changed, 0 insertions, 20 deletions

diff --git a/style/src/text.rs b/style/src/text.rs
deleted file mode 100644
index f31c2306..00000000
--- a/style/src/text.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-//! Change the appearance of text.
-use iced_core::Color;
-
-/// The style sheet of some text.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default + Copy;
-
-    /// Produces the [`Appearance`] of some text.
-    fn appearance(&self, style: Self::Style) -> Appearance;
-}
-
-/// The apperance of some text.
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Appearance {
-    /// The [`Color`] of the text.
-    ///
-    /// The default, `None`, means using the inherited color.
-    pub color: Option<Color>,
-}