moved Widget.Style.Material to Widget.Material

example/src/Data/Style.elm

@@ -32,7 +32,7 @@ import Widget
 import Widget.Icon as Icon
 import Widget.Layout exposing (LayoutStyle)
 import Widget.Snackbar exposing (SnackbarStyle)
-import Widget.Style.Material as Material exposing (Palette)
+import Widget.Material as Material exposing (Palette)
 
 
 style : Palette -> Style msg

example/src/Data/Theme.elm

@@ -1,7 +1,7 @@
 module Data.Theme exposing (Theme(..), toStyle)
 
 import Data.Style as Style exposing (Style)
-import Widget.Style.Material exposing (Palette)
+import Widget.Material as Material exposing (Palette)
 
 
 type Theme
@@ -13,7 +13,7 @@ toStyle : Theme -> Style msg
 toStyle theme =
     case theme of
         Material ->
-            Style.style Widget.Style.Material.defaultPalette
+            Style.style Material.defaultPalette
 
         DarkMaterial ->
-            Style.style Widget.Style.Material.darkPalette
+            Style.style Material.darkPalette

example/src/Example/Button.elm

@@ -8,10 +8,10 @@ import Material.Icons as MaterialIcons
 import Material.Icons.Types exposing (Coloring(..))
 import Widget exposing (ButtonStyle, ColumnStyle, RowStyle)
 import Widget.Icon as Icon
-import Widget.Style.Customize as Customize
+import Widget.Customize as Customize
-import Widget.Style.Material as Material
+import Widget.Material as Material
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
-import Widget.Style.Material.Typography as Typography
+import Widget.Material.Typography as Typography
 
 
 type alias Style style msg =

example/src/Example/Dialog.elm

@@ -5,7 +5,7 @@ import Element exposing (Element)
 import FeatherIcons
 import Widget exposing (ButtonStyle, DialogStyle)
 import Widget.Icon as Icon
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/Icon.elm

@@ -15,7 +15,7 @@ import Material.Icons.Types exposing (Coloring(..))
 import Octicons
 import Widget exposing (ButtonStyle, RowStyle)
 import Widget.Icon exposing (Icon)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 import Zondicons
 
 

example/src/Example/List.elm

@@ -6,8 +6,8 @@ import Element.Font as Font
 import FeatherIcons
 import Widget exposing (ColumnStyle, DividerStyle, ExpansionItemStyle, HeaderStyle, ImageItemStyle, ItemStyle, MultiLineItemStyle, SwitchStyle, TextItemStyle)
 import Widget.Icon as Icon
-import Widget.Style.Material as Material
+import Widget.Material as Material
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
 
 
 type alias Style style msg =

example/src/Example/Modal.elm

@@ -5,7 +5,7 @@ import Element exposing (Element)
 import FeatherIcons
 import Widget exposing (ButtonStyle, ColumnStyle)
 import Widget.Icon as Icon
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/MultiSelect.elm

@@ -4,7 +4,7 @@ import Browser
 import Element exposing (Element)
 import Set exposing (Set)
 import Widget exposing (ButtonStyle, RowStyle)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/ProgressIndicator.elm

@@ -3,7 +3,7 @@ module Example.ProgressIndicator exposing (Model, Msg, init, subscriptions, upda
 import Browser
 import Element exposing (Element)
 import Widget exposing (ProgressIndicatorStyle)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/Select.elm

@@ -3,7 +3,7 @@ module Example.Select exposing (Model, Msg, init, subscriptions, update, view)
 import Browser
 import Element exposing (Element)
 import Widget exposing (ButtonStyle, RowStyle)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/Snackbar.elm

@@ -6,7 +6,7 @@ import FeatherIcons
 import Time
 import Widget exposing (ButtonStyle, ColumnStyle, RowStyle, SnackbarStyle)
 import Widget.Snackbar as Snackbar exposing (Snackbar)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/SortTable.elm

@@ -3,7 +3,7 @@ module Example.SortTable exposing (Model, Msg, init, subscriptions, update, view
 import Browser
 import Element exposing (Element)
 import Widget exposing (SortTableStyle)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/Switch.elm

@@ -4,7 +4,7 @@ import Browser
 import Element exposing (Element)
 import FeatherIcons
 import Widget exposing (RowStyle, SwitchStyle)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/Tab.elm

@@ -3,7 +3,7 @@ module Example.Tab exposing (Model, Msg, init, subscriptions, update, view)
 import Browser
 import Element exposing (Element)
 import Widget exposing (TabStyle)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

example/src/Example/TextInput.elm

@@ -4,7 +4,7 @@ import Browser
 import Element exposing (Element)
 import Set exposing (Set)
 import Widget exposing (ColumnStyle, TextInputStyle)
-import Widget.Style.Material as Material
+import Widget.Material as Material
 
 
 type alias Style style msg =

src/Internal/Item.elm

@@ -2,8 +2,8 @@ module Internal.Item exposing (DividerStyle, ExpansionItem, ExpansionItemStyle,
 
 import Element exposing (Attribute, Element)
 import Element.Input as Input
-import Widget.Icon as Icon exposing (Icon, IconStyle)
+import Widget.Customize exposing (content)
-import Widget.Style.Customize exposing (content)
+import Widget.Icon exposing (Icon, IconStyle)
 
 
 type alias ItemStyle content msg =

src/Internal/List.elm

@@ -4,7 +4,7 @@ import Element exposing (Attribute, Element)
 import Internal.Button exposing (Button, ButtonStyle)
 import Internal.Item as Item exposing (Item)
 import Internal.Select as Select
-import Widget.Style.Customize as Customize
+import Widget.Customize as Customize
 
 
 {-| -}

src/Internal/Material/Button.elm

@@ -7,8 +7,8 @@ import Element.Font as Font
 import Html.Attributes as Attributes
 import Internal.Button exposing (ButtonStyle)
 import Internal.Material.Palette exposing (Palette)
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
-import Widget.Style.Material.Typography as Typography
+import Widget.Material.Typography as Typography
 
 
 baseButton : Palette -> ButtonStyle msg

src/Internal/Material/Chip.elm

@@ -7,7 +7,7 @@ import Element.Font as Font
 import Internal.Button exposing (ButtonStyle)
 import Internal.Material.Button as Button
 import Internal.Material.Palette exposing (Palette)
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
 
 
 chip : Palette -> ButtonStyle msg

src/Internal/Material/Dialog.elm

@@ -6,8 +6,8 @@ import Element.Border as Border
 import Internal.Dialog exposing (DialogStyle)
 import Internal.Material.Button as Button
 import Internal.Material.Palette exposing (Palette)
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
-import Widget.Style.Material.Typography as Typography
+import Widget.Material.Typography as Typography
 
 
 alertDialog : Palette -> DialogStyle msg

src/Internal/Material/Item.elm

@@ -19,11 +19,8 @@ import Html.Attributes as Attributes
 import Internal.Item exposing (DividerStyle, ExpansionItemStyle, HeaderStyle, ImageItemStyle, ItemStyle, MultiLineItemStyle, TextItemStyle)
 import Internal.Material.Icon as Icon
 import Internal.Material.Palette exposing (Palette)
-import Svg
+import Widget.Material.Color as MaterialColor
-import Svg.Attributes
+import Widget.Material.Typography as Typography
-import Widget.Icon exposing (Icon)
-import Widget.Style.Material.Color as MaterialColor
-import Widget.Style.Material.Typography as Typography
 
 
 fullBleedDivider : Palette -> ItemStyle (DividerStyle msg) msg

src/Internal/Material/Layout.elm

@@ -1,6 +1,5 @@
 module Internal.Material.Layout exposing (drawerButton, layout, menu, menuTabButton, more_vert, search)
 
-import Color
 import Element
 import Element.Background as Background
 import Element.Border as Border
@@ -13,11 +12,11 @@ import Internal.Material.Snackbar as Snackbar
 import Internal.Material.TextInput as TextInput
 import Svg
 import Svg.Attributes
+import Widget.Customize as Customize
 import Widget.Icon as Icon exposing (Icon)
 import Widget.Layout exposing (LayoutStyle)
-import Widget.Style.Customize as Customize
+import Widget.Material.Color as MaterialColor
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Typography as Typography
-import Widget.Style.Material.Typography as Typography
 
 
 more_vert : Icon msg

src/Internal/Material/List.elm

@@ -11,7 +11,7 @@ import Element.Border as Border
 import Element.Font as Font
 import Internal.List exposing (ColumnStyle, RowStyle)
 import Internal.Material.Palette exposing (Palette)
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
 
 
 row : RowStyle msg

src/Internal/Material/Snackbar.elm

@@ -6,9 +6,9 @@ import Element.Border as Border
 import Element.Font as Font
 import Internal.Material.Button as Button
 import Internal.Material.Palette exposing (Palette)
+import Widget.Customize as Customize
+import Widget.Material.Color as MaterialColor
 import Widget.Snackbar exposing (SnackbarStyle)
-import Widget.Style.Customize as Customize
-import Widget.Style.Material.Color as MaterialColor
 
 
 snackbar : Palette -> SnackbarStyle msg

src/Internal/Material/Switch.elm

@@ -7,7 +7,7 @@ import Element.Border as Border
 import Html.Attributes as Attributes
 import Internal.Material.Palette exposing (Palette)
 import Internal.Switch exposing (SwitchStyle)
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
 
 
 switch : Palette -> SwitchStyle msg

src/Internal/Material/Tab.elm

@@ -8,8 +8,8 @@ import Internal.Button exposing (ButtonStyle)
 import Internal.Material.Button as Button
 import Internal.Material.Palette exposing (Palette)
 import Internal.Tab exposing (TabStyle)
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
-import Widget.Style.Material.Typography as Typography
+import Widget.Material.Typography as Typography
 
 
 tabButton : Palette -> ButtonStyle msg

src/Internal/Material/TextInput.elm

@@ -5,8 +5,8 @@ import Element.Border as Border
 import Internal.Material.Chip as Chip
 import Internal.Material.Palette exposing (Palette)
 import Internal.TextInput exposing (TextInputStyle)
-import Widget.Style.Customize as Customize
+import Widget.Customize as Customize
-import Widget.Style.Material.Color as MaterialColor
+import Widget.Material.Color as MaterialColor
 
 
 textInput : Palette -> TextInputStyle msg

src/Internal/SortTable.elm

@@ -10,9 +10,7 @@ module Internal.SortTable exposing
     , unsortableColumn
     )
 
-import Color exposing (Color)
 import Element exposing (Attribute, Element, Length)
-import Html exposing (Html)
 import Internal.Button as Button exposing (ButtonStyle)
 import Widget.Icon exposing (Icon)
 

src/Internal/Switch.elm

@@ -1,11 +1,8 @@
 module Internal.Switch exposing (Switch, SwitchStyle, switch)
 
-import Color exposing (Color)
 import Element exposing (Attribute, Element)
 import Element.Input as Input
 import Element.Region as Region
-import Html exposing (Html)
-import Widget.Icon exposing (Icon)
 
 
 {-| -}

src/Internal/Tab.elm

@@ -1,11 +1,8 @@
 module Internal.Tab exposing (Tab, TabStyle, tab)
 
-import Color exposing (Color)
 import Element exposing (Attribute, Element)
-import Html exposing (Html)
 import Internal.Button exposing (ButtonStyle)
 import Internal.Select as Select exposing (Select)
-import Widget.Icon exposing (Icon)
 
 
 {-| -}

src/Widget/Customize.elm

@@ -1,4 +1,4 @@
-module Widget.Style.Customize exposing
+module Widget.Customize exposing
     ( element, mapElement
     , elementButton, mapElementButton
     , elementColumn, mapElementColumn

src/Widget/Layout.elm

@@ -34,9 +34,9 @@ import Internal.Button as Button exposing (Button, ButtonStyle)
 import Internal.Dialog as Dialog
 import Internal.Select as Select exposing (Select)
 import Internal.TextInput as TextInput exposing (TextInput, TextInputStyle)
+import Widget.Customize as Customize
 import Widget.Icon exposing (Icon)
 import Widget.Snackbar as Snackbar exposing (Message, SnackbarStyle)
-import Widget.Style.Customize as Customize
 
 
 {-| -}

src/Widget/Material.elm

@@ -1,4 +1,4 @@
-module Widget.Style.Material exposing
+module Widget.Material exposing
     ( Palette, defaultPalette, darkPalette
     , containedButton, outlinedButton, textButton
     , iconButton, toggleButton, buttonRow

src/Widget/Material/Color.elm

@@ -1,4 +1,4 @@
-module Widget.Style.Material.Color exposing
+module Widget.Material.Color exposing
     ( buttonHoverOpacity, buttonFocusOpacity, buttonPressedOpacity, buttonDisabledOpacity, buttonSelectedOpacity
     , accessibleTextColor, accessibleWithTextColor
     , withShade, scaleOpacity

src/Widget/Material/Typography.elm

@@ -1,4 +1,4 @@
-module Widget.Style.Material.Typography exposing
+module Widget.Material.Typography exposing
     ( h1, h2, h3, h4, h5, h6
     , subtitle1, subtitle2
     , body1, body2

tests/Accessibility.elm

@@ -9,7 +9,7 @@ import Element.Border
 import Element.Font
 import Element.Input
 import Widget exposing (ButtonStyle, ColumnStyle, RowStyle)
-import Widget.Style.Material as Material exposing (Palette)
+import Widget.Material as Material exposing (Palette)
 
 
 type alias Style style msg =