Move `Theme` type to `iced_core`

2 files changed, 3 insertions, 6 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 236c64d3..c596f2a6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -162,7 +162,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 use iced_widget::graphics;
 use iced_widget::renderer;
-use iced_widget::style;
 use iced_winit as shell;
 use iced_winit::core;
 use iced_winit::runtime;
@@ -186,15 +185,14 @@ pub mod advanced;
 #[cfg(feature = "multi-window")]
 pub mod multi_window;
 
-pub use style::theme;
-
 pub use crate::core::alignment;
 pub use crate::core::border;
 pub use crate::core::color;
 pub use crate::core::gradient;
+pub use crate::core::theme;
 pub use crate::core::{
     Alignment, Background, Border, Color, ContentFit, Degrees, Gradient,
-    Length, Padding, Pixels, Point, Radians, Rectangle, Shadow, Size,
+    Length, Padding, Pixels, Point, Radians, Rectangle, Shadow, Size, Theme,
     Transformation, Vector,
 };
 
@@ -314,7 +312,6 @@ pub use renderer::Renderer;
 pub use sandbox::Sandbox;
 pub use settings::Settings;
 pub use subscription::Subscription;
-pub use theme::Theme;
 
 /// A generic widget.
 ///
diff --git a/src/time.rs b/src/time.rs
index e255d751..26d31c0a 100644
--- a/src/time.rs
+++ b/src/time.rs
@@ -1,5 +1,5 @@
 //! Listen and react to time.
-pub use iced_core::time::{Duration, Instant};
+pub use crate::core::time::{Duration, Instant};
 
 #[allow(unused_imports)]
 #[cfg_attr(