Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Restyle Button to the Figma spec and migrate call sites (#82236)

Egor Grushinfa20179ff645
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_All_Options.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_All_Options.png
index 54723172a35..7995a3dd51c 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_All_Options.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_All_Options.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Range.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Range.png
index ddd2cea9122..07e1fdbbb5a 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Range.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Range.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Relative.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Relative.png
index f8137a3d9cd..ce6f33a6271 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Relative.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Relative.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Single.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Single.png
index f0171440157..aab403b9c1b 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Single.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Date_Filter_Single.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Number.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Number.png
index bebe8f86f61..7d12d35ab3d 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Number.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Number.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List.png
index 71aac94d09a..4ef493eef04 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_Single_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_Single_With_Value.png
index af5374101c6..ed2b9be898d 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_Single_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_Single_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_With_Value.png
index 0bd03a11625..9eab2da442c 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_List_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_Search.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_Search.png
index 71aac94d09a..4ef493eef04 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_Search.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_Search.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_Search_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_Search_With_Value.png
index 70455cff16b..49a35b01164 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_Search_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Parameter_Search_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Text.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Text.png
index 13b2d84764f..2854e744735 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Text.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Text.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Text_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Text_With_Value.png
index 13b2d84764f..2854e744735 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Text_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Dark_Theme_Text_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_All_Options.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_All_Options.png
index 05512e4900b..3abd46ea74b 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_All_Options.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_All_Options.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Range.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Range.png
index 9b7e2836b07..6f3c6fa4c8e 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Range.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Range.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Relative.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Relative.png
index e77a4275fdd..a2716a3f19e 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Relative.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Relative.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Single.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Single.png
index f0890c09666..abf3ca2ff03 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Single.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Date_Filter_Single.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Number.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Number.png
index 91248ca3030..ba73e578e59 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Number.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Number.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List.png
index 5e0d8704052..f2e98a940f5 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_Single_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_Single_With_Value.png
index d2fd2cff7a6..ad5bb5b3875 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_Single_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_Single_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_With_Value.png
index 6515f6aa391..7e92f79a903 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_List_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_Search.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_Search.png
index 40668d8af26..f2e98a940f5 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_Search.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_Search.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_Search_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_Search_With_Value.png
index 84a70b774c3..69f292c87f3 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_Search_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Parameter_Search_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Text.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Text.png
index fa7785490df..f28c6515854 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Text.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Text.png differ
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Text_With_Value.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Text_With_Value.png
index fa7785490df..01c9b6809e2 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Text_With_Value.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_filters_Light_Theme_Text_With_Value.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_Button_Compact.png b/.loki/reference/chrome_laptop_Components_Buttons_Button_Compact.png
new file mode 100644
index 00000000000..f635568d12a
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_Button_Compact.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_Button_Compact_size_custom_color.png b/.loki/reference/chrome_laptop_Components_Buttons_Button_Compact_size_custom_color.png
deleted file mode 100644
index 2edf04f1786..00000000000
Binary files a/.loki/reference/chrome_laptop_Components_Buttons_Button_Compact_size_custom_color.png and /dev/null differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_Button_Sections.png b/.loki/reference/chrome_laptop_Components_Buttons_Button_Sections.png
new file mode 100644
index 00000000000..d70b9892bdb
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_Button_Sections.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Default.png b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Default.png
new file mode 100644
index 00000000000..5236e092bfd
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Default.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Filled.png b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Filled.png
new file mode 100644
index 00000000000..9fa47832311
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Filled.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Light.png b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Light.png
new file mode 100644
index 00000000000..f4ffccac0f8
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Light.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_On_Dark.png b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_On_Dark.png
new file mode 100644
index 00000000000..3891df7b87d
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_On_Dark.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Subtle.png b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Subtle.png
new file mode 100644
index 00000000000..09ff9288806
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_Button_Variant_Subtle.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Navigation_Tabs_Overview_Overview.png b/.loki/reference/chrome_laptop_Components_Navigation_Tabs_Overview_Overview.png
index f690b62d59f..473e949cf97 100644
Binary files a/.loki/reference/chrome_laptop_Components_Navigation_Tabs_Overview_Overview.png and b/.loki/reference/chrome_laptop_Components_Navigation_Tabs_Overview_Overview.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Overlays_HoverCard_Opened.png b/.loki/reference/chrome_laptop_Components_Overlays_HoverCard_Opened.png
index 33347f335a6..08aac880d3f 100644
Binary files a/.loki/reference/chrome_laptop_Components_Overlays_HoverCard_Opened.png and b/.loki/reference/chrome_laptop_Components_Overlays_HoverCard_Opened.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Overlays_Menu_Hover_state.png b/.loki/reference/chrome_laptop_Components_Overlays_Menu_Hover_state.png
index 75e7f935d58..686dc10ff96 100644
Binary files a/.loki/reference/chrome_laptop_Components_Overlays_Menu_Hover_state.png and b/.loki/reference/chrome_laptop_Components_Overlays_Menu_Hover_state.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Overlays_Modal_Opened.png b/.loki/reference/chrome_laptop_Components_Overlays_Modal_Opened.png
index 87a0332f3ab..5762b35d473 100644
Binary files a/.loki/reference/chrome_laptop_Components_Overlays_Modal_Opened.png and b/.loki/reference/chrome_laptop_Components_Overlays_Modal_Opened.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Overlays_Popover_Opened.png b/.loki/reference/chrome_laptop_Components_Overlays_Popover_Opened.png
index bb07c39ffed..abc0682e506 100644
Binary files a/.loki/reference/chrome_laptop_Components_Overlays_Popover_Opened.png and b/.loki/reference/chrome_laptop_Components_Overlays_Popover_Opened.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Overlays_Popover_Overview.png b/.loki/reference/chrome_laptop_Components_Overlays_Popover_Overview.png
index e7118193e35..d7c72071e8a 100644
Binary files a/.loki/reference/chrome_laptop_Components_Overlays_Popover_Overview.png and b/.loki/reference/chrome_laptop_Components_Overlays_Popover_Overview.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Overlays_Tooltip_Long_Content_With_Fixed_Width.png b/.loki/reference/chrome_laptop_Components_Overlays_Tooltip_Long_Content_With_Fixed_Width.png
index f94abba2c10..a200ed7bc55 100644
Binary files a/.loki/reference/chrome_laptop_Components_Overlays_Tooltip_Long_Content_With_Fixed_Width.png and b/.loki/reference/chrome_laptop_Components_Overlays_Tooltip_Long_Content_With_Fixed_Width.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Overlays_Tooltip_Overview.png b/.loki/reference/chrome_laptop_Components_Overlays_Tooltip_Overview.png
index b0e07f84bb2..49a775efb03 100644
Binary files a/.loki/reference/chrome_laptop_Components_Overlays_Tooltip_Overview.png and b/.loki/reference/chrome_laptop_Components_Overlays_Tooltip_Overview.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_All_Options.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_All_Options.png
index 6e2ddb3fbe7..39a6919605a 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_All_Options.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_All_Options.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_All_Options_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_All_Options_Dark_Theme.png
index 33c55d48eb1..b7c73b2376d 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_All_Options_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_All_Options_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude.png
index 763541b08c4..ba336b04cbc 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Dark_Theme.png
index 5932e717fc3..576adc69342 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Day_Of_Week.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Day_Of_Week.png
index 74da8d87874..3424449e9b6 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Day_Of_Week.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Day_Of_Week.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Day_Of_Week_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Day_Of_Week_Dark_Theme.png
index 6ca331d7d41..1bc366d4cdc 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Day_Of_Week_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Exclude_Day_Of_Week_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Current.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Current.png
index dbab96c312f..05db16442b2 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Current.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Current.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Current_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Current_Dark_Theme.png
index 499b8a4f479..4235355012b 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Current_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Current_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next.png
index e94031c7d74..9d7b586d357 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next_Dark_Theme.png
index 4b83b7a4fa5..e72e0689bd6 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous.png
index 05028fed991..54fe1d2b220 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous_Dark_Theme.png
index 9588f5f5195..573f4312555 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Specific_Between.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Specific_Between.png
index f27d87adf06..2747aa68d8a 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Specific_Between.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Specific_Between.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Specific_Between_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Specific_Between_Dark_Theme.png
index 95c8a26f821..a1b08b5b11b 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Specific_Between_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Specific_Between_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_DataGrid_DataGrid_Combined_Features.png b/.loki/reference/chrome_laptop_DataGrid_DataGrid_Combined_Features.png
index 02acf9eedc3..910878f3029 100644
Binary files a/.loki/reference/chrome_laptop_DataGrid_DataGrid_Combined_Features.png and b/.loki/reference/chrome_laptop_DataGrid_DataGrid_Combined_Features.png differ
diff --git a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png
index c075d661f97..130f76b7295 100644
Binary files a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png and b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png differ
diff --git a/e2e/test-component/scenarios/embedding-sdk/mantine-styles-tests.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/mantine-styles-tests.cy.spec.tsx
index 17cbbf7a9d2..698ed09edbd 100644
--- a/e2e/test-component/scenarios/embedding-sdk/mantine-styles-tests.cy.spec.tsx
+++ b/e2e/test-component/scenarios/embedding-sdk/mantine-styles-tests.cy.spec.tsx
@@ -70,14 +70,14 @@ describe("scenarios > embedding-sdk > mantine styles leakage", () => {
getSdkRoot().within(() => {
cy.get("button")
.contains("Filter")
- .should("have.css", "color", "rgb(255, 0, 0)");
+ .should("have.css", "color", "color(srgb 0.72 0 0)");
cy.findByTestId("notebook-button").click();
cy.findByRole("button", { name: "Visualize" }).should(
"have.css",
"background-color",
- "rgb(255, 0, 0)",
+ "color(srgb 0.72 0 0)",
);
});
});
diff --git a/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts b/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts
index 35b30569284..f0e01264cae 100644
--- a/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts
+++ b/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts
@@ -131,11 +131,11 @@ describe("scenarios > admin > datamodel > segments", () => {
// Detail view
cy.get("main").findByText("Description").should("be.visible");
- cy.button("See this segment").should("be.visible");
+ cy.findByRole("link", { name: "See this segment" }).should("be.visible");
// Segment fields
cy.findByRole("link", { name: /Fields in this segment/ }).click();
- cy.button("See this segment").should("not.exist");
+ cy.findByRole("link", { name: "See this segment" }).should("not.exist");
cy.get("main")
.findByText(`Fields in ${SEGMENT_NAME}`)
.should("be.visible");
diff --git a/e2e/test/scenarios/documents/public-documents.cy.spec.ts b/e2e/test/scenarios/documents/public-documents.cy.spec.ts
index 61100ffa5fa..697b75fdd16 100644
--- a/e2e/test/scenarios/documents/public-documents.cy.spec.ts
+++ b/e2e/test/scenarios/documents/public-documents.cy.spec.ts
@@ -250,9 +250,8 @@ describe("scenarios > documents > public", () => {
cy.log("Verify the text wasn't updated");
H.documentContent().findByText(text).should("exist");
- cy.log("Verify that run/close buttons don't exist but a metabot icon does");
+ cy.log("Verify that run/close buttons don't exist");
H.documentContent().find("button").should("not.exist");
- H.documentContent().icon("metabot").should("exist");
});
it("should allow downloading results from embedded cards", () => {
diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
index e0cfb58b03f..86d77c5eb39 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
@@ -30,8 +30,6 @@ export const MetabotChatSuggestions = () => {
{suggestedPrompts.map(({ prompt }, index) => (
<Button
key={index}
- size="xs"
- variant="outline"
fw={400}
onClick={() => metabot.submitInput(prompt, { focusInput: true })}
className={S.promptSuggestionButton}
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx
index 30227ac5915..6158815b524 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx
@@ -107,8 +107,8 @@ export function MetabotIconField() {
className={cx(CS.bgLight, CS.bordered, CS.rounded)}
align="center"
justify="center"
- w="2.25rem"
- h="2.25rem"
+ w="2rem"
+ h="2rem"
flex="0 0 auto"
>
{iconPreviewSrc ? (
@@ -132,11 +132,7 @@ export function MetabotIconField() {
multiple={false}
onChange={handleIconUpload}
/>
- <Button
- size="sm"
- onClick={() => fileInputRef.current?.click()}
- flex="0 0 auto"
- >
+ <Button onClick={() => fileInputRef.current?.click()} flex="0 0 auto">
{t`Upload a custom icon`}
</Button>
{(iconFileName || !isDefaultIcon) && (
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AdvancedGroupMode/AdvancedGroupModeButton.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AdvancedGroupMode/AdvancedGroupModeButton.tsx
index 15ab3188d7c..b2506506ea7 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AdvancedGroupMode/AdvancedGroupModeButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AdvancedGroupMode/AdvancedGroupModeButton.tsx
@@ -12,13 +12,7 @@ export function AdvancedGroupModeButton() {
return (
<>
- <Button
- className={S.button}
- onClick={toggleShowEnableModal}
- variant="default"
- size="compact-sm"
- fz="sm"
- >
+ <Button className={S.button} onClick={toggleShowEnableModal} size="sm">
{t`Switch to group-level permissions`}
</Button>
{showEnableModal && (
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AdvancedGroupMode/EnableAdvancedModal.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AdvancedGroupMode/EnableAdvancedModal.tsx
index 759835c6e13..7ead37449c3 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AdvancedGroupMode/EnableAdvancedModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AdvancedGroupMode/EnableAdvancedModal.tsx
@@ -30,7 +30,7 @@ export function EnableAdvancedModal({ onClose }: Props) {
message={t`This will remove all AI feature access from the "All Users" group, so users won't have access to AI features unless they're added to a group that has access.`}
confirmButtonText={t`Switch`}
confirmButtonProps={{
- color: "core-brand",
+ color: "brand",
variant: "filled",
loading,
}}
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/GroupCategoryTabs.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/GroupCategoryTabs.tsx
index 14bd001ad19..9c6b8468173 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/GroupCategoryTabs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/GroupCategoryTabs.tsx
@@ -35,7 +35,6 @@ export const GroupCategoryTabs = (props: GroupCategoryTabsProps) => {
key={tabItem.tab}
onClick={() => setActiveTab(tabItem.tab)}
radius="xl"
- size="xs"
>
{tabItem.label}
</Button>
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/JWTGroupMappingSection/MappingEditorRow.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/JWTGroupMappingSection/MappingEditorRow.tsx
index 76253fbe391..66277415d48 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/JWTGroupMappingSection/MappingEditorRow.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/JWTGroupMappingSection/MappingEditorRow.tsx
@@ -111,7 +111,11 @@ export function MappingEditorRow({
onKeyDown={handleGroupsKeyDown}
searchable
/>
- <Button variant="subtle" onClick={onCancel}>{t`Cancel`}</Button>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={onCancel}
+ >{t`Cancel`}</Button>
<Button
variant="filled"
disabled={!canSubmit}
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
index 18e3556aa54..955d9fe7842 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
@@ -506,12 +506,12 @@ export function SettingsOIDCForm() {
{isExisting && (
<>
<Flex gap="lg" wrap="wrap">
- <Button variant="outline" onClick={handleToggleEnabled}>
+ <Button onClick={handleToggleEnabled}>
{isEnabled ? t`Disable` : t`Enable`}
</Button>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={deleteModal.open}
>
{t`Delete configuration`}
@@ -528,7 +528,6 @@ export function SettingsOIDCForm() {
)}
<Flex gap="lg" wrap="wrap" ml={isExisting ? undefined : "auto"}>
<Button
- variant="outline"
loading={isChecking}
disabled={!values["issuer-uri"] || !values["client-id"]}
onClick={() => handleCheckConnection(values)}
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/InvalidateNowButton.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/InvalidateNowButton.tsx
index 4768832c8fc..c94e8d77f22 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/InvalidateNowButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/InvalidateNowButton.tsx
@@ -76,9 +76,8 @@ const InvalidateNowFormBody = ({
return false;
}}
disabled={wasFormRecentlyPending}
- variant="subtle"
- c="feedback-negative"
- px="sm"
+ variant="light"
+ color="negative"
leftSection={<Icon name="trash" />}
label={buttonText}
activeLabel={
@@ -94,11 +93,7 @@ const InvalidateNowFormBody = ({
<Text>{t`Cache cleared`}</Text>
</Group>
}
- failedLabel={
- <Text fw="bold" lh="1">
- {t`Error`}
- </Text>
- }
+ failedLabel={<Text lh="1">{t`Error`}</Text>}
/>
{confirmationModal}
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx b/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
index 82d7b7c86c6..937a4900783 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
@@ -161,7 +161,6 @@ export const ContentTranslationConfiguration = () => {
)
}
miw="calc(50% - 0.5rem)"
- fw="normal"
style={{ flexGrow: 1 }}
disabled={isDownloadInProgress}
>
@@ -337,15 +336,11 @@ const UploadForm = ({
{confirmationModal}
<FormSubmitButton
flex="1 1 0"
- w="auto"
disabled={status === "pending"}
label={
<Group gap="sm">
<Icon name="upload" c="core-brand" />
- <Text
- c="inherit"
- fw="normal"
- >{t`Upload edited translation dictionary`}</Text>
+ <Text c="inherit">{t`Upload edited translation dictionary`}</Text>
</Group>
}
successLabel={
diff --git a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsx b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsx
index a2c06ceb072..0ee4d1c63e3 100644
--- a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsx
@@ -196,9 +196,7 @@ export function CustomVizPage({ params }: Props) {
<BundleDropzone />
<FormErrorMessage />
<Group gap="sm" justify="flex-end">
- <Button variant="default" onClick={handleCancel}>
- {t`Cancel`}
- </Button>
+ <Button onClick={handleCancel}>{t`Cancel`}</Button>
<FormSubmitButton
label={isEdit ? t`Replace` : t`Add visualization`}
disabled={!dirty}
diff --git a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/EditDevCustomVizForm.tsx b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/EditDevCustomVizForm.tsx
index f4bfb051d4a..dd77b4e6782 100644
--- a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/EditDevCustomVizForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/EditDevCustomVizForm.tsx
@@ -100,7 +100,7 @@ export function EditDevCustomVizForm({ plugin }: Props) {
<Group justify="flex-end">
<Button
variant="subtle"
- color="feedback-negative"
+ color="negative"
onClick={handleRemove}
>
{t`Disable`}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx
index 4fd5bc9c2f5..357ddf76f75 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx
@@ -134,7 +134,7 @@ export const CreateMenu = ({
<>
<Menu position="bottom-end">
<Menu.Target>
- <Button leftSection={<Icon name="add" />}>{t`New`}</Button>
+ <Button size="lg" leftSection={<Icon name="add" />}>{t`New`}</Button>
</Menu.Target>
<Menu.Dropdown>{menuItems}</Menu.Dropdown>
</Menu>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
index 6d7368e67d0..4f6b4ddc9cb 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
@@ -118,7 +118,11 @@ function ModalBody({ explanatorySentence, onCreate, onClose }: ModalBodyProps) {
<Box flex={1}>
<FormErrorMessage />
</Box>
- <Button variant="subtle" onClick={onClose}>{t`Cancel`}</Button>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={onClose}
+ >{t`Cancel`}</Button>
<FormSubmitButton label={t`Create my Library`} variant="filled" />
</Group>
</Form>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
index d2f109617fd..88a5b0c8914 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
@@ -190,7 +190,11 @@ function ModalBody({
<Box flex={1}>
<FormErrorMessage />
</Box>
- <Button variant="subtle" onClick={onClose}>{t`Cancel`}</Button>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={onClose}
+ >{t`Cancel`}</Button>
<FormSubmitButton
label={getSubmitButtonLabel(
selected_table,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
index e80e25d8a03..2e95e80d99f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
@@ -139,12 +139,12 @@ function ModalBody({
)}
</Stack>
<Group mt="xxl" gap="sm" wrap="nowrap" justify="flex-end">
- <Button variant="subtle" onClick={onClose}>{t`Cancel`}</Button>
<Button
- onClick={handleSubmit}
- variant="filled"
- color="feedback-negative"
- >
+ variant="subtle"
+ color="neutral"
+ onClick={onClose}
+ >{t`Cancel`}</Button>
+ <Button onClick={handleSubmit} variant="filled" color="negative">
{getSubmitButtonLabel(selected_table, published_downstream_tables)}
</Button>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
index 75ff64c6d4f..c578ae63294 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
@@ -60,7 +60,7 @@ export function ArchiveSnippetModal(props: ArchiveSnippetModalProps) {
<Group gap="sm" justify="flex-end">
<Button onClick={onClose}>{t`Cancel`}</Button>
<Button
- color="feedback-negative"
+ color="negative"
loading={isLoading}
onClick={handleArchive}
variant="filled"
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
index 596077001d1..eff9cef81c9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
@@ -109,14 +109,15 @@ export function TableFieldsPage() {
bg="background_page-secondary"
>
<Text fw="bold">{t`Field Details`}</Text>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
+ variant="subtle"
+ color="neutral"
+ size="sm"
component={ForwardRefLink}
to={Urls.dataStudioTableFields(table.id)}
onClick={closePreview}
- leftSection={<Icon name="close" c="text-secondary" />}
- variant="subtle"
- size="compact-sm"
- p="sm"
+ leftSection={<Icon name="close" />}
/>
</Group>
<FieldSection
diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.tsx
index 158105c9096..b060a7a0334 100644
--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.tsx
@@ -270,7 +270,7 @@ const AddUsersRow = ({
<Button
variant="subtle"
- bg="transparent"
+ color="neutral"
onClick={onCancel}
mr="sm"
disabled={isSubmitting}
@@ -279,7 +279,7 @@ const AddUsersRow = ({
</Button>
<Button
- variant={isValid ? "filled" : "outline"}
+ variant={isValid ? "filled" : "default"}
disabled={!isValid || isSubmitting}
loading={isSubmitting}
onClick={onDone}
diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppRepoSection/DataAppRepoSection.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppRepoSection/DataAppRepoSection.tsx
index 9c21755ddd5..9a4c1928b61 100644
--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppRepoSection/DataAppRepoSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppRepoSection/DataAppRepoSection.tsx
@@ -43,7 +43,7 @@ export const DataAppRepoSection = ({ isConfigured, url }: Props) => (
</Text>
</Group>
- <Button component={Link} to={REMOTE_SYNC_SETTINGS_PATH} variant="default">
+ <Button component={Link} to={REMOTE_SYNC_SETTINGS_PATH} size="lg">
{t`Go to Git sync settings`}
</Button>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx
index 1cf378ee07e..11eabf25a35 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx
@@ -25,9 +25,7 @@ export const DatabaseReplicationError = ({
{showMetabaseLinks && (
<Button
component={ExternalLink}
- variant="outline"
rightSection={<Icon name="external" />}
- size="md"
role="link"
href="https://www.metabase.com/docs/latest/"
>
@@ -35,7 +33,7 @@ export const DatabaseReplicationError = ({
</Button>
)}
- <Button variant="filled" size="md" onClick={onClose}>
+ <Button variant="filled" onClick={onClose}>
{t`Close`}
</Button>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSuccess.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSuccess.tsx
index 1ef696c6e60..4c0395fe3e9 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSuccess.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSuccess.tsx
@@ -21,7 +21,7 @@ export const DatabaseReplicationSuccess = ({
</Text>
</Box>
- <Button onClick={onClose} size="md" variant="filled" miw="30%">
+ <Button onClick={onClose} variant="filled" miw="30%">
{t`Done`}
</Button>
</Stack>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx
index 4a1dd970833..2e528797047 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx
@@ -54,6 +54,7 @@ export function FilterOptionsPicker({
</ActionIcon>
) : (
<Button
+ size="lg"
leftSection={<FixedSizeIcon name="filter" aria-hidden />}
disabled={isDisabled}
data-testid="dependency-filter-button"
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx
index abd4288ca23..ce46bad2863 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx
@@ -24,6 +24,7 @@ import {
getStorageNotProvisionedSubtitle,
} from "metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates";
import { useSelector } from "metabase/redux";
+import type { ButtonProps } from "metabase/ui";
import {
Alert,
Anchor,
@@ -95,19 +96,14 @@ const ConnectionDetails = ({
<Stack gap="sm" mt="sm">
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
loading={isDeleteInProgress}
onClick={onDelete}
w={INNER_WIDTH}
>
{disconnectButtonText}
</Button>
- <Button
- variant="outline"
- onClick={onClose}
- disabled={isDeleteInProgress}
- w={INNER_WIDTH}
- >
+ <Button onClick={onClose} disabled={isDeleteInProgress} w={INNER_WIDTH}>
{connectButtonText}
</Button>
</Stack>
@@ -293,7 +289,7 @@ const ConnectionDetailsButton = ({
}: {
label: string;
onClick: () => void;
- variant?: string;
+ variant?: ButtonProps["variant"];
w?: string | number;
}) => (
<Button
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
index 44337666f92..41026515d95 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
@@ -245,16 +245,12 @@ function GoogleSheetsDisconnectModal({
{errorMessage}
</Text>
<Flex justify="flex-end" gap="lg">
- <Button
- variant="outline"
- onClick={onClose}
- disabled={isDeletingFolderLink}
- >
+ <Button onClick={onClose} disabled={isDeletingFolderLink}>
{connectButtonText}
</Button>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
loading={isDeletingFolderLink}
onClick={onDelete}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSettingUpModal.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSettingUpModal.tsx
index 6c2e34b14fd..c55158c3782 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSettingUpModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSettingUpModal.tsx
@@ -91,7 +91,7 @@ export function MetabotSettingUpModal({
</Text>
</Box>
- <Button variant="filled" size="md" onClick={onClose}>
+ <Button variant="filled" onClick={onClose}>
{t`Done`}
</Button>
</>
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
index c6446ed3516..efda17be2a4 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
@@ -459,7 +459,6 @@ export function DataComplexityHeader() {
<Flex gap="sm" wrap="wrap" align="center">
<Button
- variant="default"
onClick={handleRecompute}
loading={refreshDataComplexityScoresLoading}
disabled={refreshDataComplexityScoresLoading}
diff --git a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AccountSecurityPanel/DisableModal/DisableModal.tsx b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AccountSecurityPanel/DisableModal/DisableModal.tsx
index c344bb69cce..0ec708b833f 100644
--- a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AccountSecurityPanel/DisableModal/DisableModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AccountSecurityPanel/DisableModal/DisableModal.tsx
@@ -44,7 +44,7 @@ function DisableForm({ onSuccess, onCancel }: DisableFormProps) {
<ConfirmCodeForm
message={t`Are you sure you want to disable two-factor authentication? Your account will be protected by your password only, and your recovery codes will stop working.`}
submitLabel={t`Disable`}
- submitColor="error"
+ submitColor="negative"
onSubmit={handleSubmit}
onCancel={onCancel}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/RemoveMfaModal.tsx b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/RemoveMfaModal.tsx
index e879a8cd0b1..375cf8c68c9 100644
--- a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/RemoveMfaModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/RemoveMfaModal.tsx
@@ -36,7 +36,7 @@ export const RemoveMfaModal = ({ user, onClose }: RemoveMfaModalProps) => {
title={t`Remove two-factor authentication for ${user.common_name}?`}
message={t`They'll lose their authenticator setup and all of their recovery codes, and will need to set two-factor authentication up again. We'll email them to let them know.`}
confirmButtonText={t`Remove`}
- confirmButtonProps={{ color: "danger" }}
+ confirmButtonProps={{ color: "negative" }}
errorMessage={errorMessage}
onClose={onClose}
onConfirm={handleConfirm}
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
index 71f513ba85e..288c01104c6 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
@@ -251,9 +251,8 @@ export const GitSyncControls = () => {
>
<Combobox.Target>
<Button
- p="sm"
- size="compact-sm"
- bd="none"
+ variant="subtle"
+ color="neutral"
mr="xl"
disabled={isLoading}
onClick={() => combobox.toggleDropdown()}
@@ -321,7 +320,11 @@ export const GitSyncControls = () => {
>
<Text mt="lg">{branchMismatch.message}</Text>
<Group gap="sm" justify="end" mt="xxl">
- <Button variant="subtle" onClick={() => setBranchMismatch(null)}>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={() => setBranchMismatch(null)}
+ >
{t`Cancel`}
</Button>
<Button variant="filled" onClick={() => window.location.reload()}>
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/PushChangesModal/PushChangesModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/PushChangesModal/PushChangesModal.tsx
index 4d756c7aa75..3aa866886e7 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/PushChangesModal/PushChangesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/PushChangesModal/PushChangesModal.tsx
@@ -102,11 +102,11 @@ export const PushChangesModal = ({
<Box>
<Group gap="sm" justify="end">
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<Button
- color="core-brand"
+ color="brand"
disabled={isPushing}
leftSection={<Icon name="upload" />}
loading={isPushing}
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx
index 6ec86ac6a15..0f21d35b841 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx
@@ -141,7 +141,6 @@ export const BranchSwitcher = ({
>
<Combobox.Target>
<Button
- variant="default"
disabled={disabled || isLoading}
loading={isLoading}
onClick={() => combobox.toggleDropdown()}
@@ -206,7 +205,11 @@ export const BranchSwitcher = ({
>
<Text mt="lg">{branchMismatch}</Text>
<Group gap="sm" justify="end" mt="xxl">
- <Button variant="subtle" onClick={() => setBranchMismatch(null)}>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={() => setBranchMismatch(null)}
+ >
{t`Cancel`}
</Button>
<Button variant="filled" onClick={() => window.location.reload()}>
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/PullChangesButton.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/PullChangesButton.tsx
index c11f0718363..ef7f4da9813 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/PullChangesButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/PullChangesButton.tsx
@@ -51,7 +51,6 @@ export const PullChangesButton = (props: PullChangesButtonProps) => {
disabled={isImporting || dirty}
loading={isImporting}
onClick={handlePullChanges}
- variant="outline"
>
{t`Pull changes now`}
</Button>
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx
index 3b9ea8654a2..6b4943159a5 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx
@@ -118,10 +118,8 @@ export const RemoteSyncSettingsForm = ({
<Box>
{canDisable && (
<Button
- c="feedback-negative"
+ color="negative"
variant="subtle"
- size="md"
- w="12rem"
leftSection={<Icon name="close" />}
onClick={handleDisable}
>
@@ -133,17 +131,12 @@ export const RemoteSyncSettingsForm = ({
<Flex align="center" gap="lg">
<FormErrorMessage />
{onCancel && (
- <Button
- variant="default"
- onClick={onCancel}
- disabled={isSaving}
- >
+ <Button onClick={onCancel} disabled={isSaving}>
{t`Cancel`}
</Button>
)}
<FormSubmitButton
data-testid="remote-sync-submit-button"
- size="md"
label={
isRemoteSyncEnabled
? t`Save changes`
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/TestConnectionButton.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/TestConnectionButton.tsx
index c94797654ce..58af4a1a95c 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/TestConnectionButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/TestConnectionButton.tsx
@@ -46,7 +46,6 @@ export const TestConnectionButton = ({ values }: TestConnectionButtonProps) => {
disabled={isLoading || !values[URL_KEY]}
loading={isLoading}
onClick={handleTestConnection}
- variant="outline"
>
{t`Test connection`}
</Button>
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
index 65575c88d5a..2b9525e610a 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
@@ -241,13 +241,11 @@ export const SyncConflictModal = (props: UnsyncedWarningModalProps) => {
)}
<Group gap="sm" justify="end" mt="xl">
- <Button onClick={onClose} variant="subtle">
+ <Button onClick={onClose} variant="subtle" color="neutral">
{t`Cancel`}
</Button>
<Button
- color={
- optionValue === "discard" ? "feedback-negative" : "core-brand"
- }
+ color={optionValue === "discard" ? "negative" : "brand"}
disabled={isButtonDisabled}
leftSection={
optionValue === "force-push" ? <Icon name="warning" /> : undefined
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-disable-remote-sync.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-disable-remote-sync.ts
index bf7aa0adf47..9f8dc90f4e1 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-disable-remote-sync.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-disable-remote-sync.ts
@@ -22,7 +22,7 @@ export const useDisableRemoteSync = () => {
confirmButtonText: t`Disable`,
confirmButtonProps: {
variant: "filled",
- color: "feedback-negative",
+ color: "negative",
},
onConfirm: async () => {
try {
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-submit.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-submit.ts
index 04daae54779..74776769438 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-submit.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-submit.ts
@@ -154,7 +154,7 @@ export const useRemoteSyncSubmit = ({
confirmButtonText: t`Continue`,
confirmButtonProps: {
variant: "filled",
- color: "feedback-negative",
+ color: "negative",
},
onConfirm: async () => {
if (pendingConfirmationSettingsRef.current) {
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalSidebar/EntitySelect/EntitySelect.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalSidebar/EntitySelect/EntitySelect.tsx
index c6acbfee35c..decee3caa0b 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalSidebar/EntitySelect/EntitySelect.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalSidebar/EntitySelect/EntitySelect.tsx
@@ -65,8 +65,8 @@ export function EntitySelect({
<Input.Wrapper label={label} description={description}>
<Button
className={S.button}
+ size="lg"
rightSection={<Icon name="chevrondown" />}
- fw="normal"
maw="100%"
onClick={openPicker}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/SourceReplacementModal.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/SourceReplacementModal.tsx
index fc796733a23..cce96a0cfe5 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/SourceReplacementModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/SourceReplacementModal.tsx
@@ -117,7 +117,7 @@ function ModalContent({
title: getConfirmTitle(dependents.length),
message: t`This can't be undone.`,
confirmButtonText: getConfirmSubmitLabel(dependents.length),
- confirmButtonProps: { variant: "filled", color: "feedback-negative" },
+ confirmButtonProps: { variant: "filled", color: "negative" },
onConfirm: async () => {
trackReplaceDataSourceConfirmed({ triggeredFrom });
await replaceSource({
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx
index 0bb0f0c4abc..ae9ec76ecf5 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx
@@ -26,6 +26,7 @@ export function TransformToolsMenu() {
>
<Button
leftSection={<Icon name="gear" />}
+ size="lg"
disabled={isRemoteSyncReadOnly}
>
{t`Tools`}
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx
index 54be38e27d4..78e981744fd 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx
@@ -188,7 +188,11 @@ function ReplaceWithTransformForm({
<Box flex={1}>
<FormErrorMessage />
</Box>
- <Button variant="subtle" onClick={onClose}>{t`Cancel`}</Button>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={onClose}
+ >{t`Cancel`}</Button>
<FormSubmitButton
label={t`Convert to a transform`}
variant="filled"
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx
index 019ceb291b6..579fac420b9 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx
@@ -125,10 +125,16 @@ export const DataAttributeMappingEditor = ({
)}
/>
</td>
- <td className={CS.pb1} style={{ verticalAlign: "top" }}>
+ <td
+ className={cx(CS.pb1, CS.pl1)}
+ style={{ verticalAlign: "middle" }}
+ >
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
leftSection={<Icon name="close" />}
variant="subtle"
+ color="neutral"
+ size="sm"
onClick={() =>
handleChange(removeEntry<ValueType>(entries, index))
}
@@ -144,7 +150,8 @@ export const DataAttributeMappingEditor = ({
<td colSpan={2}>
<Button
leftSection={<Icon name="add" />}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
onClick={() => handleChange(addEntry<ValueType>(entries))}
>
{t`Add a filter`}
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx
index 86d42232c21..bd68541429e 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx
@@ -148,7 +148,7 @@ export const LoginAttributeMappingEditor = ({
autoFocus={index === autoFocusIndex}
/>
</Flex>
- <Flex gap="sm" w="50%">
+ <Flex gap="sm" w="50%" align="center">
<ValueInput
canDelete={canDeleteThis}
canRevert={!!canRevert}
@@ -175,8 +175,8 @@ export const LoginAttributeMappingEditor = ({
);
})}
<Button
- variant="light"
- size="xs"
+ variant="transparent"
+ size="compact-md"
leftSection={<Icon name="add" />}
onClick={() => {
handleChange(addEntry(entries));
@@ -253,18 +253,26 @@ const ValueInput = ({
w="100%"
{...valueOpts}
/>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
{canDelete && (
<Button
+ variant="subtle"
+ color="neutral"
+ size="sm"
leftSection={<Icon name="close" />}
onClick={onDelete}
data-testid="remove-mapping"
/>
)}
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
{canRevert && (
<Tooltip
label={t`Revert to "${valueOpts?.revert?.value}" value from ${valueOpts?.revert?.source}`}
>
<Button
+ variant="subtle"
+ color="neutral"
+ size="sm"
leftSection={<Icon name="refresh" />}
onClick={onRevert}
data-testid="revert-mapping"
diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/SchemaViewer.tsx b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/SchemaViewer.tsx
index b7fa6b7e10d..3fcd7411453 100644
--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/SchemaViewer.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/SchemaViewer.tsx
@@ -315,7 +315,6 @@ export function SchemaViewer({
<Group gap="sm">
<Button
bg="background_page-primary"
- variant="default"
leftSection={<Icon name="sparkles" />}
onClick={resetLayout}
>
@@ -324,7 +323,6 @@ export function SchemaViewer({
{selectedNodeId != null && (
<Button
bg="background_page-primary"
- variant="default"
onClick={() => focusOnNode(selectedNodeId)}
>
{t`Focus node`}
diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.tsx b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.tsx
index 97cf9bf4a24..773cae3101a 100644
--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.tsx
@@ -75,7 +75,7 @@ export function SchemaPickerInput({
}}
>
<Button
- variant="default"
+ size="lg"
className={S.triggerButton}
leftSection={
<FixedSizeIcon
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx
index a950e9b9d57..023ee8bb734 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx
@@ -111,7 +111,6 @@ export function AdvisoryCard({
<Group gap="lg" mt="sm">
{downloadJar && (
<Button
- variant="outline"
component="a"
href={downloadJar.url}
target="_blank"
@@ -127,8 +126,6 @@ export function AdvisoryCard({
label={t`Clicking on Dismiss just hides the notification and you can view this later by toggling 'Show dismissed'`}
>
<Button
- variant="outline"
- color="text-secondary"
onClick={() => onAcknowledge(advisory.advisory_id)}
data-testid="acknowledge-button"
>
@@ -137,12 +134,7 @@ export function AdvisoryCard({
</Tooltip>
)}
{acknowledged && (
- <Button
- variant="outline"
- color="text-secondary"
- disabled
- data-testid="acknowledge-button"
- >
+ <Button disabled data-testid="acknowledge-button">
{t`Dismissed`}
</Button>
)}
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryList/AdvisoryList.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryList/AdvisoryList.tsx
index 177954f18f5..6daf9c9750a 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryList/AdvisoryList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryList/AdvisoryList.tsx
@@ -88,8 +88,8 @@ export function AdvisoryList({
</Title>
{onAcknowledgeAll && undismissedNotAffecting.length > 0 && (
<Button
- variant="subtle"
- size="compact-xs"
+ variant="transparent"
+ size="compact-md"
onClick={() =>
onAcknowledgeAll(
undismissedNotAffecting.map((a) => a.advisory_id),
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx
index 8e1ad930eef..1029437bc2e 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx
@@ -103,6 +103,7 @@ export function NotificationChannelConfigModal({
<Group gap="lg">
<Button
variant="subtle"
+ color="neutral"
onClick={() => {
resetConfig();
onClose();
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
index 8ba5dc5eae9..370b2798d89 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
@@ -166,15 +166,11 @@ export function SecurityCenterPage() {
</Button>
<Button
variant="subtle"
- leftSection={isSmallScreen ? undefined : <Icon name="gear" />}
+ leftSection={<Icon name="gear" />}
onClick={() => setSettingsOpen(true)}
data-testid="notification-config-toggle"
>
- {isSmallScreen ? (
- <Icon name="gear" />
- ) : (
- t`Notification settings`
- )}
+ {isSmallScreen ? null : t`Notification settings`}
</Button>
</Group>
<Text c="text-secondary" data-testid="current-version">
diff --git a/enterprise/frontend/src/metabase-enterprise/storage/StoragePurchaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/storage/StoragePurchaseModal.tsx
index cb6fd5219f6..eeea3bf6516 100644
--- a/enterprise/frontend/src/metabase-enterprise/storage/StoragePurchaseModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/storage/StoragePurchaseModal.tsx
@@ -71,7 +71,7 @@ export const StoragePurchaseModal = ({
</Text>
<Group justify="flex-end" mt="sm">
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<Button variant="filled" onClick={handleConfirm}>
diff --git a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/AccessGrantList.tsx b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/AccessGrantList.tsx
index 6a483e7abb0..7dc1c51be32 100644
--- a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/AccessGrantList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/AccessGrantList.tsx
@@ -25,7 +25,7 @@ export const AccessGrantList = (props: AccessGrantListProps) => {
title: t`Revoke access grant?`,
message: t`This will immediately revoke the support agent's access to your instance.`,
confirmButtonText: t`Revoke`,
- confirmButtonProps: { color: "feedback-negative" },
+ confirmButtonProps: { color: "negative" },
size: "sm",
onConfirm: async () => {
try {
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataFilterButton.module.css b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataFilterButton.module.css
deleted file mode 100644
index b2d23fabe65..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataFilterButton.module.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/* copied from metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css */
-
-.FilterButton {
- &[data-variant="default"] {
- transition: background 300ms linear;
-
- &:hover {
- color: var(--mb-color-core-filter);
- background-color: color-mix(
- in srgb,
- var(--mb-color-core-filter) 10%,
- var(--mb-color-core-white)
- );
- }
- }
-}
-
-.FilterButtonAttachment {
- &[data-variant="default"] {
- padding: 0.5rem;
- transition: background 300ms linear;
-
- &:hover {
- background-color: color-mix(
- in srgb,
- var(--mb-color-core-filter) 10%,
- var(--mb-color-core-white)
- );
- }
-
- &:hover,
- &[data-expanded="true"] {
- .FilterCountChip {
- color: var(--mb-color-text-selected);
- background-color: var(--mb-color-core-filter);
- }
- }
- }
-}
-
-.FilterCountChip {
- font-size: 0.6875rem;
- border-radius: 10px;
- line-height: 1rem;
- padding-inline: 0.5rem;
- color: var(--mb-color-text-primary);
- background-color: color-mix(
- in srgb,
- var(--mb-color-core-filter) 15%,
- var(--mb-color-core-white)
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataFilterButton.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataFilterButton.tsx
index f6d626630cd..8205c804e99 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataFilterButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataFilterButton.tsx
@@ -1,16 +1,13 @@
import { useDisclosure } from "@mantine/hooks";
-import cx from "classnames";
import { useMemo } from "react";
import { t } from "ttag";
import { getFilterItems } from "metabase/querying/filters/components/FilterPanel/utils";
import { MultiStageFilterPicker } from "metabase/querying/filters/components/FilterPicker/MultiStageFilterPicker";
-import { Button, Icon, Popover, Tooltip } from "metabase/ui";
+import { Badge, Button, Icon, Popover, Tooltip } from "metabase/ui";
import type * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
-import ViewTitleHeaderS from "./EditTableDataFilterButton.module.css";
-
interface EditTableDataFilterButtonProps {
className?: string;
question: Question;
@@ -45,7 +42,7 @@ export function EditTableDataFilterButton({
<Popover opened={isOpened} position="bottom-start" onDismiss={close}>
<Popover.Target>
<Button
- className={cx(className, ViewTitleHeaderS.FilterButton)}
+ className={className}
leftSection={<Icon name={hasFilters ? "filter_plus" : "filter"} />}
onClick={toggle}
data-testid="table-edit-filter-header"
@@ -66,15 +63,20 @@ export function EditTableDataFilterButton({
<Tooltip label={label}>
<Button
aria-label={label}
- className={ViewTitleHeaderS.FilterButtonAttachment}
onClick={isExpanded ? onCollapse : onExpand}
data-testid="filters-visibility-control"
data-expanded={isExpanded}
- style={{ borderLeft: "none" }} // mantine puts a double border between buttons in groups
>
- <div className={ViewTitleHeaderS.FilterCountChip}>
- {items?.length}
- </div>
+ <Badge
+ size="xs"
+ variant="filled"
+ color="neutral"
+ bg={isExpanded ? "core-filter-strong" : undefined}
+ c={isExpanded ? "text-primary-inverse" : undefined}
+ style={{ cursor: "inherit" }}
+ >
+ {items.length}
+ </Badge>
</Button>
</Tooltip>
)}
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/CreateRowActionFormModal.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/CreateRowActionFormModal.tsx
index 966b2b9a623..6023f5d6a7c 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/CreateRowActionFormModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/CreateRowActionFormModal.tsx
@@ -150,7 +150,7 @@ export function CreateRowActionFormModal({
gap="xl"
justify="flex-end"
>
- <Button variant="subtle" onClick={handleClose}>
+ <Button variant="subtle" color="neutral" onClick={handleClose}>
{t`Cancel`}
</Button>
<Button
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/DeleteBulkRowConfirmationModal.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/DeleteBulkRowConfirmationModal.tsx
index 5a610d63dd4..92b13107a0c 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/DeleteBulkRowConfirmationModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/DeleteBulkRowConfirmationModal.tsx
@@ -28,12 +28,12 @@ export function DeleteBulkRowConfirmationModal({
onClose={onClose}
>
<Group justify="flex-end" mt="xxl">
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={onConfirm}
loading={isLoading}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/UpdateRowActionFormModal.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/UpdateRowActionFormModal.tsx
index 97ce43781b8..c922fb24deb 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/UpdateRowActionFormModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/UpdateRowActionFormModal.tsx
@@ -159,7 +159,7 @@ export function UpdateRowActionFormModal({
gap="xl"
justify="flex-end"
>
- <Button variant="subtle" onClick={handleClose}>
+ <Button variant="subtle" color="neutral" onClick={handleClose}>
{t`Cancel`}
</Button>
<Button
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
index e814911cd24..050b67d5a12 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
@@ -76,11 +76,7 @@ export const ErrorUpdateToast = ({ error }: ErrorUpdateToastProps) => {
</Group>
<Button
- size="compact-lg"
- c="background_page-secondary-inverse"
- variant="filled"
- autoContrast
- radius="0.5rem"
+ variant="default"
onClick={() => setShowDetails(true)}
>{t`More info`}</Button>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx
index a88e5222b8a..13735259346 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx
@@ -142,9 +142,7 @@ export const EditUserStrategyModal = ({
</Radio.Group>
<Flex justify="flex-end" gap="lg" mt="lg">
- <Button variant="outline" onClick={handleCancel}>
- {t`Cancel`}
- </Button>
+ <Button onClick={handleCancel}>{t`Cancel`}</Button>
<Button
onClick={handleApply}
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
index 5aadd9d43b8..71164f2fbfc 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
@@ -128,7 +128,7 @@ export const CreateTenantsOnboardingStep = ({
{tenants.map((tenant, index) => (
<Paper key={index} withBorder p="lg" radius="sm">
<Stack gap="lg">
- <Group justify="space-between" align="flex-start">
+ <Group justify="space-between" align="center">
<TextInput
value={tenant.name}
onChange={(e) =>
@@ -139,16 +139,16 @@ export const CreateTenantsOnboardingStep = ({
fw="bold"
classNames={{ input: S.TenantNameInput }}
/>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
{tenants.length > 1 && (
<Button
variant="subtle"
- color="text-secondary"
- p={0}
+ color="neutral"
+ size="sm"
+ leftSection={<Icon name="close" />}
onClick={() => removeTenantCard(index)}
aria-label={t`Remove tenant`}
- >
- <Icon name="close" size={16} />
- </Button>
+ />
)}
</Group>
@@ -191,11 +191,10 @@ export const CreateTenantsOnboardingStep = ({
<Flex justify="space-between" align="center">
<Button
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
leftSection={<Icon name="add" size={16} />}
onClick={addTenantCard}
- p={0}
- fw="bold"
>
{t`New tenant`}
</Button>
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
index 5d49513bd51..94d24aebe76 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
@@ -81,6 +81,7 @@ export const TenantsListing = ({
<Flex gap="sm">
<Button
variant="filled"
+ size="lg"
onClick={openNewTenantModal}
>{t`New tenant`}</Button>
</Flex>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx
index 0fe717d32fd..6c2d048ddfa 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx
@@ -249,8 +249,8 @@ function AddTableButton({
<Box>
<Button
leftSection={<Icon name="add_data" />}
- variant="subtle"
- px={0}
+ variant="transparent"
+ size="compact-md"
onClick={onClick}
disabled={disabled}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.module.css b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.module.css
index ef95488c4d7..d502fb7d541 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.module.css
@@ -2,6 +2,10 @@
border: 1px solid var(--border-color);
}
+.tableSelectorButton {
+ --mb-button-padding-x: calc(var(--mantine-spacing-md) - 1px);
+}
+
.tableSelectorButtonInner {
justify-content: start;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
index b739a83ea4a..b2ce6e6aff5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
@@ -74,9 +74,12 @@ export function TableSelector({
miw={0}
onClick={open}
disabled={disabled}
- classNames={{ inner: S.tableSelectorButtonInner }}
- px="sm"
- py="xl"
+ classNames={{
+ root: S.tableSelectorButton,
+ inner: S.tableSelectorButtonInner,
+ }}
+ py="sm"
+ h="auto"
variant="subtle"
>
<Stack gap="xxs">
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
index 1ee2c55ab2e..fbb7745edf4 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
@@ -103,26 +103,20 @@ export function PythonEditorBody({
<Tooltip label={t`Accept proposed changes`} position="left">
<Button
data-testid="accept-proposed-changes-button"
- variant="filled"
- bg="feedback-positive"
- px="0"
- w="2.5rem"
+ variant="light"
+ color="positive"
onClick={onAcceptProposed}
- >
- <Icon name="check" />
- </Button>
+ leftSection={<Icon name="check" />}
+ />
</Tooltip>
<Tooltip label={t`Reject proposed changes`} position="left">
<Button
data-testid="reject-proposed-changes-button"
- w="2.5rem"
- px="0"
- variant="filled"
- bg="feedback-negative"
+ variant="light"
+ color="negative"
onClick={onRejectProposed}
- >
- <Icon name="close" />
- </Button>
+ leftSection={<Icon name="close" />}
+ />
</Tooltip>
</>
)}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
index 8207167570e..4fa291d64b3 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
@@ -76,14 +76,7 @@ export function PythonTransformTopBar({
)}
{showEditButton && (
<Flex ml="auto" mr="xl" align="center" h="3rem">
- <EditDefinitionButton
- bg="transparent"
- fz="sm"
- h="1.5rem"
- px="sm"
- size="xs"
- transformId={transform.id}
- />
+ <EditDefinitionButton size="sm" transformId={transform.id} />
</Flex>
)}
</Flex>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx
index e7eaa1169a2..aad958f7175 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx
@@ -82,7 +82,7 @@ export const PurchaseAdvancedTransforms = ({
<div>
<Button
variant="filled"
- size="md"
+ size="lg"
onClick={handleCloudPurchase}
loading={isPurchasing}
px="3rem"
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
index a3382245b48..328daa062ac 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
@@ -176,7 +176,7 @@ function SelfHostedStorePurchaseLink() {
const storeUrl = useStoreUrl("account/transforms");
return (
- <Button component="a" href={storeUrl} variant="primary">
+ <Button component="a" href={storeUrl} variant="filled" size="lg">
{t`Go to your store account to upgrade`}
</Button>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal.tsx
index 585d19d36c4..07c9808a762 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal.tsx
@@ -103,7 +103,7 @@ export const TransformsSettingUpModal = ({
</Text>
</Box>
- <Button variant="filled" size="md" onClick={onClose}>
+ <Button variant="filled" onClick={onClose}>
{t`Done`}
</Button>
</>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
index 85cfa63cc1f..e3f9d05a9c8 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
@@ -127,7 +127,8 @@ export function TransformsUpsellPage() {
>{t`We'll notify you when you've hit ${NOTIFICATION_THRESHOLD * 100}% of your allotment.`}</Text>
<Button
loading={isPurchasing}
- variant="primary"
+ variant="filled"
+ size="lg"
onClick={handlePurchase}
>{t`Agree and continue`}</Button>
<Text c="text-secondary" lh={1.4}>
diff --git a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
index 5ff9fad8e50..beae1b98ab8 100644
--- a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
@@ -207,15 +207,15 @@ const UploadTableRow = ({
<td>{createdAtString}</td>
<td>{item.schema}</td>
<td>
- <Flex align="center" justify="flex-end">
+ <Flex align="center" justify="flex-end" py="sm">
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
onClick={() => onTrash(item)}
variant="subtle"
- className="Button Button--borderless"
- color="text-secondary"
- >
- <Icon name="trash" />
- </Button>
+ color="neutral"
+ size="sm"
+ leftSection={<Icon name="trash" />}
+ />
</Flex>
</td>
</tr>
diff --git a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.tsx b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.tsx
index 60062c219a9..385411ab5da 100644
--- a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.tsx
@@ -217,6 +217,7 @@ export const UserProvisioning = () => {
<Flex gap="sm">
<Box style={{ flexGrow: 1 }}>{children}</Box>
<Button
+ size="lg"
disabled={isLoadingToken || !isScimEnabled}
variant="filled"
onClick={
diff --git a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioningModals.tsx b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioningModals.tsx
index c49979a0a02..68319350007 100644
--- a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioningModals.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioningModals.tsx
@@ -99,7 +99,7 @@ export const UserProvisioningRegenerateTokenModal = ({
// eslint-disable-next-line metabase/no-literal-metabase-strings -- admin settings
message={t`This will delete the existing token. You'll need to update your identity provider with the new token, otherwise people won't be able to log in to your Metabase.`}
confirmButtonText={t`Regenerate now`}
- confirmButtonProps={{ variant: "filled", color: "core-brand" }}
+ confirmButtonProps={{ variant: "filled", color: "brand" }}
onConfirm={handleConfirmRegenerate}
/>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
index c8b1a3cb703..e307586463e 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
@@ -246,13 +246,14 @@ export function IllustrationWidget({
? fileName
: t`Remove uploaded image`}
</Text>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
{customIllustrationSource && (
<Button
- leftSection={<Icon name="close" />}
variant="subtle"
- c="text-primary"
+ color="neutral"
+ size="sm"
+ leftSection={<Icon name="close" />}
ml="lg"
- size="compact-md"
onClick={handleRemoveCustomIllustration}
aria-label={t`Remove custom illustration`}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
index 8d0429ff416..0e6e93a500d 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
@@ -132,13 +132,14 @@ export function ImageUploadWidget({
? fileName
: t`Remove uploaded image`}
</Text>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
{!isDefaultImage && (
<Button
- leftSection={<Icon name="close" />}
variant="subtle"
- c="text-primary"
+ color="neutral"
+ size="sm"
+ leftSection={<Icon name="close" />}
ml="lg"
- size="compact-md"
onClick={handleRemove}
aria-label={t`Remove custom illustration`}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx
index 70572a9c6da..c3607bd323e 100644
--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx
@@ -84,11 +84,7 @@ export function WritableConnectionInfoSection({
<>
<DatabaseInfoSectionDivider condensed />
<Group>
- <Button
- variant="filled"
- color="feedback-negative"
- onClick={handleRemove}
- >
+ <Button variant="filled" color="negative" onClick={handleRemove}>
{t`Remove writable connection`}
</Button>
</Group>
diff --git a/frontend/src/embedding-sdk-bundle/components/private/ResetButton.tsx b/frontend/src/embedding-sdk-bundle/components/private/ResetButton.tsx
index a6a4612a445..c56d69b5390 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/ResetButton.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/ResetButton.tsx
@@ -3,20 +3,8 @@ import { t } from "ttag";
import { Button, type ButtonProps, Icon, Tooltip } from "metabase/ui";
-const sizeOverrideStyles = {
- width: 32,
- height: 32,
-};
-
export const ResetButton = (buttonProps: ButtonProps): React.JSX.Element => (
<Tooltip label={t`Reset view`}>
- <Button
- variant="outline"
- radius="xl"
- size="xs"
- leftSection={<Icon name="revert" />}
- style={sizeOverrideStyles}
- {...buttonProps}
- />
+ <Button leftSection={<Icon name="revert" />} {...buttonProps} />
</Tooltip>
);
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationBackButton.module.css b/frontend/src/embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationBackButton.module.css
deleted file mode 100644
index 603e7b56c3e..00000000000
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationBackButton.module.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.backButton:not([data-css-specificity-hack]) {
- &:hover {
- color: var(--mb-color-core-brand);
- }
-}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationBackButton.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationBackButton.tsx
index 01f9264b1bc..c97e2a04728 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationBackButton.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationBackButton.tsx
@@ -1,4 +1,3 @@
-import cx from "classnames";
import { t } from "ttag";
import { useTranslateContent } from "metabase/content-translation/hooks";
@@ -6,7 +5,6 @@ import { Button, Icon } from "metabase/ui";
import { withPublicComponentWrapper } from "../PublicComponentWrapper";
-import S from "./SdkInternalNavigationBackButton.module.css";
import { useSdkInternalNavigationOptional } from "./context";
/**
@@ -38,14 +36,12 @@ const SdkInternalNavigationBackButtonInner = ({
return (
<Button
- variant="subtle"
- color="text-secondary"
- size="sm"
+ variant="transparent"
+ size="compact-md"
leftSection={<Icon name="chevronleft" />}
onClick={pop}
- pl={0}
style={style}
- className={cx(className, S.backButton)}
+ className={className}
aria-label={label}
>
{label}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutPicker/BreakoutPicker.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutPicker/BreakoutPicker.tsx
index 5b31f3c2e89..a358c6f4ccd 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutPicker/BreakoutPicker.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutPicker/BreakoutPicker.tsx
@@ -5,7 +5,7 @@ import {
useBreakoutQueryHandlers,
} from "metabase/query_builder";
import { BreakoutPopover } from "metabase/querying/notebook/components/BreakoutStep";
-import { Button, Divider, Icon, Stack } from "metabase/ui";
+import { Divider, PopoverBackButton, Stack } from "metabase/ui";
import type * as Lib from "metabase-lib";
import { useSdkQuestionContext } from "../../../context";
@@ -29,19 +29,9 @@ export const BreakoutPickerInner = ({
return (
<Stack gap={0} w="18.75rem">
- <Button
- p="lg"
- fz="lg"
- color="text-secondary"
- variant="subtle"
- leftSection={<Icon name="chevronleft" />}
- onClick={() => onClose?.()}
- styles={{
- inner: { display: "flex", justifyContent: "flex-start" },
- }}
- >
+ <PopoverBackButton px="lg" py="md" h="auto" onClick={() => onClose?.()}>
{breakoutItem?.displayName ?? t`Back`}
- </Button>
+ </PopoverBackButton>
<Divider />
<BreakoutPopover
query={query}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/ToolbarButton/ToolbarButton.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/ToolbarButton/ToolbarButton.tsx
index 40d54a8a08a..41bfa2eec82 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/ToolbarButton/ToolbarButton.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/ToolbarButton/ToolbarButton.tsx
@@ -31,8 +31,6 @@ function _ToolbarButton(
<Icon name={icon} aria-hidden />
) : undefined
}
- py="sm"
- px="lg"
{...buttonProps}
>
{label}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.module.css b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.module.css
index f3ffef87463..119e958bf57 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.module.css
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.module.css
@@ -32,8 +32,3 @@
.Indicator .Logo {
border-radius: 3px 0 0 3px;
}
-
-.DocsButton:not([data-css-specificity-hack="🤣"]) {
- color: #509ee3;
- border: 1px solid #509ee3;
-}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx
index 3cc6c906263..f0da582933d 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx
@@ -94,35 +94,25 @@ export const SdkUsageProblemBanner = ({
{problem.message}
</Text>
- <Flex w="100%" justify="end" mt="sm" columnGap="sm">
+ <Flex w="100%" justify="end" mt="sm" columnGap="lg">
<Button
- fz="sm"
- ff={fontFamily}
- fs="normal"
- size="md"
- radius="sm"
variant="subtle"
- color="text-brand"
+ ff={fontFamily}
onClick={() => {
dispatch(setUsageProblem(null));
}}
>
Hide {severity === "error" ? "error" : "warning"}
</Button>
- <ExternalLink role="link" href={problem.documentationUrl}>
- <Button
- fz="sm"
- rightSection={
- <Icon aria-hidden name="external" size="1rem" />
- }
- ff={fontFamily}
- className={S.DocsButton}
- size="md"
- radius="sm"
- >
- Documentation
- </Button>
- </ExternalLink>
+ <Button
+ component={ExternalLink}
+ ff={fontFamily}
+ href={problem.documentationUrl}
+ rightSection={<Icon aria-hidden name="external" />}
+ variant="light"
+ >
+ Documentation
+ </Button>
</Flex>
</Stack>
</Card>
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
index 04bfdba9d94..47e1ca151a4 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
@@ -603,7 +603,7 @@ const SdkDashboardInner = ({
dispatch(setEditingDashboard(dashboard));
},
confirmButtonProps: {
- color: "core-brand",
+ color: "brand",
},
});
} else {
diff --git a/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.unit.spec.ts b/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.unit.spec.ts
index f859d778d63..b553ff51206 100644
--- a/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.unit.spec.ts
+++ b/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.unit.spec.ts
@@ -40,11 +40,21 @@ describe("Transform Embedding Theme Override", () => {
brand: expect.arrayContaining(["hotpink"]),
"core-brand": expect.arrayContaining(["hotpink"]),
"text-primary": expect.arrayContaining(["yellow"]),
+ "button_label-default-neutral-default": expect.arrayContaining([
+ "yellow",
+ ]),
+ "button_label-light-neutral-default": expect.arrayContaining([
+ "yellow",
+ ]),
+ "button_label-subtle-neutral-default": expect.arrayContaining([
+ "yellow",
+ ]),
"text-tertiary": expect.arrayContaining(["green"]),
"text-disabled": expect.arrayContaining(["green"]),
"background-primary": expect.arrayContaining(["orange"]),
"background_page-primary": expect.arrayContaining(["orange"]),
"background_surface-primary": expect.arrayContaining(["orange"]),
+ "button-default-neutral-default": expect.arrayContaining(["orange"]),
"background-tertiary": expect.arrayContaining(["brown"]),
"background-secondary": expect.arrayContaining(["brown"]),
"background_page-secondary": expect.arrayContaining(["brown"]),
@@ -77,6 +87,7 @@ describe("Transform Embedding Theme Override", () => {
"background-primary": expect.arrayContaining(["green"]),
"background_page-primary": expect.arrayContaining(["green"]),
"background_surface-primary": expect.arrayContaining(["green"]),
+ "button-default-neutral-default": expect.arrayContaining(["green"]),
"background-tertiary": expect.arrayContaining(["green"]),
"background-secondary": expect.arrayContaining(["green"]),
"background_page-secondary": expect.arrayContaining(["green"]),
diff --git a/frontend/src/embedding-sdk-bundle/test/ParametersPlayground.tsx b/frontend/src/embedding-sdk-bundle/test/ParametersPlayground.tsx
index fd72c6d6188..08f4ee466c6 100644
--- a/frontend/src/embedding-sdk-bundle/test/ParametersPlayground.tsx
+++ b/frontend/src/embedding-sdk-bundle/test/ParametersPlayground.tsx
@@ -91,23 +91,22 @@ export const ParametersPlayground = ({
/>
<Group gap="xxs">
<Button
- size="xs"
+ size="sm"
onClick={() => paramSlug && onSetOne(paramSlug, paramValue)}
>
Set
</Button>
<Button
- size="xs"
- variant="default"
+ size="sm"
onClick={() => paramSlug && onClearOne(paramSlug)}
>
Clear one
</Button>
- <Button size="xs" variant="subtle" onClick={onClearAll}>
+ <Button variant="subtle" size="sm" onClick={onClearAll}>
Clear all
</Button>
{onGetNow && (
- <Button size="xs" variant="light" onClick={onGetNow}>
+ <Button variant="light" size="sm" onClick={onGetNow}>
Get now
</Button>
)}
diff --git a/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx b/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
index bfff2d7b979..62c21137106 100644
--- a/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
+++ b/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
@@ -52,7 +52,7 @@ function ArchiveNotificationModal({
<Button
key="submit"
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={handleArchiveClick}
>
{getSubmitMessage(type, hasUnsubscribed)}
diff --git a/frontend/src/metabase/account/notifications/components/UnsubscribeModal/UnsubscribeModal.tsx b/frontend/src/metabase/account/notifications/components/UnsubscribeModal/UnsubscribeModal.tsx
index 71a930193d0..1ca2ddbd117 100644
--- a/frontend/src/metabase/account/notifications/components/UnsubscribeModal/UnsubscribeModal.tsx
+++ b/frontend/src/metabase/account/notifications/components/UnsubscribeModal/UnsubscribeModal.tsx
@@ -55,7 +55,7 @@ function UnsubscribeModal({
<Button
key="submit"
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={handleUnsubscribeClick}
>
{t`Unsubscribe`}
diff --git a/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.tsx b/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.tsx
index 7dd6cdab6d3..c896e12ec6f 100644
--- a/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.tsx
+++ b/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.tsx
@@ -117,7 +117,7 @@ const UserProfileForm = ({
<FormSubmitButton
label={t`Update`}
disabled={!dirty}
- variant="primary"
+ variant="filled"
/>
<FormErrorMessage />
</Form>
diff --git a/frontend/src/metabase/actions/components/DeleteObjectModal/DeleteObjectModal.tsx b/frontend/src/metabase/actions/components/DeleteObjectModal/DeleteObjectModal.tsx
index 902ea442af8..688b56cc491 100644
--- a/frontend/src/metabase/actions/components/DeleteObjectModal/DeleteObjectModal.tsx
+++ b/frontend/src/metabase/actions/components/DeleteObjectModal/DeleteObjectModal.tsx
@@ -59,7 +59,7 @@ export const DeleteObjectModal: FunctionComponent<Props> = ({
<Button
key="delete"
variant="filled"
- color="feedback-negative"
+ color="negative"
disabled={
typeof actionId === "undefined" ||
typeof objectId === "undefined" ||
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
index 998e3f28636..4c7693bb594 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
@@ -108,7 +108,7 @@ export default function ActionCreatorView({
/>
<EditorContainer>{children}</EditorContainer>
<ModalActions>
- <Button onClick={onCloseModal} variant="subtle">
+ <Button onClick={onCloseModal} variant="subtle" color="neutral">
{t`Cancel`}
</Button>
{isEditable && (
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
index 94e27dc23fd..7651094f0f8 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
@@ -122,7 +122,7 @@ export const OptionPopover = ({
{t`Press enter to add another option`}
</AddMorePrompt>
{hasError && <ErrorMessage>{error}</ErrorMessage>}
- <Button disabled={!canSave} onClick={handleSave} size="sm">
+ <Button disabled={!canSave} onClick={handleSave}>
{t`Save`}
</Button>
</OptionEditorContainer>
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormModelPicker/FormModelPicker.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormModelPicker/FormModelPicker.tsx
index 086f811f65f..7bfb3ef01f6 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormModelPicker/FormModelPicker.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormModelPicker/FormModelPicker.tsx
@@ -49,6 +49,7 @@ export function FormModelPicker({
ref={formFieldRef}
>
<Button
+ size="lg"
data-testid="collection-picker-button"
id={id}
onClick={() => setIsPickerOpen(true)}
diff --git a/frontend/src/metabase/actions/utils.ts b/frontend/src/metabase/actions/utils.ts
index 868752085f3..f963e6feb05 100644
--- a/frontend/src/metabase/actions/utils.ts
+++ b/frontend/src/metabase/actions/utils.ts
@@ -314,15 +314,15 @@ export const getSubmitButtonColor = (
action: WritebackAction,
): ButtonProps["color"] => {
if (isImplicitDeleteAction(action)) {
- return "feedback-negative";
+ return "negative";
}
return match(action.visualization_settings?.submitButtonColor)
.returnType<ButtonProps["color"]>()
- .with("danger", () => "feedback-negative")
- .with("success", () => "feedback-positive")
- .with("warning", () => "feedback-warning")
- .otherwise(() => "core-brand");
+ .with("danger", () => "negative")
+ .with("success", () => "positive")
+ .with("warning", () => "warning")
+ .otherwise(() => "brand");
};
export const getSubmitButtonLabel = (action: WritebackAction): string => {
diff --git a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
index 02209fd933b..55200a189a6 100644
--- a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
@@ -223,7 +223,8 @@ export function MetabotSlackSetup() {
</ConnectionDetails>
<Flex justify="flex-end">
<Button
- c="feedback-negative"
+ variant="light"
+ color="negative"
onClick={handleOpen}
>{t`Remove`}</Button>
</Flex>
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.tsx
index ce9991ce1b8..813cb61b0ec 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.tsx
@@ -54,7 +54,7 @@ export const DatabaseDangerZoneSection = ({
<>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={saveFieldsModal.open}
>{t`Discard saved field values`}</Button>
<ConfirmModal
@@ -71,7 +71,7 @@ export const DatabaseDangerZoneSection = ({
<>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={deleteDbModal.open}
>{t`Remove this database`}</Button>
<DeleteDatabaseModal
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.module.css b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.module.css
new file mode 100644
index 00000000000..0b95a569030
--- /dev/null
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.module.css
@@ -0,0 +1,3 @@
+.row {
+ border-bottom: 1px dashed var(--mb-color-border-neutral);
+}
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
index c914b2c59e4..bcd52397b35 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
@@ -5,7 +5,6 @@ import { NewUserModal } from "metabase/admin/people/containers/NewUserModal";
import { Link } from "metabase/common/components/Link";
import { useDocsUrl } from "metabase/common/hooks";
import { getHelpUrl } from "metabase/common/utils/help-url";
-import CS from "metabase/css/core/index.css";
import { getUserIsAdmin } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { getIsPaidPlan } from "metabase/selectors/settings";
@@ -14,7 +13,6 @@ import {
ActionIcon,
Box,
Button,
- Divider,
Flex,
Icon,
ScrollArea,
@@ -22,6 +20,7 @@ import {
} from "metabase/ui";
import type { EngineKey } from "metabase-types/api";
+import S from "./DatabaseHelpSidePanel.module.css";
import {
ENGINE_DOC_MAP,
EmbeddedEngineDocContent,
@@ -68,50 +67,44 @@ export const DatabaseHelpSidePanel = ({ engineKey, onClose }: Props) => {
</ActionIcon>
</Flex>
{showMetabaseLinks && (
- <>
+ <Box className={S.row} px="lg" py="md">
<Button
- className={CS.link}
component={Link}
leftSection={<Icon name="reference" />}
- p={0}
target="_blank"
to={fullDocsUrl}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
>
{t`Read the full docs`}
</Button>
- <Divider variant="dashed" />
- </>
+ </Box>
)}
{isAdmin && (
- <>
+ <Box className={S.row} px="lg" py="md">
<Button
- className={CS.link}
leftSection={<Icon name="mail" />}
onClick={toggleUserModal}
- p={0}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
>
{t`Invite a teammate to help you`}
</Button>
- <Divider variant="dashed" />
- </>
+ </Box>
)}
{showMetabaseLinks && isPaidPlan && (
- <>
+ <Box className={S.row} px="lg" py="md">
<Button
- className={CS.link}
component={Link}
leftSection={<Icon name="person" />}
- p={0}
target="_blank"
to={talkToExpertUrl}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
>
{t`Talk to an expert`}
</Button>
- <Divider variant="dashed" />
- </>
+ </Box>
)}
<EmbeddedEngineDocContent engineKey={engineKey} />
</Box>
diff --git a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
index c6b463c0464..ac5eb833f65 100644
--- a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
+++ b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
@@ -190,7 +190,7 @@ export const DeleteDatabaseModal = ({
)}
<Button type="button" onClick={onClose}>{t`Cancel`}</Button>
<Button
- color="feedback-negative"
+ color="negative"
variant="filled"
type="submit"
disabled={!canDelete}
diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx
index 87c8e538a8d..bb553619599 100644
--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx
+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx
@@ -17,7 +17,6 @@ export const HeaderLinkGroup = ({ database }: Props) => {
<Flex gap="0.5rem">
<Button
component={Link}
- fw="bold"
to={`/admin/permissions/data/database/${database.id}`}
variant="subtle"
>
@@ -26,7 +25,6 @@ export const HeaderLinkGroup = ({ database }: Props) => {
<Button
component={isSyncing ? undefined : Link}
disabled={isSyncing}
- fw="bold"
rightSection={<Icon name="external" />}
target="_blank"
title={isSyncing ? t`Sync in progress` : undefined}
diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
index 9536a761fbf..b7498580c99 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
@@ -76,14 +76,13 @@ export function DatabasePage() {
<Text>
{t`Need a hand?`}{" "}
<Button
- h="auto"
onClick={onHelpButtonClick}
- p={0}
style={{ verticalAlign: "baseline" }}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
+ rightSection={<Icon name="chevronright" size={12} />}
>
{t`Help is here`}
- <Icon name="chevronright" size={12} ml="xxs" />
</Button>
</Text>
)}
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
index 83a165772cd..df8b56204b8 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
@@ -172,16 +172,10 @@ const SegmentFormActions = ({
}: SegmentFormActionsProps): JSX.Element => {
return (
<div>
- <Button
- type="submit"
- variant="filled"
- size="sm"
- disabled={!isValid}
- mr="lg"
- >
+ <Button type="submit" variant="filled" disabled={!isValid} mr="lg">
{t`Save changes`}
</Button>
- <Button component={Link} size="sm" to="/admin/datamodel/segments">
+ <Button component={Link} to="/admin/datamodel/segments">
{t`Cancel`}
</Button>
</div>
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.tsx
index 2055796c096..83616617056 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.tsx
@@ -31,11 +31,7 @@ export function SegmentRetireModal({
</Text>
<Flex justify="flex-end" gap="sm">
<Button onClick={onClose}>{t`Cancel`}</Button>
- <Button
- color="feedback-negative"
- variant="filled"
- onClick={handleRetire}
- >
+ <Button color="negative" variant="filled" onClick={handleRetire}>
{t`Retire`}
</Button>
</Flex>
diff --git a/frontend/src/metabase/admin/embedding/components/ThemeEditor/EditorPanel.tsx b/frontend/src/metabase/admin/embedding/components/ThemeEditor/EditorPanel.tsx
index 22c895bda38..44244ce2d9c 100644
--- a/frontend/src/metabase/admin/embedding/components/ThemeEditor/EditorPanel.tsx
+++ b/frontend/src/metabase/admin/embedding/components/ThemeEditor/EditorPanel.tsx
@@ -77,7 +77,7 @@ export function EditorPanel({
{({ copied, copy }) => (
<Button
variant="subtle"
- size="compact-sm"
+ size="sm"
leftSection={<Icon name="copy" size={16} />}
onClick={copy}
>
@@ -105,15 +105,15 @@ export function EditorPanel({
<Text fw={600}>{t`Main colors`}</Text>
{editor.hasMainColorChanges && (
<Tooltip label={t`Reset main colors to defaults`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
variant="subtle"
- pt="5"
- size="compact-sm"
+ color="neutral"
+ size="sm"
aria-label={t`Reset main colors to defaults`}
onClick={editor.resetMainColors}
- >
- <Icon name="revert" size={16} />
- </Button>
+ leftSection={<Icon name="revert" />}
+ />
</Tooltip>
)}
</Flex>
@@ -150,14 +150,15 @@ export function EditorPanel({
<Tooltip
label={t`Regenerate filter, summarize, positive, negative, and chart colors from the brand color`}
>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
variant="subtle"
- size="compact-sm"
+ color="neutral"
+ size="sm"
aria-label={t`Regenerate from brand color`}
onClick={editor.regenerateAdditionalColorsFromBrand}
- >
- <Icon name="revert" size={16} />
- </Button>
+ leftSection={<Icon name="revert" />}
+ />
</Tooltip>
)}
</Flex>
@@ -250,9 +251,9 @@ export function EditorPanel({
{onDelete && (
<Button
mt="xl"
- variant="subtle"
- color="feedback-negative"
- px={0}
+ variant="transparent"
+ color="negative"
+ size="compact-md"
leftSection={<Icon name="trash" size={16} />}
onClick={onDelete}
>
@@ -268,7 +269,7 @@ export function EditorPanel({
justify="space-between"
style={{ borderTop: "1px solid var(--mb-color-border-neutral)" }}
>
- <Button variant="subtle" onClick={onCancel}>
+ <Button variant="subtle" color="neutral" onClick={onCancel}>
{t`Cancel`}
</Button>
<Button variant="filled" onClick={onSave} disabled={!editor.canSave}>
diff --git a/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewResourcePicker.tsx b/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewResourcePicker.tsx
index 89a1b7cbe73..a60beaa4352 100644
--- a/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewResourcePicker.tsx
+++ b/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewResourcePicker.tsx
@@ -40,7 +40,6 @@ export function PreviewResourcePicker({
return (
<>
<Button
- variant="default"
rightSection={<Icon name="chevrondown" size={12} />}
onClick={openPicker}
aria-label={t`Change preview resource`}
diff --git a/frontend/src/metabase/admin/embedding/components/ThemeListing/DeleteThemeModal.tsx b/frontend/src/metabase/admin/embedding/components/ThemeListing/DeleteThemeModal.tsx
index 19f814f2a88..ed58de76d13 100644
--- a/frontend/src/metabase/admin/embedding/components/ThemeListing/DeleteThemeModal.tsx
+++ b/frontend/src/metabase/admin/embedding/components/ThemeListing/DeleteThemeModal.tsx
@@ -19,11 +19,11 @@ export function DeleteThemeModal({
<Text>{t`Are you sure you want to delete this theme? This action cannot be undone.`}</Text>
<Flex justify="flex-end" gap="lg">
- <Button variant="subtle" onClick={onCancel}>
+ <Button variant="subtle" color="neutral" onClick={onCancel}>
{t`Cancel`}
</Button>
- <Button variant="filled" color="feedback-negative" onClick={onDelete}>
+ <Button variant="filled" color="negative" onClick={onDelete}>
{t`Delete`}
</Button>
</Flex>
diff --git a/frontend/src/metabase/admin/people/components/AddRow.tsx b/frontend/src/metabase/admin/people/components/AddRow.tsx
index a4e36377635..8e7e09e8489 100644
--- a/frontend/src/metabase/admin/people/components/AddRow.tsx
+++ b/frontend/src/metabase/admin/people/components/AddRow.tsx
@@ -52,11 +52,11 @@ export const AddRow = ({
onChange={onChange}
/>
<Flex flex="0 0 auto" gap="sm">
- <Button variant="subtle" bg="transparent" onClick={onCancel}>
+ <Button variant="subtle" color="neutral" onClick={onCancel}>
{t`Cancel`}
</Button>
<Button
- variant={isValid ? "filled" : "outline"}
+ variant={isValid ? "filled" : "default"}
disabled={!isValid}
onClick={onDone}
>
diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.tsx b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
index 83199f971ca..9256399bcf1 100644
--- a/frontend/src/metabase/admin/people/components/GroupsListing.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
@@ -199,10 +199,14 @@ function EditingGroupRow({
</td>
<td />
<Box component="td" ta="right">
- <Button variant="subtle" onClick={onCancelClicked}>{t`Cancel`}</Button>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={onCancelClicked}
+ >{t`Cancel`}</Button>
<Button
ml="1rem"
- variant={textIsValid && textHasChanged ? "filled" : "outline"}
+ variant={textIsValid && textHasChanged ? "filled" : "default"}
disabled={!textIsValid || !textHasChanged}
onClick={onDoneClicked}
>
@@ -548,7 +552,7 @@ export const GroupsListing = (props: GroupsListingProps) => {
closeButtonText={null}
withCloseButton={false}
confirmButtonText={t`Ok`}
- confirmButtonProps={{ color: "core-brand" }}
+ confirmButtonProps={{ color: "brand" }}
data-testid="alert-modal"
/>
</AdminPaneLayout>
diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
index 4ab2d2a1123..2f86b6f8627 100644
--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
@@ -142,7 +142,9 @@ export function PeopleListingApp({
{buttonText && (
<Box>
<Link to={external ? Urls.newTenantUser() : Urls.newUser()}>
- <Button variant="filled">{buttonText}</Button>
+ <Button variant="filled" size="lg">
+ {buttonText}
+ </Button>
</Link>
</Box>
)}
diff --git a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
index 023bea9d271..aca820d1512 100644
--- a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
@@ -78,7 +78,7 @@ const UserPasswordResetModalInner = ({
opened
title={t`Password reset link for ${user.common_name}`}
onConfirm={onClose}
- confirmButtonProps={{ color: "core-brand", variant: "filled" }}
+ confirmButtonProps={{ color: "brand", variant: "filled" }}
confirmButtonText={t`Done`}
closeButtonText={null}
onClose={onClose}
@@ -103,7 +103,7 @@ const UserPasswordResetModalInner = ({
opened
title={t`${user.common_name}'s password has been reset`}
onConfirm={onClose}
- confirmButtonProps={{ color: "core-brand", variant: "filled" }}
+ confirmButtonProps={{ color: "brand", variant: "filled" }}
confirmButtonText={t`Done`}
closeButtonText={null}
onClose={onClose}
@@ -130,11 +130,11 @@ const UserPasswordResetModalInner = ({
<Button onClick={onClose}>{t`Cancel`}</Button>
<Button
variant="filled"
- color="core-brand"
+ color="brand"
onClick={handleGetResetLink}
>{t`Get reset link`}</Button>
<Button
- color="feedback-negative"
+ color="negative"
variant="filled"
onClick={handleResetConfirm}
>{t`Reset password`}</Button>
diff --git a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
index 033912385db..d82611f94e6 100644
--- a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
@@ -67,7 +67,7 @@ export function UserSuccessModal({ params }: UserSuccessModalProps) {
onClose={handleClose}
onConfirm={handleClose}
closeButtonText={null}
- confirmButtonProps={{ color: "core-brand" }}
+ confirmButtonProps={{ color: "brand" }}
confirmButtonText={t`Done`}
message={
temporaryPassword ? (
diff --git a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx b/frontend/src/metabase/admin/performance/components/StrategyForm.tsx
index 1cf90f7af37..bf814759978 100644
--- a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx
+++ b/frontend/src/metabase/admin/performance/components/StrategyForm.tsx
@@ -28,7 +28,6 @@ import {
Flex,
Group,
Icon,
- Loader,
Select,
Stack,
Text,
@@ -356,7 +355,6 @@ const FormButtons = ({
<Group gap="lg" wrap="nowrap">
<Button onClick={onDiscard}>{buttonLabels.discard}</Button>
<FormSubmitButton
- h="2.5rem"
label={buttonLabels.save}
variant="filled"
data-testid="strategy-form-submit-button"
@@ -492,15 +490,12 @@ const SaveAndDiscardButtons = ({
</Button>
)}
<FormSubmitButton
- miw={layout === "sidebar" ? undefined : "10rem"}
- h="2.5rem"
label={buttonLabels.save}
successLabel={
<Group gap="xxs">
<Icon name="check" /> {t`Saved`}
</Group>
}
- activeLabel={<Loader size="1rem" pos="relative" top={1} />}
variant="filled"
data-testid="strategy-form-submit-button"
/>
diff --git a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx
index 6d3b290e53e..2e809246f40 100644
--- a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx
+++ b/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx
@@ -54,10 +54,10 @@ export const LegacyPermissionsModal = ({
<Text mb="1.5rem">
{t`Your permissions have been automatically converted to the new settings, with no change in data access for your groups.`}
</Text>
- <Flex justify="space-between">
+ <Flex justify="space-between" align="center">
<Button
- variant="subtle"
- p={0}
+ variant="transparent"
+ size="compact-md"
component={Link}
to={docsUrl}
target="_blank"
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx
index 2b0eac37863..dc51e84c9c9 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx
@@ -27,13 +27,12 @@ export function PermissionsEditBar({
key="save"
onClick={openModal}
disabled={!isDirty}
- variant="filled"
- size="sm"
+ variant="on-dark-primary"
>{t`Save changes`}</Button>
);
const cancelButton = (
- <Button variant="subtle" size="sm" onClick={onCancel} key="cancel">
+ <Button variant="on-dark-secondary" onClick={onCancel} key="cancel">
{t`Cancel`}
</Button>
);
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
index 912de353504..e69bd729723 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
@@ -132,7 +132,7 @@ export function PermissionsPageLayout({
title={t`There was an error saving`}
message={saveError}
confirmButtonText={t`OK`}
- confirmButtonProps={{ variant: "outline" }}
+ confirmButtonProps={{ variant: "default", color: "neutral" }}
closeButtonText={null}
/>
diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/DeleteApiKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/DeleteApiKeyModal.tsx
index 61bb8c14202..e17bec3c088 100644
--- a/frontend/src/metabase/admin/settings/components/ApiKeys/DeleteApiKeyModal.tsx
+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/DeleteApiKeyModal.tsx
@@ -34,14 +34,11 @@ export const DeleteApiKeyModal = ({
<Text>{t`You won't be able to recover a deleted API key. You'll have to create a new key.`}</Text>
<FormErrorMessage />
<Group justify="flex-end">
- <Button
- color="feedback-negative"
- onClick={onClose}
- >{t`No, don't delete`}</Button>
+ <Button onClick={onClose}>{t`No, don't delete`}</Button>
<FormSubmitButton
label={t`Delete API key`}
variant="filled"
- color="feedback-negative"
+ color="negative"
/>
</Group>
</Stack>
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx
index af9272af94a..21afa003320 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx
@@ -55,10 +55,10 @@ export const MigrationError = ({
</MigrationCard>
<Button
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
onClick={restartMigration}
disabled={isRestarting}
- px="0"
mt="1rem"
>{t`Restart the process`}</Button>
</>
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
index d565b8d7290..22d6ed0cded 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
@@ -98,7 +98,8 @@ export const MigrationInProgress = ({
<Button
mt="lg"
onClick={openModal}
- c="feedback-negative"
+ variant="light"
+ color="negative"
>{t`Cancel migration`}</Button>
<Button
mt="lg"
@@ -123,7 +124,7 @@ export const MigrationInProgress = ({
<Flex justify="end" mt="3.5rem">
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={handleCancelMigration}
>{t`Cancel migration`}</Button>
</Flex>
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
index 5777193047a..e633513930d 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
@@ -54,10 +54,10 @@ export const MigrationSuccess = ({
</MigrationCard>
<Button
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
onClick={restartMigration}
disabled={isRestarting}
- px="0"
mt="1rem"
>{t`Restart the process`}</Button>
</>
diff --git a/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx b/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
index 7754cd4de04..6124381805c 100644
--- a/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
@@ -305,7 +305,7 @@ export const BaseSMTPConnectionForm = ({
label={t`Save changes`}
disabled={!dirty || !isValid || isSubmitting}
loading={isSubmitting}
- variant="brand"
+ variant="filled"
/>
</Flex>
</Stack>
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx
index dd16eb6a002..159e83ca292 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx
@@ -51,7 +51,7 @@ export const EmbeddingLegaleseModal = ({
<Group justify="right" mt="xl">
<Button
onClick={onClose}
- variant="outline"
+ variant="default"
disabled={loading}
>{t`Decline and go back`}</Button>
<Button
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecretKeyWidget.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecretKeyWidget.tsx
index bd6989dbb3a..e9a8e08941c 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecretKeyWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecretKeyWidget.tsx
@@ -54,7 +54,7 @@ export const EmbeddingSecretKeyWidget = () => {
{value ? (
<>
<Button
- variant="outline"
+ size="lg"
onClick={openModal}
style={{ flexShrink: 0 }}
>{t`Regenerate key`}</Button>
@@ -72,6 +72,7 @@ export const EmbeddingSecretKeyWidget = () => {
) : (
<Button
variant="filled"
+ size="lg"
onClick={generateToken}
style={{ flexShrink: 0 }}
>{t`Generate key`}</Button>
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/SameSiteSelectWidget.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/SameSiteSelectWidget.tsx
index 606d406467c..431ce4f1c0c 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/SameSiteSelectWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/SameSiteSelectWidget.tsx
@@ -6,7 +6,7 @@ import {
SetByEnvVarWrapper,
SettingHeader,
} from "metabase/settings-components";
-import { Box, Button, Group, Icon, Menu, Stack, Text } from "metabase/ui";
+import { Box, Button, Icon, Menu, Stack, Text } from "metabase/ui";
import type { SessionCookieSameSite } from "metabase-types/api";
import { EmbeddingAppSameSiteCookieDescription } from "./EmbeddingAppSameSiteCookieDescription";
@@ -75,11 +75,12 @@ export function SameSiteSelectWidget() {
shadow="sm"
>
<Menu.Target>
- <Button variant={opened ? "outline" : "default"}>
- <Group justify="space-between" miw="10rem">
- <span>{selectedOption?.name}</span>
- <Icon name="chevrondown" size="12" />
- </Group>
+ <Button
+ justify="space-between"
+ miw="10rem"
+ rightSection={<Icon name="chevrondown" size="12" />}
+ >
+ {selectedOption?.name}
</Button>
</Menu.Target>
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx
index d37f8a9485f..f89f9de7258 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx
@@ -16,7 +16,7 @@ export const NewEmbedButton = ({ forceIsGuest }: NewEmbedButtonProps) => {
return (
<Button
- variant="brand"
+ variant="filled"
size="sm"
onClick={() => {
dispatch(openEmbedJsWizard({ isGuest: forceIsGuest }));
diff --git a/frontend/src/metabase/admin/settings/components/LicenseInput/LicenseInput.tsx b/frontend/src/metabase/admin/settings/components/LicenseInput/LicenseInput.tsx
index e662c31ee48..5c1f625ceda 100644
--- a/frontend/src/metabase/admin/settings/components/LicenseInput/LicenseInput.tsx
+++ b/frontend/src/metabase/admin/settings/components/LicenseInput/LicenseInput.tsx
@@ -47,6 +47,7 @@ export const LicenseInput = ({
}
/>
<Button
+ size="lg"
disabled={isDisabled}
data-testid="activate-button"
onClick={handleActivate}
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/WebhooksSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/WebhooksSettingsPage.tsx
index af74b76bb1b..f5884e17acf 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/WebhooksSettingsPage.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/WebhooksSettingsPage.tsx
@@ -42,7 +42,6 @@ export const WebhooksSettingsPage = () => {
{hasChannels && (
<Button
variant="filled"
- size="md"
leftSection={<Icon name="add" />}
onClick={() => setWebhookModal("create")}
>{c("Short for 'Add another webhook'").t`Add another`}</Button>
diff --git a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
index 855d508bd81..9038a7a829b 100644
--- a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
@@ -268,7 +268,7 @@ export function UploadSettingsFormView({
actionFn={handleDisableUploads}
type="button"
variant="filled"
- color="feedback-negative"
+ color="negative"
useLoadingSpinner
/>
)
diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
index 8202814bcd9..7950eb3143c 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
@@ -227,7 +227,7 @@ const ListMaps = ({ maps, onEditMap, onDeleteMap }: ListMapsProps) => {
<td className={AdminS.TableActions}>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={() => setMapIdToDelete(mapId)}
>{t`Remove`}</Button>
</td>
@@ -419,6 +419,7 @@ const EditMap = ({
/>
<Button
ml="sm"
+ size="lg"
disabled={!map.url}
variant={geoJson ? "default" : "filled"}
onClick={onLoadGeoJson}
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/AddMappingRow/AddMappingRow.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/AddMappingRow/AddMappingRow.tsx
index c3e4b4fe586..92022f20603 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/AddMappingRow/AddMappingRow.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/AddMappingRow/AddMappingRow.tsx
@@ -65,6 +65,7 @@ export function AddMappingRow({
<Group gap="lg">
<Button
variant="subtle"
+ color="neutral"
onClick={handleCancelClick}
>{t`Cancel`}</Button>
<Button
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/DeleteGroupMappingModal/DeleteGroupMappingModal.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/DeleteGroupMappingModal/DeleteGroupMappingModal.tsx
index a84a97da4ab..33295eeb4bd 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/DeleteGroupMappingModal/DeleteGroupMappingModal.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/DeleteGroupMappingModal/DeleteGroupMappingModal.tsx
@@ -123,11 +123,7 @@ export const DeleteGroupMappingModal = ({
<Group justify="flex-end">
<Button onClick={onHide}>{t`Cancel`}</Button>
- <Button
- variant="filled"
- color="feedback-negative"
- onClick={handleConfirm}
- >
+ <Button variant="filled" color="negative" onClick={handleConfirm}>
{submitButtonLabels[value]}
</Button>
</Group>
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
index 5b713c60a50..a2167264afb 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
@@ -172,12 +172,7 @@ export function GroupMappingsWidgetView({
py="sm"
>
{!showAddRow && (
- <Button
- variant="filled"
- size="sm"
- type="button"
- onClick={handleShowAddRow}
- >
+ <Button variant="filled" type="button" onClick={handleShowAddRow}>
{t`New mapping`}
</Button>
)}
diff --git a/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx b/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx
index 585da0edae3..b41e5e06fb6 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx
@@ -261,7 +261,7 @@ export const WebhookForm = ({
maw="21rem"
/>
<Button
- h="2.5rem"
+ size="lg"
onClick={() => handleTest(values, setFieldError)}
>
{testButtonLabel}
@@ -342,14 +342,13 @@ export const WebhookForm = ({
<Flex
mt="1.5rem"
justify={onDelete ? "space-between" : "end"}
+ align="center"
gap="0.75rem"
>
{onDelete && (
<Button
- variant="subtle"
- c="text-secondary"
+ variant="transparent"
size="compact-md"
- pl="0"
leftSection={<Icon name="trash" />}
onClick={onDelete}
>{t`Delete this destination`}</Button>
@@ -359,7 +358,7 @@ export const WebhookForm = ({
<FormSubmitButton
disabled={!dirty}
label={submitLabel}
- variant="brand"
+ variant="filled"
/>
</Group>
</Flex>
diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css
index b333c4c792b..df752ad13ba 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css
+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css
@@ -2,11 +2,6 @@
background-color: var(--mb-color-core-summarize);
}
-/* the default variant's translucent hover lets the banner color bleed through */
-.updateButton[data-variant="default"]:hover {
- background-color: var(--mb-color-background_page-secondary);
-}
-
.message {
padding: 1rem;
color: var(--mb-color-text-primary-inverse);
diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx
index 2af66afa637..f5a31865ff9 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx
@@ -82,11 +82,10 @@ function NewVersionAvailable({
{t`Metabase ${formatVersion(latestVersion)} is available. You're running ${currentVersion}.`}
</span>
<Button
- className={S.updateButton}
+ variant="on-dark-primary"
component={ExternalLink}
flex="0 0 auto"
ml="sm"
- size="sm"
href={
"https://www.metabase.com/docs/" +
latestVersion +
diff --git a/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx b/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx
index 5e653ade11f..af2f158e8d3 100644
--- a/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx
+++ b/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx
@@ -87,7 +87,8 @@ const SlackConnectionStatus = ({
</Flex>
<Button
- c="feedback-negative"
+ variant="light"
+ color="negative"
onClick={handleOpen}
>{t`Disconnect`}</Button>
</Flex>
diff --git a/frontend/src/metabase/archive/components/ArchivedEntityBanner/BannerButton.tsx b/frontend/src/metabase/archive/components/ArchivedEntityBanner/BannerButton.tsx
index 38b44d63c9a..8315d9b7532 100644
--- a/frontend/src/metabase/archive/components/ArchivedEntityBanner/BannerButton.tsx
+++ b/frontend/src/metabase/archive/components/ArchivedEntityBanner/BannerButton.tsx
@@ -1,4 +1,4 @@
-import { Button, FixedSizeIcon, Flex, Text } from "metabase/ui";
+import { Button, FixedSizeIcon, Text } from "metabase/ui";
import type { IconName } from "metabase-types/api";
interface BannerButtonProps {
@@ -13,21 +13,13 @@ export const BannerButton = ({
onClick,
}: BannerButtonProps) => (
<Button
- size="compact-md"
- variant="outline"
- color="text-primary-inverse"
- miw="2rem"
- h="2rem"
+ size="md"
+ variant="on-dark-secondary"
+ leftSection={<FixedSizeIcon size={12} name={iconName} />}
onClick={onClick}
>
- <Flex align="center" gap="sm">
- <FixedSizeIcon size={12} name={iconName} />
- <Text
- color="text-primary-inverse"
- display={{ base: "none", sm: "inline" }}
- >
- {children}
- </Text>
- </Flex>
+ <Text c="inherit" display={{ base: "none", sm: "inline" }}>
+ {children}
+ </Text>
</Button>
);
diff --git a/frontend/src/metabase/auth/components/LoginForm/LoginForm.tsx b/frontend/src/metabase/auth/components/LoginForm/LoginForm.tsx
index 24eb3a4cbe9..bf66c1ae067 100644
--- a/frontend/src/metabase/auth/components/LoginForm/LoginForm.tsx
+++ b/frontend/src/metabase/auth/components/LoginForm/LoginForm.tsx
@@ -79,7 +79,12 @@ export const LoginForm = ({
{!hasSessionCookies && (
<FormCheckbox name="remember" label={t`Remember me`} mb="1.25rem" />
)}
- <FormSubmitButton label={t`Sign in`} variant="filled" w="100%" />
+ <FormSubmitButton
+ label={t`Sign in`}
+ variant="filled"
+ size="lg"
+ w="100%"
+ />
<FormErrorMessage mt="1rem" />
</Form>
</FormProvider>
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index 23633e9ef16..98a719cf7de 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -5,6 +5,7 @@ import _ from "underscore";
import NoResults from "assets/img/metrics_bot.svg";
import { skipToken } from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
+import { ExternalLink } from "metabase/common/components/ExternalLink";
import { ForwardRefLink, Link } from "metabase/common/components/Link";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";
@@ -167,11 +168,11 @@ function MetricsEmptyState({
</Text>
<Flex pt="lg" align="center" justify="center" gap="lg">
{showMetabaseLinks && (
- <Link
- target="_blank"
- to={metricsDocsLink}
- variant="brandBold"
- >{t`Read the docs`}</Link>
+ <Button
+ component={ExternalLink}
+ href={metricsDocsLink}
+ variant="subtle"
+ >{t`Read the docs`}</Button>
)}
{canCreateMetric && (
<Button
diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsx
index 42147454e2f..df112a639e4 100644
--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx
+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx
@@ -391,15 +391,14 @@ function MenuCell({ metric }: { metric?: MetricResult }) {
>
<Menu position="bottom-end">
<Menu.Target>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- size="xs"
variant="subtle"
- px="sm"
+ color="neutral"
+ size="sm"
aria-label={t`Metric options`}
- c="text-primary"
- >
- <Icon name="ellipsis" />
- </Button>
+ leftSection={<Icon name="ellipsis" />}
+ />
</Menu.Target>
<Menu.Dropdown>
{actions.map((action) => (
diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsx
index a704b705f83..51197b490eb 100644
--- a/frontend/src/metabase/browse/models/BrowseModels.tsx
+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx
@@ -139,9 +139,11 @@ export const BrowseModels = () => {
>{t`Models are somewhat like virtual tables: do all your joins and custom columns once, save it as a model, then query it like a table.`}</Text>
</Stack>
{showMetabaseLinks && (
- <Button variant="subtle" p={0}>
- <ExternalLink href={url}>{t`Read the docs`}</ExternalLink>
- </Button>
+ <Button
+ component={ExternalLink}
+ href={url}
+ variant="subtle"
+ >{t`Read the docs`}</Button>
)}
</Stack>
) : (
diff --git a/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx b/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx
index 45c00ef8732..bf283e99ea4 100644
--- a/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx
+++ b/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx
@@ -48,13 +48,20 @@ export const ModelExplanationBanner = () => {
<Text size="md" lh="1.25rem">
{t`Models are somewhat like virtual tables: do all your joins and custom columns once, save it as a model, then query it like a table.`}
</Text>
- <Group gap="lg">
+ <Group gap="xl">
{showMetabaseLinks && (
- <Button variant="subtle" p={0}>
- <ExternalLink href={url}>{t`Read the docs`}</ExternalLink>
- </Button>
+ <Button
+ component={ExternalLink}
+ href={url}
+ variant="transparent"
+ size="compact-md"
+ >{t`Read the docs`}</Button>
)}
- <Button variant="subtle" p={0} onClick={dismissBanner}>
+ <Button
+ variant="transparent"
+ size="compact-md"
+ onClick={dismissBanner}
+ >
{t`Dismiss`}
</Button>
</Group>
diff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/UnarchivedBulkActions.tsx b/frontend/src/metabase/collections/components/CollectionBulkActions/UnarchivedBulkActions.tsx
index d5e0bf581e3..2f8d2be6abc 100644
--- a/frontend/src/metabase/collections/components/CollectionBulkActions/UnarchivedBulkActions.tsx
+++ b/frontend/src/metabase/collections/components/CollectionBulkActions/UnarchivedBulkActions.tsx
@@ -76,9 +76,10 @@ export const UnarchivedBulkActions = ({
)}
<Menu position="top-end">
<Menu.Target>
- <BulkActionButton aria-label={t`More actions`} px="sm">
- <Icon name="ellipsis" />
- </BulkActionButton>
+ <BulkActionButton
+ aria-label={t`More actions`}
+ leftSection={<Icon name="ellipsis" />}
+ />
</Menu.Target>
<Menu.Dropdown data-testid="bulk-actions-menu">
{isPinnedOnly && (
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionTypeFilter.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionTypeFilter.tsx
index fe24bc2023b..5bcbc25a72e 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionTypeFilter.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionTypeFilter.tsx
@@ -68,7 +68,7 @@ export function CollectionTypeFilter({
>
<Popover.Target>
<Button
- variant="default"
+ size="lg"
leftSection={<Icon name="filter" aria-hidden />}
onClick={toggle}
aria-label={isFiltering ? t`Filter, filters applied` : undefined}
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
index 45fadb0f159..3b47c2e55e9 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
@@ -87,7 +87,8 @@ const DefaultCollectionEmptyState = ({
<NewItemMenu
trigger={
<Button
- variant="outline"
+ variant="filled"
+ size="lg"
leftSection={<Icon name="add" />}
w="12.5rem"
onClick={() => trackCollectionNewButtonClicked()}
diff --git a/frontend/src/metabase/common/collections/components/QuestionMoveConfirmModal.tsx b/frontend/src/metabase/common/collections/components/QuestionMoveConfirmModal.tsx
index a8fa52b592f..7ca67df47fc 100644
--- a/frontend/src/metabase/common/collections/components/QuestionMoveConfirmModal.tsx
+++ b/frontend/src/metabase/common/collections/components/QuestionMoveConfirmModal.tsx
@@ -161,7 +161,7 @@ export const QuestionMoveConfirmModal = ({
<Flex justify="space-between" mt="1rem">
<Text c="feedback-negative">{errorMessage}</Text>
<Flex justify="end" gap="1rem">
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<Button variant="filled" onClick={onConfirm}>
diff --git a/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
index 2f9c75bfdb0..2b59b2fb9f8 100644
--- a/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
+++ b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
@@ -250,6 +250,7 @@ export function FormCollectionAndDashboardPicker({
ref={buttonRef}
id={id}
onClick={() => setIsPickerOpen(true)}
+ size="lg"
fullWidth
rightSection={<Icon name="ellipsis" />}
styles={{
diff --git a/frontend/src/metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx b/frontend/src/metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
index 3771ea10bea..8560d8629ad 100644
--- a/frontend/src/metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
+++ b/frontend/src/metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
@@ -160,6 +160,7 @@ function FormCollectionPicker({
{...rest}
>
<Button
+ size="lg"
data-testid="collection-picker-button"
id={id}
onClick={() => setIsPickerOpen(true)}
diff --git a/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx b/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx
index a3441e65b36..0e20abcf985 100644
--- a/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx
+++ b/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx
@@ -10,14 +10,7 @@ import {
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import {
- Button,
- type ButtonProps,
- Center,
- Group,
- Icon,
- Loader,
-} from "metabase/ui";
+import { Button, type ButtonProps, Center, Icon, Loader } from "metabase/ui";
export interface ActionButtonProps extends Omit<ButtonProps, "onClick"> {
// need to expose this ref to allow Tooltip to bind to the correct element
@@ -116,9 +109,13 @@ export const ActionButton = forwardRef<ActionButtonHandle, ActionButtonProps>(
const actionStatus = active ? "pending" : (result ?? "idle");
const resultProps: Partial<ButtonProps> =
result === "success"
- ? { variant: "filled", color: "feedback-positive" }
+ ? {
+ variant: "filled",
+ color: "positive",
+ leftSection: <Icon name="check" />,
+ }
: result === "failed"
- ? { variant: "filled", color: "feedback-negative" }
+ ? { variant: "filled", color: "negative" }
: {};
return (
@@ -141,10 +138,7 @@ export const ActionButton = forwardRef<ActionButtonHandle, ActionButtonProps>(
activeText
)
) : result === "success" ? (
- <Group align="center" gap="sm">
- <Icon name="check" />
- <span>{successText}</span>
- </Group>
+ successText
) : result === "failed" ? (
failedText
) : (
diff --git a/frontend/src/metabase/common/components/ArchiveModal/ArchiveModal.tsx b/frontend/src/metabase/common/components/ArchiveModal/ArchiveModal.tsx
index 93568cae17a..98bc6c607fc 100644
--- a/frontend/src/metabase/common/components/ArchiveModal/ArchiveModal.tsx
+++ b/frontend/src/metabase/common/components/ArchiveModal/ArchiveModal.tsx
@@ -54,7 +54,7 @@ export const ArchiveModal = ({
</Box>
<Button onClick={onClose}>{t`Cancel`}</Button>
<FormSubmitButton
- color="feedback-negative"
+ color="negative"
variant="filled"
label={archiveButtonLabel}
activeLabel={archiveButtonLabel}
diff --git a/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.module.css b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.module.css
index 85957a15ad6..f0067ce92d0 100644
--- a/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.module.css
+++ b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.module.css
@@ -1,7 +1,9 @@
.triggerButton {
+ --bucket-trigger-color: var(--mb-color-text-disabled-inverse);
+ --bucket-trigger-hover-color: var(--mb-color-text-primary-inverse);
+
border-radius: 0;
visibility: hidden;
- color: var(--mb-color-text-disabled-inverse);
border-left: 2px solid var(--mb-color-border-neutral-subtle);
}
@@ -9,19 +11,19 @@
visibility: visible;
}
-.triggerButton:hover {
- color: var(--mb-color-text-primary-inverse);
-}
-
/* No hover on touch devices, so always show the button with readable text */
@media (hover: none) and (pointer: coarse) {
.triggerButton {
- visibility: visible;
- color: var(--select-list-item-text-color, var(--mb-color-core-brand));
- }
+ --bucket-trigger-color: var(
+ --select-list-item-text-color,
+ var(--mb-color-core-brand)
+ );
+ --bucket-trigger-hover-color: var(
+ --select-list-item-text-color,
+ var(--mb-color-core-brand)
+ );
- .chevronIcon {
- color: var(--select-list-item-text-color, var(--mb-color-core-brand));
+ visibility: visible;
}
}
@@ -31,7 +33,6 @@
}
.chevronIcon {
- color: var(--mb-color-text-primary-inverse);
flex: 0 0 auto;
}
diff --git a/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx
index dc66cf458c1..19d9f139f4d 100644
--- a/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx
+++ b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx
@@ -33,6 +33,11 @@ export interface BucketPickerPopoverProps {
classNames?: { root?: string; chevronDown?: string };
}
+const TRIGGER_BUTTON_VARS = {
+ "--button-color": "var(--bucket-trigger-color)",
+ "--button-hover-color": "var(--bucket-trigger-hover-color)",
+};
+
export function BucketPickerPopover({
triggerLabel,
ariaLabel,
@@ -97,21 +102,22 @@ export function BucketPickerPopover({
miw="35%"
maw="50%"
h="auto"
- py={0}
- variant="subtle"
- color="core-white"
+ size="compact-md"
+ variant="transparent"
+ vars={() => ({ root: TRIGGER_BUTTON_VARS })}
classNames={{ label: S.triggerButtonLabel }}
+ rightSection={
+ hasChevronDown ? (
+ <Icon
+ name="chevrondown"
+ className={cx(S.chevronDown, classNames.chevronDown)}
+ />
+ ) : (
+ <Icon name="chevronright" className={S.chevronIcon} />
+ )
+ }
>
<Ellipsified>{triggerLabel}</Ellipsified>
- {!hasChevronDown && (
- <Icon name="chevronright" className={S.chevronIcon} />
- )}
- {hasChevronDown && (
- <Icon
- name="chevrondown"
- className={cx(S.chevronDown, classNames.chevronDown)}
- />
- )}
</Button>
</Popover.Target>
<Popover.Dropdown
@@ -147,10 +153,9 @@ export function BucketPickerPopover({
className={S.moreButton}
onClick={handleExpand}
variant="subtle"
- color="core-brand"
+ color="brand"
fullWidth
px="lg"
- py="sm"
styles={{
inner: { display: "flex", justifyContent: "flex-start" },
}}
diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.module.css b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.module.css
deleted file mode 100644
index d30baeceec9..00000000000
--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.module.css
+++ /dev/null
@@ -1,68 +0,0 @@
-.BulkActionButton {
- color: var(--mb-color-text-primary-inverse);
- border-color: color-mix(
- in srgb,
- var(--mb-color-background_page-secondary),
- transparent 100%
- );
- background-color: color-mix(
- in srgb,
- var(--mb-color-background_page-secondary),
- transparent 90%
- );
-
- &:hover {
- color: var(--mb-color-text-primary-inverse);
- border-color: color-mix(
- in srgb,
- var(--mb-color-background_page-primary),
- transparent 100%
- );
- background-color: color-mix(
- in srgb,
- var(--mb-color-background_page-secondary),
- transparent 70%
- );
- }
-
- &:disabled,
- &:disabled:hover {
- color: var(--mb-color-text-disabled-inverse);
- border-color: color-mix(
- in srgb,
- var(--mb-color-background_surface-disabled-inverse),
- transparent 100%
- );
- background-color: var(--mb-color-background_surface-disabled-inverse);
- }
-}
-
-.BulkActionDangerButton {
- &:hover {
- color: var(--mb-color-text-primary-inverse);
- border-color: color-mix(
- in srgb,
- var(--mb-color-background_page-primary),
- transparent 100%
- );
- background-color: var(--mb-color-feedback-negative);
- }
-
- &:disabled:hover {
- color: var(--mb-color-text-disabled);
- border-color: color-mix(
- in srgb,
- var(--mb-color-background_page-primary),
- transparent 100%
- );
- background-color: color-mix(
- in srgb,
- var(--mb-color-background_page-primary),
- transparent 90%
- );
- }
-}
-
-.BulkActionButtonLabel {
- display: inline-flex;
-}
diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx
index 8e653c1a22d..bdc28b34795 100644
--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx
+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx
@@ -17,8 +17,8 @@ export const BulkActionsToast = styled.div<{ isNavbarOpen: boolean }>`
// Unjustified type cast. FIXME
export const ToastCard = styled(Card)`
- background-color: var(--mb-color-background_page-primary-inverse);
- color: var(--mb-color-text-primary-inverse);
+ background-color: var(--mb-color-tooltip-background);
+ color: var(--mb-color-tooltip-text);
padding: 0.75rem var(--mantine-spacing-lg);
display: flex;
flex-direction: row;
diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx
index 536cfe71e85..4271abf97ce 100644
--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx
+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx
@@ -49,7 +49,7 @@ export const BulkActionBarPortal = ({
className={cx(className, Animation.popToast)}
>
<ToastCard data-testid="toast-card" {...props}>
- {message && <Text color="text-primary-inverse">{message}</Text>}
+ {message && <Text c="tooltip-text">{message}</Text>}
<Flex gap="sm" align="center">
{children}
</Flex>
diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionButton.tsx b/frontend/src/metabase/common/components/BulkActionBar/BulkActionButton.tsx
index 9be4c2f64f2..4229f325bef 100644
--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionButton.tsx
+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionButton.tsx
@@ -1,10 +1,7 @@
-import cx from "classnames";
import { forwardRef } from "react";
import { Button, type ButtonProps } from "metabase/ui";
-import S from "./BulkActionBar.module.css";
-
type BulkActionButtonProps = Omit<ButtonProps, "variant"> & {
danger?: boolean;
};
@@ -12,22 +9,14 @@ type BulkActionButtonProps = Omit<ButtonProps, "variant"> & {
export const BulkActionButton = forwardRef<
HTMLButtonElement,
BulkActionButtonProps
->(function BulkActionButton({ className, danger = false, ...props }, ref) {
+>(function BulkActionButton({ danger = false, c, disabled, ...props }, ref) {
return (
<Button
{...props}
ref={ref}
- variant="transparent"
- classNames={{
- root: cx(
- S.BulkActionButton,
- {
- [S.BulkActionDangerButton]: danger,
- },
- className,
- ),
- label: S.BulkActionButtonLabel,
- }}
+ disabled={disabled}
+ variant="on-dark-secondary"
+ c={danger && !disabled ? "feedback-negative" : c}
/>
);
});
diff --git a/frontend/src/metabase/common/components/ConfirmModal/ConfirmModal.tsx b/frontend/src/metabase/common/components/ConfirmModal/ConfirmModal.tsx
index a3a9e8f637d..db5ee4ea5cc 100644
--- a/frontend/src/metabase/common/components/ConfirmModal/ConfirmModal.tsx
+++ b/frontend/src/metabase/common/components/ConfirmModal/ConfirmModal.tsx
@@ -67,7 +67,7 @@ export const ConfirmModal = ({
</Button>
)}
<Button
- color="feedback-negative"
+ color="negative"
variant="filled"
data-autofocus
{...confirmButtonProps}
diff --git a/frontend/src/metabase/common/components/DocumentCopyForm/DocumentCopyForm.tsx b/frontend/src/metabase/common/components/DocumentCopyForm/DocumentCopyForm.tsx
index 9280a5a70aa..502d1b7ef86 100644
--- a/frontend/src/metabase/common/components/DocumentCopyForm/DocumentCopyForm.tsx
+++ b/frontend/src/metabase/common/components/DocumentCopyForm/DocumentCopyForm.tsx
@@ -74,7 +74,7 @@ export const DocumentCopyForm = ({
)}
<FormSubmitButton
label={c(`A verb, not a noun`).t`Duplicate`}
- variant="primary"
+ variant="filled"
/>
</FormFooter>
</Form>
diff --git a/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx b/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx
index 381adeb837c..8ae19d67b96 100644
--- a/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx
+++ b/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx
@@ -5,7 +5,6 @@ import styled from "@emotion/styled";
import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";
import { Icon } from "metabase/ui";
import { alpha } from "metabase/ui/colors";
-import { color } from "metabase/ui/utils/colors";
export const Root = styled(FullWidthContainer, {
shouldForwardProp: isPropValid,
@@ -28,29 +27,3 @@ export const Title = styled.span`
color: var(--mb-color-text-primary-inverse);
font-weight: 700;
`;
-
-/* restyles metabase/ui buttons for the colored bar: filled = primary, subtle = secondary */
-export const ButtonsContainer = styled("div", {
- shouldForwardProp: isPropValid,
-})<{ admin: boolean }>`
- display: flex;
-
- button[data-variant] {
- color: var(--mb-color-text-primary-inverse);
- background-color: ${() => alpha("background_page-primary", 0.1)};
- border: none;
- font-size: 1em;
- margin-left: 0.75em;
- }
-
- button[data-variant="filled"] {
- color: ${(props) => color(props.admin ? "text-primary" : "core-brand")};
- background-color: var(--mb-color-background_page-primary);
- }
-
- button[data-variant]:hover {
- color: var(--mb-color-text-primary-inverse);
- background-color: ${(props) =>
- color(props.admin ? "accent7" : "core-brand")};
- }
-`;
diff --git a/frontend/src/metabase/common/components/EditBar/EditBar.tsx b/frontend/src/metabase/common/components/EditBar/EditBar.tsx
index 790e4197244..cc3c101bede 100644
--- a/frontend/src/metabase/common/components/EditBar/EditBar.tsx
+++ b/frontend/src/metabase/common/components/EditBar/EditBar.tsx
@@ -1,8 +1,8 @@
import type { ReactNode } from "react";
-import { Group } from "metabase/ui";
+import { Flex, Group } from "metabase/ui";
-import { ButtonsContainer, EditIcon, Root, Title } from "./EditBar.styled";
+import { EditIcon, Root, Title } from "./EditBar.styled";
type Props = {
title: string;
@@ -32,7 +32,7 @@ export function EditBar({
<Title>{title}</Title>
</Group>
{center && <div>{center}</div>}
- <ButtonsContainer admin={admin}>{buttons}</ButtonsContainer>
+ <Flex gap="md">{buttons}</Flex>
</Root>
);
}
diff --git a/frontend/src/metabase/common/components/ErrorPages/BugReportModal.tsx b/frontend/src/metabase/common/components/ErrorPages/BugReportModal.tsx
index e1a26227ad2..6dd2b019a89 100644
--- a/frontend/src/metabase/common/components/ErrorPages/BugReportModal.tsx
+++ b/frontend/src/metabase/common/components/ErrorPages/BugReportModal.tsx
@@ -91,9 +91,8 @@ export const BugReportModal = ({
</Text>
</Stack>
<Button
- variant="subtle"
- p="0"
- fz="lg"
+ variant="transparent"
+ size="compact-md"
miw="fit-content"
onClick={() => setIsDetailsVisible(!isDetailsVisible)}
>
@@ -123,12 +122,8 @@ export const BugReportModal = ({
<Text>{t`Diagnostic info may contain sensitive data.`}</Text>
</Box>
<FormSubmitButton
- variant="outline"
label={c("This is a verb, not a noun").t`Download`}
- color="text-primary"
my="sm"
- px="xl"
- radius="sm"
/>
</Flex>
</Form>
diff --git a/frontend/src/metabase/common/components/ErrorPages/DownloadDiagnosticModal.tsx b/frontend/src/metabase/common/components/ErrorPages/DownloadDiagnosticModal.tsx
index 713d0d121cd..cb11853cf0d 100644
--- a/frontend/src/metabase/common/components/ErrorPages/DownloadDiagnosticModal.tsx
+++ b/frontend/src/metabase/common/components/ErrorPages/DownloadDiagnosticModal.tsx
@@ -73,11 +73,8 @@ export const DownloadDiagnosticModal = ({
<FormSubmitButton
variant="filled"
label={c("This is a verb, not a noun").t`Download`}
- color="core-brand"
mt="xl"
mb="sm"
- px="xl"
- radius="sm"
/>
<Text>{t`Diagnostic info may contain sensitive data.`}</Text>
</Form>
diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorPages.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorPages.tsx
index 0c400eb6236..1000d9b1e7f 100644
--- a/frontend/src/metabase/common/components/ErrorPages/ErrorPages.tsx
+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorPages.tsx
@@ -156,13 +156,14 @@ export const SmallGenericError = forwardRef<
>
<Tooltip label={tooltipMessage}>
{isEmbeddingIframe ? (
- <Icon name="warning" size={32} c="text-disabled" />
+ <Icon name="warning" c="text-disabled" />
) : (
<Button
- leftSection={<Icon name="warning" size={32} c="text-disabled" />}
- color="text-disabled"
+ variant="transparent"
+ size="compact-md"
+ color="neutral"
+ leftSection={<Icon name="warning" c="text-disabled" />}
onClick={openModal}
- variant="subtle"
/>
)}
</Tooltip>
diff --git a/frontend/src/metabase/common/components/Glossary/GlossaryTable.tsx b/frontend/src/metabase/common/components/Glossary/GlossaryTable.tsx
index af3601a3bfc..b01f4039c55 100644
--- a/frontend/src/metabase/common/components/Glossary/GlossaryTable.tsx
+++ b/frontend/src/metabase/common/components/Glossary/GlossaryTable.tsx
@@ -94,8 +94,6 @@ export function GlossaryTable({
</Text>
{!readOnly && (
<Button
- variant="default"
- size="sm"
leftSection={<Icon name="add" />}
onClick={() => {
if (editingId) {
diff --git a/frontend/src/metabase/common/components/ListFilterPopover/ListFilterPopover.tsx b/frontend/src/metabase/common/components/ListFilterPopover/ListFilterPopover.tsx
index b96bbe497d3..0cb8c5c5131 100644
--- a/frontend/src/metabase/common/components/ListFilterPopover/ListFilterPopover.tsx
+++ b/frontend/src/metabase/common/components/ListFilterPopover/ListFilterPopover.tsx
@@ -62,7 +62,6 @@ export const ListFilterPopover = ({
<Popover.Target>
<Indicator disabled={!hasActiveFilters} size={8} offset={8}>
<Button
- variant="default"
leftSection={<Icon name="filter" />}
aria-label={t`Show filters`}
onClick={handleTriggerClick}
@@ -75,9 +74,7 @@ export const ListFilterPopover = ({
<Stack gap="xxl" w={300}>
{children}
<Group gap="lg" grow>
- <Button variant="default" onClick={handleClear}>
- {t`Clear filters`}
- </Button>
+ <Button onClick={handleClear}>{t`Clear filters`}</Button>
<Button variant="filled" onClick={handleApply}>
{t`Apply`}
</Button>
diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx
index c59ff4856e5..5cadb961f35 100644
--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx
+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx
@@ -144,13 +144,17 @@ export const ConfirmMoveDashboardQuestionCandidatesModal = ({
<div />
)}
<Flex gap="lg" ml="1.5rem">
- <Button variant="subtle" onClick={onCancel}>{t`Cancel`}</Button>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={onCancel}
+ >{t`Cancel`}</Button>
<Button
loading={isMutating}
variant="filled"
onClick={onConfirm}
disabled={ctaDisabled}
- color={mutationError ? "feedback-negative" : "core-brand"}
+ color={mutationError ? "negative" : "brand"}
>
{t`Move these questions`}
</Button>
diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsInfoModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsInfoModal.tsx
index 204eb5d6525..c9734bd0e68 100644
--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsInfoModal.tsx
+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsInfoModal.tsx
@@ -35,7 +35,11 @@ export const MoveQuestionsIntoDashboardsInfoModal = ({
</List>
<Flex justify="flex-end" gap="lg" pt="1rem">
- <Button variant="subtle" onClick={onCancel}>{t`Cancel`}</Button>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={onCancel}
+ >{t`Cancel`}</Button>
<Button variant="filled" onClick={onConfirm}>
{t`Preview the changes`}
</Button>
diff --git a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
index caded201f2b..c287fa4caba 100644
--- a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
+++ b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
@@ -205,21 +205,18 @@ export const QuestionDownloadWidget = ({
{t`Read the docs`}
</Link>
</Text>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
aria-label={t`Close hint`}
- pl={8}
- pr={0}
variant="subtle"
- size="compact-md"
+ color="neutral"
+ size="sm"
style={{ flexShrink: 0 }}
- >
- <Icon
- name="close"
- c="text-secondary"
- tooltip={t`Don't show me this again.`}
- onClick={() => setDismissedExcelPivotExportsBanner(true)}
- />
- </Button>
+ leftSection={
+ <Icon name="close" tooltip={t`Don't show me this again.`} />
+ }
+ onClick={() => setDismissedExcelPivotExportsBanner(true)}
+ />
</Flex>
)}
{hasTruncatedResults && (
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
index dcc82034747..283de31435b 100644
--- a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
@@ -96,15 +96,17 @@ export function RevisionHistoryTimeline({
<Flex>
{revision && canWrite && isNotFirstEvent && (
<Tooltip label={t`Revert to this version`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
className={S.revertButton}
variant="subtle"
+ color="neutral"
+ size="sm"
onClick={() => handleRevert(revision)}
data-testid="question-revert-button"
aria-label={t`revert to ${title}`}
- >
- <Icon name="revert" />
- </Button>
+ leftSection={<Icon name="revert" />}
+ />
</Tooltip>
)}
</Flex>
diff --git a/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
index a1d4bb50f73..a942616a6c4 100644
--- a/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
+++ b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
@@ -17,7 +17,6 @@ import {
Icon,
Loader,
Stack,
- rem,
} from "metabase/ui";
import { modelToUrl } from "metabase/urls";
import { isSyncCompleted } from "metabase/utils/syncing";
@@ -246,9 +245,11 @@ export function SearchResult({
)}
{showXRayButton && (
<Box className={S.xraySection} pos="relative">
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- w={rem(32)}
- h={rem(32)}
+ variant="subtle"
+ color="neutral"
+ size="sm"
leftSection={<Icon name="bolt" />}
onClick={onXRayClick}
/>
diff --git a/frontend/src/metabase/common/components/Sidebar/Sidebar.tsx b/frontend/src/metabase/common/components/Sidebar/Sidebar.tsx
index e9b66337e26..d9df3a249d9 100644
--- a/frontend/src/metabase/common/components/Sidebar/Sidebar.tsx
+++ b/frontend/src/metabase/common/components/Sidebar/Sidebar.tsx
@@ -51,25 +51,24 @@ export function Sidebar({
{onRemove && (
<Tooltip label={removeTooltip} disabled={!removeTooltip}>
{/* without a div we will need hacks to make tooltip work */}
- <div>
+ <Box display="flex">
<Button
leftSection={<Icon name="trash" />}
- variant="subtle"
- color="feedback-negative"
+ variant="transparent"
+ color="negative"
disabled={isRemoveDisabled}
onClick={onRemove}
- style={{ paddingLeft: 0, paddingRight: 0 }}
size="compact-md"
role="button"
aria-label={t`Remove`}
>{t`Remove`}</Button>
- </div>
+ </Box>
</Tooltip>
)}
{onCancel && (
<Button
- variant="subtle"
- color="text-secondary"
+ variant="transparent"
+ size="compact-md"
onClick={onCancel}
aria-label={t`Cancel`}
>{t`Cancel`}</Button>
diff --git a/frontend/src/metabase/common/components/Sidesheet/SidesheetButton.tsx b/frontend/src/metabase/common/components/Sidesheet/SidesheetButton.tsx
index dc36dd52355..aecd78d64bf 100644
--- a/frontend/src/metabase/common/components/Sidesheet/SidesheetButton.tsx
+++ b/frontend/src/metabase/common/components/Sidesheet/SidesheetButton.tsx
@@ -1,7 +1,7 @@
-import { Button, type ButtonProps, Flex, Icon } from "metabase/ui";
+import { Button, type ButtonProps, Icon } from "metabase/ui";
export const SidesheetButton = (props: ButtonProps) => (
- <Button variant="subtle" p={0} {...props} />
+ <Button variant="transparent" size="compact-md" {...props} />
);
export const SidesheetButtonWithChevron = ({
@@ -9,12 +9,10 @@ export const SidesheetButtonWithChevron = ({
...props
}: ButtonProps) => (
<SidesheetButton
- styles={props.fullWidth ? { label: { width: "100%" } } : undefined}
+ justify="space-between"
+ rightSection={<Icon name="chevronright" />}
{...props}
>
- <Flex justify="space-between" gap="sm">
- {children}
- <Icon name="chevronright" c="text-primary" />
- </Flex>
+ {children}
</SidesheetButton>
);
diff --git a/frontend/src/metabase/common/components/Sidesheet/SidesheetSubPage.tsx b/frontend/src/metabase/common/components/Sidesheet/SidesheetSubPage.tsx
index 0231a987d1e..42151727d7b 100644
--- a/frontend/src/metabase/common/components/Sidesheet/SidesheetSubPage.tsx
+++ b/frontend/src/metabase/common/components/Sidesheet/SidesheetSubPage.tsx
@@ -1,6 +1,6 @@
import type React from "react";
-import { Button, Flex, Icon, type ModalOverlayProps, Title } from "metabase/ui";
+import { Button, Icon, type ModalOverlayProps } from "metabase/ui";
import { Sidesheet, type SidesheetSize } from "./Sidesheet";
@@ -26,11 +26,16 @@ export const SidesheetSubPageTitle = ({
onClick,
}: SidesheetSubPageTitleProps) => {
return (
- <Button variant="subtle" onClick={onClick} p={0}>
- <Flex align="center" justify="center" gap="lg">
- <Icon name="chevronleft" />
- <Title order={3}>{title}</Title>
- </Flex>
+ <Button
+ variant="transparent"
+ size="compact-md"
+ h="auto"
+ fz="inherit"
+ lh="inherit"
+ leftSection={<Icon name="chevronleft" />}
+ onClick={onClick}
+ >
+ {title}
</Button>
);
};
diff --git a/frontend/src/metabase/common/components/Toaster/Toaster.module.css b/frontend/src/metabase/common/components/Toaster/Toaster.module.css
index 856811f71e7..b8db8f50f12 100644
--- a/frontend/src/metabase/common/components/Toaster/Toaster.module.css
+++ b/frontend/src/metabase/common/components/Toaster/Toaster.module.css
@@ -57,54 +57,6 @@
overflow-wrap: anywhere;
}
-.button {
- padding: var(--mantine-spacing-xxs) var(--mantine-spacing-sm);
- border-radius: var(--mantine-radius-xs);
- font-size: var(--mantine-font-size-sm);
- font-weight: bold;
- line-height: var(--mantine-line-height-lg);
- white-space: nowrap;
- flex-shrink: 0;
- cursor: pointer;
- transition: background-color 200ms ease;
- box-shadow: var(--mantine-shadow-xs_outline);
-}
-
-.button:disabled {
- background-color: var(--mb-color-button-on_dark-disabled);
- color: var(--mb-color-button-label-on_dark-disabled);
- border: none;
- box-shadow: none;
- cursor: default;
-}
-
-.primary {
- background-color: var(--mb-color-button-on_dark-primary-default);
- color: var(--mb-color-button-label-on_dark-primary);
-}
-
-.primary:hover:not(:disabled) {
- background-color: var(--mb-color-button-on_dark-primary-hover);
-}
-
-.primary:active:not(:disabled) {
- background-color: var(--mb-color-button-on_dark-primary-pressed);
-}
-
-.secondary {
- background-color: var(--mb-color-button-on_dark-secondary-default);
- color: var(--mb-color-button-label-on_dark-secondary);
- border: 0.5px solid var(--mb-color-border-on_dark);
-}
-
-.secondary:hover:not(:disabled) {
- background-color: var(--mb-color-button-on_dark-secondary-hover);
-}
-
-.secondary:active:not(:disabled) {
- background-color: var(--mb-color-button-on_dark-secondary-pressed);
-}
-
.dismiss {
width: 1.5rem;
height: 1.5rem;
diff --git a/frontend/src/metabase/common/components/Toaster/Toaster.tsx b/frontend/src/metabase/common/components/Toaster/Toaster.tsx
index c083f4c0085..419b16034e9 100644
--- a/frontend/src/metabase/common/components/Toaster/Toaster.tsx
+++ b/frontend/src/metabase/common/components/Toaster/Toaster.tsx
@@ -3,14 +3,7 @@ import type { HTMLAttributes, ReactNode } from "react";
import { useEffect, useState } from "react";
import { t } from "ttag";
-import {
- Group,
- Icon,
- Notification,
- Portal,
- Text,
- UnstyledButton,
-} from "metabase/ui";
+import { Button, Group, Icon, Notification, Portal, Text } from "metabase/ui";
import S from "./Toaster.module.css";
@@ -89,22 +82,24 @@ export const Toast = ({
{hasActions && (
<Group gap="sm" align="center" wrap="nowrap">
{onConfirm && (
- <UnstyledButton
- className={cx(S.button, S.primary)}
+ <Button
+ variant="on-dark-primary"
+ size="sm"
onClick={onConfirm}
aria-label={confirmAriaLabel}
>
{confirmText}
- </UnstyledButton>
+ </Button>
)}
{secondaryText && onSecondary && (
- <UnstyledButton
- className={cx(S.button, S.secondary)}
+ <Button
+ variant="on-dark-secondary"
+ size="sm"
onClick={onSecondary}
aria-label={secondaryAriaLabel}
>
{secondaryText}
- </UnstyledButton>
+ </Button>
)}
{rightSection}
</Group>
diff --git a/frontend/src/metabase/common/components/UndoListing.tsx b/frontend/src/metabase/common/components/UndoListing.tsx
index 31c0abba5eb..a647bffa874 100644
--- a/frontend/src/metabase/common/components/UndoListing.tsx
+++ b/frontend/src/metabase/common/components/UndoListing.tsx
@@ -128,7 +128,7 @@ function UndoToast({
}}
/>
)}
- <Flex align="flex-start" justify="space-between">
+ <Flex align="flex-start" justify="space-between" gap="sm">
<Flex className={S.message} align="flex-start" maw="75ch">
{undo.icon && (
<Icon
@@ -151,9 +151,8 @@ function UndoToast({
{undo.actions && undo.actions.length > 0 && (
<Button
className={S.actionButton}
- variant="transparent"
- color="text-secondary-inverse"
- size="compact-md"
+ variant="default"
+ size="sm"
onClick={onUndo}
>
{undo.actionLabel ?? t`Undo`}
@@ -162,9 +161,8 @@ function UndoToast({
{undo.extraAction && (
<Button
className={S.actionButton}
- variant="transparent"
- color="text-secondary-inverse"
- size="compact-md"
+ variant="default"
+ size="sm"
onClick={() => {
undo.extraAction?.action();
if (undo.canDismiss) {
diff --git a/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/StoragePurchaseButton.tsx b/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/StoragePurchaseButton.tsx
index c28f27a74ac..fa1d2ee3770 100644
--- a/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/StoragePurchaseButton.tsx
+++ b/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/StoragePurchaseButton.tsx
@@ -53,7 +53,7 @@ export const StoragePurchaseButton = ({ location }: { location: string }) => {
};
return (
- <Button variant="default" leftSection={<UpsellGem />} {...props}>
+ <Button leftSection={<UpsellGem />} {...props}>
{/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Storage, only visible to admins */}
{t`Add Metabase Storage`}
</Button>
diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalError.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalError.tsx
index 8a163de9745..003cd104f43 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalError.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalError.tsx
@@ -30,7 +30,7 @@ export function UpgradeModalError({ onClose }: UpgradeModalErrorProps) {
</Stack>
<Flex justify="center" w="100%">
- <Button variant="filled" color="core-brand" onClick={onClose}>
+ <Button variant="filled" color="brand" onClick={onClose}>
{t`Close`}
</Button>
</Flex>
diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalInitial.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalInitial.tsx
index e2220e95bec..356b8be6bd1 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalInitial.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalInitial.tsx
@@ -129,10 +129,10 @@ export function UpgradeModalInitial({
)}
<Flex justify="flex-end" gap="lg">
- <Button variant="subtle" onClick={onCancel}>
+ <Button variant="subtle" color="neutral" onClick={onCancel}>
{t`Cancel`}
</Button>
- <Button variant="filled" color="core-brand" onClick={onConfirm}>
+ <Button variant="filled" color="brand" onClick={onConfirm}>
{buttonText}
</Button>
</Flex>
diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsx
index a273000c7d8..9ee73e2de53 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsx
@@ -43,7 +43,7 @@ export function UpgradeModalLoading({
</Stack>
<Flex justify="center" w="100%">
- <Button variant="filled" color="core-brand" disabled>
+ <Button variant="filled" color="brand" disabled>
{t`Done`}
</Button>
</Flex>
@@ -82,7 +82,7 @@ export function UpgradeModalLoading({
<Flex justify="center" w="100%">
<Button
variant="filled"
- color="core-brand"
+ color="brand"
onClick={() => {
onDone();
window.location.reload();
diff --git a/frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
index ad5b3dd6530..d514156d953 100644
--- a/frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
+++ b/frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
@@ -48,9 +48,13 @@ export function DateFilterPicker({
readOnly={readOnly}
renderSubmitButton={() => {
return (
- <Flex justify="space-between" w="100%">
+ <Flex justify="space-between" align="center" w="100%">
{onClear ? (
- <Button variant="subtle" c="text-secondary" onClick={onClear}>
+ <Button
+ variant="transparent"
+ size="compact-md"
+ onClick={onClear}
+ >
{t`Clear`}
</Button>
) : (
@@ -63,7 +67,9 @@ export function DateFilterPicker({
renderBackButton={() =>
onBack ? (
<PopoverBackButton
- p="sm"
+ px="sm"
+ py="md"
+ h="auto"
onClick={onBack}
disabled={readOnly}
withArrow={!readOnly}
diff --git a/frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
index 450e99cb88b..7e9b7155028 100644
--- a/frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
+++ b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
@@ -24,7 +24,6 @@ export function FilterOperatorPicker<T extends Lib.FilterOperator>({
<Menu>
<Menu.Target>
<Button
- fw="normal"
rightSection={<Icon name="chevrondown" />}
aria-label={t`Filter operator`}
className={S.root}
diff --git a/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx
index 2b792450896..6b8e9196bd0 100644
--- a/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx
+++ b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx
@@ -22,9 +22,14 @@ export function FilterPickerFooter({
children,
}: FilterPickerFooterProps) {
return (
- <Flex className={S.FilterFooterRoot} p="lg" justify="space-between">
+ <Flex
+ className={S.FilterFooterRoot}
+ p="lg"
+ justify="space-between"
+ align="center"
+ >
{onClear ? (
- <Button variant="subtle" c="text-secondary" onClick={onClear}>
+ <Button variant="transparent" size="compact-md" onClick={onClear}>
{t`Clear`}
</Button>
) : isValidElement(children) ? (
diff --git a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
index e3f0f8ae90d..ece4085ba56 100644
--- a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
@@ -117,7 +117,7 @@ export function ActionSidebar() {
<Flex justify="space-between" py="xxs">
<Ellipsified fw="bold">{dashcard.action.name}</Ellipsified>
<Button
- h="auto"
+ size="compact-md"
variant="transparent"
onClick={openActionModal}
flex="0 0 auto"
diff --git a/frontend/src/metabase/dashboard/components/ActionViz/ActionButton.styled.tsx b/frontend/src/metabase/dashboard/components/ActionViz/ActionButton.styled.tsx
index bb8c06bc114..ec9697861fa 100644
--- a/frontend/src/metabase/dashboard/components/ActionViz/ActionButton.styled.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionViz/ActionButton.styled.tsx
@@ -5,10 +5,3 @@ export const FullContainer = styled.div`
width: 100%;
height: 100%;
`;
-
-export const StyledButtonContent = styled.div`
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 0.5rem;
-`;
diff --git a/frontend/src/metabase/dashboard/components/ActionViz/ActionButtonView.tsx b/frontend/src/metabase/dashboard/components/ActionViz/ActionButtonView.tsx
index 03a8051d274..f04fe56fed0 100644
--- a/frontend/src/metabase/dashboard/components/ActionViz/ActionButtonView.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionViz/ActionButtonView.tsx
@@ -1,21 +1,25 @@
import { t } from "ttag";
-import { Button, Ellipsified, Icon } from "metabase/ui";
-import type { ColorName } from "metabase/ui/colors/types";
+import {
+ Button,
+ type ButtonColor,
+ type ButtonVariant,
+ Ellipsified,
+ Icon,
+} from "metabase/ui";
import type { VisualizationProps } from "metabase/visualizations/types";
import type { IconName } from "metabase-types/api";
import S from "./ActionButton.module.css";
-import { StyledButtonContent } from "./ActionButton.styled";
const BUTTON_VARIANT_PROPS: Record<
string,
- { variant: string; color?: ColorName }
+ { variant: ButtonVariant; color?: ButtonColor }
> = {
default: { variant: "default" },
primary: { variant: "filled" },
- danger: { variant: "filled", color: "feedback-negative" },
- success: { variant: "filled", color: "feedback-positive" },
+ danger: { variant: "filled", color: "negative" },
+ success: { variant: "filled", color: "positive" },
borderless: { variant: "subtle" },
};
@@ -54,11 +58,9 @@ function ActionButtonView({
onClick={onClick}
fullWidth
aria-label={tooltip}
+ leftSection={icon ? <Icon name={icon} /> : undefined}
>
- <StyledButtonContent>
- {icon && <Icon name={icon} />}
- <Ellipsified>{label ?? t`Click me`}</Ellipsified>
- </StyledButtonContent>
+ <Ellipsified>{label ?? t`Click me`}</Ellipsified>
</Button>
);
}
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarMainView/ClickBehaviorSidebarMainView.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarMainView/ClickBehaviorSidebarMainView.tsx
index 395bebb4597..0844ca11d33 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarMainView/ClickBehaviorSidebarMainView.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarMainView/ClickBehaviorSidebarMainView.tsx
@@ -10,7 +10,6 @@ import S from "../ClickBehaviorSidebar.module.css";
import { SidebarContent } from "../ClickBehaviorSidebarComponents";
import { CrossfilterOptions } from "../CrossfilterOptions";
import { LinkOptions } from "../LinkOptions/LinkOptions";
-import LinkOptionsS from "../LinkOptions/LinkOptions.module.css";
import { SidebarItem } from "../SidebarItem";
import { useClickBehaviorOptionName } from "../hooks";
import { clickBehaviorOptions } from "../utils";
@@ -88,9 +87,7 @@ export function ClickBehaviorSidebarMainView({
size="lg"
variant="filled"
justify="flex-start"
- classNames={{
- root: LinkOptionsS.ButtonRoot,
- }}
+ flex="1 1 auto"
>
<SidebarItem.Name>{clickBehaviorOptionName}</SidebarItem.Name>
</Button>
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
index d126dc6f598..43412b84991 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
@@ -21,7 +21,6 @@ import type {
} from "metabase-types/api";
import { clickBehaviorIsValid } from "metabase-types/guards";
-import LinkOptionsS from "../LinkOptions/LinkOptions.module.css";
import { SidebarItem } from "../SidebarItem";
import { CustomLinkText } from "./CustomLinkText";
@@ -79,9 +78,7 @@ export function CustomURLPicker({
leftSection={<Icon name="link" />}
size="lg"
variant="filled"
- classNames={{
- root: LinkOptionsS.ButtonRoot,
- }}
+ flex="1 1 auto"
onClick={openModal}
>
<SidebarItem.Name>
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.module.css b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.module.css
index 348895eabe4..4a5172b24a4 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.module.css
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.module.css
@@ -11,20 +11,3 @@
flex-grow: 1;
text-align: left;
}
-
-.ButtonRoot {
- flex: 1 1 auto;
- border-right-color: color-mix(
- in srgb,
- var(--mb-color-background_page-primary),
- transparent 25%
- );
-
- &[data-variant="filled"]:hover {
- border-right-color: color-mix(
- in srgb,
- var(--mb-color-background_page-primary),
- transparent 25%
- );
- }
-}
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx
index 69399073693..1d47e36d1fb 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx
@@ -90,8 +90,8 @@ function PickerControl({
rightSection={<Icon name="chevrondown" size={12} />}
size="lg"
variant="filled"
+ flex="1 1 auto"
classNames={{
- root: S.ButtonRoot,
label: S.ButtonLabel,
}}
w="100%"
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CancelEditButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CancelEditButton.tsx
index 85997d95ca7..99bc7131af8 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CancelEditButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CancelEditButton.tsx
@@ -12,7 +12,7 @@ export const CancelEditButton = (props: { onClick: () => void }) => {
]);
return (
- <Button key="cancel" variant="subtle" size="sm" onClick={props.onClick}>
+ <Button key="cancel" variant="on-dark-secondary" onClick={props.onClick}>
{t`Cancel`}
</Button>
);
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx
index dfe340790de..35539ed2543 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx
@@ -54,8 +54,7 @@ export const SaveEditButton = () => {
<span>
<ActionButton
actionFn={onSave}
- variant="filled"
- size="sm"
+ variant="on-dark-primary"
normalText={t`Save`}
activeText={t`Saving…`}
failedText={t`Save failed`}
diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx
index 48b993fd3a8..bcfc1c42114 100644
--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx
@@ -34,7 +34,7 @@ export const DashboardLeaveConfirmationModal = () => {
title: t`Discard your changes?`,
message: t`Your changes haven’t been saved, so you’ll lose them if you navigate away.`,
actionBtn: {
- color: "feedback-negative" as const,
+ color: "negative" as const,
message: t`Discard changes`,
},
};
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DeleteSubscriptionAction.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DeleteSubscriptionAction.tsx
index 848abb7675e..95964536716 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DeleteSubscriptionAction.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DeleteSubscriptionAction.tsx
@@ -120,7 +120,7 @@ export function DeleteSubscriptionAction({
<Flex justify="flex-end" gap="sm">
<Button onClick={closeModal}>{t`Cancel`}</Button>
<Button
- color={confirmed ? "feedback-negative" : undefined}
+ color={confirmed ? "negative" : undefined}
variant="filled"
onClick={handleDelete}
disabled={!confirmed}
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx
index fe474c7896b..55f910a7eb5 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx
@@ -78,22 +78,26 @@ function _PulsesListSidebar({
<Flex align="center">
<Tooltip label={createSubscriptionLabel}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- aria-label={createSubscriptionLabel}
- leftSection={<Icon name="add" size={16} />}
variant="subtle"
+ color="neutral"
+ size="sm"
+ aria-label={createSubscriptionLabel}
+ leftSection={<Icon name="add" />}
mr="1rem"
onClick={createSubscription}
/>
</Tooltip>
<Tooltip label={closeSidebarLabel}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- aria-label={closeSidebarLabel}
- leftSection={<Icon name="close" size={16} />}
variant="subtle"
- color="text-secondary"
- mr="-1rem"
+ color="neutral"
+ size="sm"
+ aria-label={closeSidebarLabel}
+ leftSection={<Icon name="close" />}
onClick={onCancel}
/>
</Tooltip>
diff --git a/frontend/src/metabase/dashboard/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx b/frontend/src/metabase/dashboard/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
index 97f749f0d5d..11f59bc6218 100644
--- a/frontend/src/metabase/dashboard/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
+++ b/frontend/src/metabase/dashboard/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
@@ -304,7 +304,7 @@ const ParameterItem = ({
<Box className={S.parameterItem} bg="background_page-secondary">
<Group justify="space-between" align="center" pr="lg">
<Button
- c={isCompatible ? "text-primary" : undefined}
+ color={isCompatible ? "neutral" : undefined}
variant="subtle"
rightSection={isCompatible && <Icon name="chevrondown" aria-hidden />}
disabled={!isCompatible}
diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
index ef70709e54b..450c0278380 100644
--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
@@ -143,7 +143,7 @@ const AutomaticDashboardAppInner = () => {
<ActionButton
className={cx(CS.mlAuto, CS.textNoWrap)}
variant="filled"
- color="feedback-positive"
+ color="positive"
// The dashboard isn't always loaded when the header first
// renders. Without this guard, "Save this" is clickable while
// `dashboard` is undefined, which fires a false `x-ray_saved`
diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
index 5f4278b646d..5e335731ff8 100644
--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
@@ -98,7 +98,7 @@ function IFrameVizInner({
</Text>{" "}
<Box ml="auto">
<Button
- size="compact-md"
+ size="sm"
variant="filled"
style={{ pointerEvents: "all" }}
onClick={onTogglePreviewing}
diff --git a/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.module.css b/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.module.css
index d7f6839bde5..d479abe3aec 100644
--- a/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.module.css
+++ b/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.module.css
@@ -16,12 +16,3 @@
right: 0;
border-left: 1px solid var(--mb-color-border-neutral-subtle);
}
-
-.button {
- transition: background-color 200ms;
- background-color: var(--mb-color-background_surface-brand-subtle);
-}
-
-.button:hover {
- background: var(--mb-color-background_surface-hover) !important;
-}
diff --git a/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.tsx b/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.tsx
index 6465642d996..a47d95c28a8 100644
--- a/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.tsx
+++ b/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.tsx
@@ -22,11 +22,8 @@ export const AddColumnButton = memo(function AddColumnButton({
style={{ marginRight }}
>
<Button
- className={S.button}
- variant="subtle"
- size="compact-md"
- w={23}
- h={23}
+ variant="light"
+ size="sm"
leftSection={<Icon name="add" />}
title={t`Add column`}
aria-label={t`Add column`}
diff --git a/frontend/src/metabase/data-grid/components/RowIdCell/RowIdCell.tsx b/frontend/src/metabase/data-grid/components/RowIdCell/RowIdCell.tsx
index 6673d7940d0..308ad83b4f3 100644
--- a/frontend/src/metabase/data-grid/components/RowIdCell/RowIdCell.tsx
+++ b/frontend/src/metabase/data-grid/components/RowIdCell/RowIdCell.tsx
@@ -45,11 +45,10 @@ export const RowIdCell = memo(function RowIdCell({
) : null}
{canExpand && (
<Button
+ variant="light"
data-testid="detail-shortcut"
- w={24}
- h={24}
+ size="sm"
className={cx(DataGridS.rowHoverVisible, S.expandButton)}
- size="compact-md"
leftSection={
<Icon name={expanded ? "sidebar_closed" : "sidebar_open"} />
}
diff --git a/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
index 46a89e09a91..5512fcd0dcc 100644
--- a/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
@@ -38,7 +38,7 @@ export const DiscardTableFieldValuesButton = ({
};
return (
- <Button c="feedback-negative" variant="subtle" onClick={handleClick}>
+ <Button color="negative" variant="subtle" onClick={handleClick}>
{started ? t`Discard triggered!` : t`Discard cached field values`}
</Button>
);
diff --git a/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
index 9e67114acb5..970e439173f 100644
--- a/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
@@ -44,7 +44,7 @@ export const RescanTableFieldsButton = ({
};
return (
- <Button variant="default" onClick={handleClick}>
+ <Button onClick={handleClick}>
{started
? t`Scan triggered!`
: isSingleTable
diff --git a/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
index 340b74be34e..af4a91eb461 100644
--- a/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
@@ -44,7 +44,7 @@ export function SyncTableSchemaButton({
};
return (
- <Button variant="default" onClick={handleClick}>
+ <Button onClick={handleClick}>
{started
? t`Sync triggered!`
: isSingleTable
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
index b779adfe03f..e3c3d42830f 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
@@ -110,7 +110,7 @@ export function FilterPopover({ filters, isLibraryEnabled, onSubmit }: Props) {
<Group justify="space-between" wrap="nowrap">
<Button flex={1} onClick={handleReset}>{t`Clear filters`}</Button>
- <Button flex={1} variant="primary" type="submit">
+ <Button flex={1} variant="filled" type="submit">
{t`Apply`}
</Button>
</Group>
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
index 479d268f2dc..8d7cc0e6311 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
@@ -125,6 +125,7 @@ export function TablePicker({
)}
</Box>
}
+ size="lg"
onClick={toggle}
/>
</Tooltip>
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
index e05724c54a5..685a53dcbbe 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
@@ -169,7 +169,6 @@ const TableSectionBase = ({
{canPublish && isLibraryEnabled && !remoteSyncReadOnly && (
<Button
flex="1"
- size="md"
variant={table.is_published ? "default" : "filled"}
leftSection={
<Icon
@@ -189,8 +188,6 @@ const TableSectionBase = ({
to={dependencyGraph({
entry: { id: Number(table.id), type: "table" },
})}
- p="sm"
- w="2.5rem"
flex="0 1 auto"
leftSection={<Icon name="dependencies" />}
aria-label={t`Dependency graph`}
@@ -200,7 +197,7 @@ const TableSectionBase = ({
</Tooltip>
)}
- <Box style={{ flexGrow: 0, width: 40 }}>
+ <Box style={{ flexGrow: 0 }}>
<TableLink table={table} />
</Box>
<TableActionsMenu table={table} />
@@ -334,9 +331,6 @@ function TableLink({ table }: { table: Table }) {
to={url}
aria-label={t`Go to this table`}
leftSection={<Icon name="external" size={16} />}
- style={{
- width: "100%",
- }}
/>
</Tooltip>
);
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
index 3521a3d32fe..a98b58192b0 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
@@ -44,13 +44,9 @@ export function MeasureList({ table }: MeasureListProps) {
<Group gap="lg" justify="flex-start" wrap="nowrap">
<Button
component={ForwardRefLink}
- h={32}
leftSection={<Icon name="add" />}
onAuxClick={onNewMeasureClick}
onClickCapture={onNewMeasureClick}
- px="sm"
- py="xxs"
- size="xs"
to={newMeasureUrl}
>
{t`New measure`}
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
index 86bb44248a8..e524851243b 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
@@ -40,10 +40,6 @@ export function SegmentList({ table }: SegmentListProps) {
schemaName: table.schema,
tableId: table.id,
})}
- h={32}
- px="sm"
- py="xxs"
- size="xs"
leftSection={<Icon name="add" />}
onClick={() =>
trackSegmentCreateStarted(
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx
index ad889db0456..60affa22fb1 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx
@@ -79,7 +79,6 @@ export function TableActionsMenu({ table }: Props) {
<Button
component={ForwardRefLink}
to={schemaViewerUrl}
- size="md"
leftSection={<Icon name="network" size={16} />}
>
{t`View schema`}
@@ -93,7 +92,6 @@ export function TableActionsMenu({ table }: Props) {
<Menu.Target>
<Button
aria-label={t`More actions`}
- size="md"
leftSection={<Icon name="ellipsis" size={16} />}
/>
</Menu.Target>
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
index 6abc2935f4a..e6680d0d381 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
@@ -203,7 +203,6 @@ export function TableAttributesEditBulk({
{canPublish && !remoteSyncReadOnly && (
<Button
flex={1}
- p="sm"
leftSection={<Icon name="publish" />}
onClick={() => setModalType(hasLibrary ? "publish" : "library")}
>
@@ -213,7 +212,6 @@ export function TableAttributesEditBulk({
{canPublish && !remoteSyncReadOnly && hasLibrary && (
<Button
flex={1}
- p="sm"
leftSection={<Icon name="unpublish" />}
onClick={() => setModalType("unpublish")}
>
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
index 3dbb8d94b93..ebf09c56666 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
@@ -248,16 +248,17 @@ function DataModelContent() {
px="xl"
>
<DataStudioBreadcrumbs>{t`Table details`}</DataStudioBreadcrumbs>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
+ variant="subtle"
+ color="neutral"
+ size="sm"
component={ForwardRefLink}
to={Urls.dataStudioData({
databaseId: table?.db_id,
schemaName: table?.schema,
})}
- leftSection={<Icon name="close" c="text-secondary" />}
- variant="subtle"
- p="sm"
- size="compact-sm"
+ leftSection={<Icon name="close" />}
onClick={() => {
closePreview();
resetSelection();
@@ -314,16 +315,18 @@ function DataModelContent() {
className={S.header}
>
<DataStudioBreadcrumbs>{t`Field details`}</DataStudioBreadcrumbs>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
+ variant="subtle"
+ color="neutral"
+ size="sm"
component={ForwardRefLink}
to={Urls.dataStudioData({
databaseId: table?.db_id,
schemaName: table?.schema,
tableId: table?.id,
})}
- leftSection={<Icon name="close" c="text-secondary" />}
- variant="subtle"
- size="compact-sm"
+ leftSection={<Icon name="close" />}
onClick={closePreview}
/>
</Group>
diff --git a/frontend/src/metabase/databases/components/DatabaseAuthProviderSectionField/DatabaseAuthProviderSectionField.tsx b/frontend/src/metabase/databases/components/DatabaseAuthProviderSectionField/DatabaseAuthProviderSectionField.tsx
index b0617125c9d..36feda92e1f 100644
--- a/frontend/src/metabase/databases/components/DatabaseAuthProviderSectionField/DatabaseAuthProviderSectionField.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseAuthProviderSectionField/DatabaseAuthProviderSectionField.tsx
@@ -22,8 +22,8 @@ const DatabaseAuthProviderSectionField = ({
<FormField>
<Button
w="fit-content"
- variant="subtle"
- size="compact-sm"
+ variant="transparent"
+ size="compact-md"
onClick={handleClick}
>
{value ? t`Use password` : t`Use an authentication provider`}
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.module.css b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.module.css
new file mode 100644
index 00000000000..0b95a569030
--- /dev/null
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.module.css
@@ -0,0 +1,3 @@
+.row {
+ border-bottom: 1px dashed var(--mb-color-border-neutral);
+}
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx
index 3869fdbd51a..d2bf41ad31f 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx
@@ -1,14 +1,14 @@
import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
-import CS from "metabase/css/core/index.css";
import { getUserIsAdmin } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
-import { Button, Divider, Icon } from "metabase/ui";
+import { Box, Button, Divider, Icon } from "metabase/ui";
import * as Urls from "metabase/urls";
+import S from "./AdditionalHelpButtonGroup.module.css";
import { ContactSupportButtonSection } from "./ContactSupportButtonSection";
export const AdditionalHelpButtonGroup = () => {
@@ -18,36 +18,34 @@ export const AdditionalHelpButtonGroup = () => {
return (
<>
+ <Divider variant="dashed" />
{showMetabaseLinks && (
- <>
- <Divider variant="dashed" mb="xl" />
+ <Box className={S.row} px="lg" py="md">
<Button
- className={CS.link}
component={Link}
leftSection={<Icon name="reference" />}
target="_blank"
to={docsUrl}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
>
{t`Read the docs`}
</Button>
- </>
+ </Box>
)}
{isAdmin && (
- <>
- <Divider variant="dashed" />
+ <Box className={S.row} px="lg" py="md">
<Button
- className={CS.link}
component={Link}
leftSection={<Icon name="mail" />}
to={Urls.newUser()}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
>
{t`Invite a teammate to help you`}
</Button>
- </>
+ </Box>
)}
- <Divider variant="dashed" />
<ContactSupportButtonSection />
</>
);
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/CheckHostAndPortButton.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/CheckHostAndPortButton.tsx
index 564db5f6c97..6092f6c6a8a 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/CheckHostAndPortButton.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/CheckHostAndPortButton.tsx
@@ -12,9 +12,7 @@ export const CheckHostAndPortButton = () => {
return (
<Button
- fw={700}
- fz="md"
- leftSection={<Icon name="gear" size={12} />}
+ leftSection={<Icon name="gear" />}
onClick={onCheckHostAndPortClick}
variant="subtle"
>
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx
index 44fec19add7..60288d7c3ea 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx
@@ -22,14 +22,7 @@ export const ContactSupportButtonSection = () => {
<Flex direction="column" gap="lg" align="flex-start">
{/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Only visible to admins */}
{t`Reach out to Metabase engineers who can help with technical troubleshooting. Not your typical support agents.`}
- <Button
- component={Link}
- radius="sm"
- size="md"
- target="_blank"
- to={helpUrl}
- variant="default"
- >
+ <Button component={Link} target="_blank" to={helpUrl}>
{t`Contact Support`}
</Button>
</Flex>
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/DatabaseFormError.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/DatabaseFormError.tsx
index 061bc5a39c7..f34e428397d 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/DatabaseFormError.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/DatabaseFormError.tsx
@@ -58,11 +58,7 @@ export const DatabaseFormError = () => {
)}
<Divider />
<Button
- fw={700}
- fz="md"
- leftSection={
- <Icon name={showAllTips ? "chevronup" : "chevrondown"} size={12} />
- }
+ leftSection={<Icon name={showAllTips ? "chevronup" : "chevrondown"} />}
onClick={toggleShowAllTips}
variant="subtle"
>
diff --git a/frontend/src/metabase/databases/components/DatabaseHostnameSectionField/DatabaseHostameSectionField.tsx b/frontend/src/metabase/databases/components/DatabaseHostnameSectionField/DatabaseHostameSectionField.tsx
index b27236c23e2..51b9220098c 100644
--- a/frontend/src/metabase/databases/components/DatabaseHostnameSectionField/DatabaseHostameSectionField.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseHostnameSectionField/DatabaseHostameSectionField.tsx
@@ -22,8 +22,8 @@ const DatabaseHostnameSectionField = ({
<FormField>
<Button
w="fit-content"
- variant="subtle"
- size="compact-sm"
+ variant="transparent"
+ size="compact-md"
onClick={handleClick}
>
{value ? t`Use account name` : t`Use hostname`}
diff --git a/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.tsx b/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.tsx
index 82f27170030..d8b1a2f0850 100644
--- a/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.tsx
@@ -23,8 +23,8 @@ const DatabaseSectionField = ({
<Button
w="fit-content"
type="button"
- variant="subtle"
- size="compact-sm"
+ variant="transparent"
+ size="compact-md"
rightSection={<Icon name={value ? "chevronup" : "chevrondown"} />}
onClick={handleClick}
>
diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
index f36090298e4..9bac1c06bfc 100644
--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
@@ -243,35 +243,33 @@ export function DetailViewSidesheet({
{isNavEnabled && (
<>
<Tooltip disabled={!onPreviousClick} label={t`Previous row`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
aria-label={t`Previous row`}
- c="text-primary"
disabled={!onPreviousClick}
- h={20}
leftSection={<Icon name="chevronup" />}
- p={0}
+ size="sm"
variant="subtle"
+ color="neutral"
style={{
opacity: onPreviousClick ? undefined : 0.5,
}}
- w={20}
onClick={onPreviousClick}
/>
</Tooltip>
<Tooltip disabled={!onNextClick} label={t`Next row`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
aria-label={t`Next row`}
- c="text-primary"
disabled={!onNextClick}
- h={20}
leftSection={<Icon name="chevrondown" />}
- p={0}
+ size="sm"
variant="subtle"
+ color="neutral"
style={{
opacity: onNextClick ? undefined : 0.5,
}}
- w={20}
onClick={onNextClick}
/>
</Tooltip>
@@ -288,15 +286,14 @@ export function DetailViewSidesheet({
>
<Menu.Target>
<Tooltip label={t`Actions`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
aria-label={t`Actions`}
- c="text-primary"
data-testid="actions-menu"
- h={20}
leftSection={<Icon name="ellipsis" />}
- p={0}
+ size="sm"
variant="subtle"
- w={20}
+ color="neutral"
/>
</Tooltip>
</Menu.Target>
@@ -319,32 +316,30 @@ export function DetailViewSidesheet({
<Tooltip
label={linkCopied ? t`Copied!` : t`Copy link to this record`}
>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
aria-label={
linkCopied ? t`Copied!` : t`Copy link to this record`
}
- c="text-primary"
- h={20}
leftSection={<Icon name="link" />}
- p={0}
+ size="sm"
variant="subtle"
- w={20}
+ color="neutral"
onClick={handleCopyLink}
/>
</Tooltip>
<Tooltip label={t`Open in full page`}>
<Box>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
aria-label={t`Open in full page`}
- c="text-primary"
component={Link}
- h={20}
leftSection={<Icon name="expand" />}
- p={0}
- to={url}
+ size="sm"
variant="subtle"
- w={20}
+ color="neutral"
+ to={url}
/>
</Box>
</Tooltip>
diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx
index e105435541f..ec7e9a1769f 100644
--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx
@@ -39,18 +39,17 @@ export function Sidesheet({
w={rem(720)}
>
<Modal.Body className={S.body} p={0} pt="xl">
- <Group gap="xl" justify="flex-end" px="xxl">
+ <Group gap="lg" justify="flex-end" px="xxl">
{actions}
<Tooltip label={t`Close`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
aria-label={t`Close`}
- c="text-primary"
- h={20}
leftSection={<Icon name="close" />}
- p={0}
+ size="sm"
variant="subtle"
- w={20}
+ color="neutral"
onClick={onClose}
/>
</Tooltip>
diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsx
index a3140ae52e8..305f5fc1009 100644
--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx
+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx
@@ -261,11 +261,11 @@ export const DocumentHeader = ({
component={Link}
to="/admin/settings/public-sharing"
target="_blank"
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
h="auto"
lh="inherit"
ml="sm"
- p={0}
bd={0}
className={CS.floatRight}
>
diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsx
index 41883d78404..d7d99ca8be8 100644
--- a/frontend/src/metabase/documents/components/DocumentPage.tsx
+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx
@@ -402,7 +402,7 @@ export const DocumentPage = () => {
// only applies when trying to duplicate a document that has unsaved changes
opened={duplicateModalMode === "leave"}
confirmButtonText={t`Save changes`}
- confirmButtonProps={{ color: "core-brand" }}
+ confirmButtonProps={{ color: "brand" }}
data-testid="save-confirmation"
message={t`You need to save before you can duplicate this document.`}
title={t`Save your changes first`}
diff --git a/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx b/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx
index a7ee5e00b0c..dafa5d02f59 100644
--- a/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx
+++ b/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx
@@ -39,14 +39,15 @@ export const AnchorLinkButton = <C extends ElementType = "button">({
label={<Text fw={700} c="inherit">{t`Copied!`}</Text>}
opened={clipboard.copied}
>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
// Unjustified type cast. FIXME
{...(props as ButtonProps)}
aria-label={t`Copy link`}
- bd={0}
+ variant="subtle"
+ color="neutral"
+ size="sm"
leftSection={<Icon name="link" />}
- px="sm"
- size="xs"
onClick={handleCopy}
onKeyDown={handleKeyDown}
/>
diff --git a/frontend/src/metabase/documents/components/Editor/CommentsMenu/CommentsMenu.tsx b/frontend/src/metabase/documents/components/Editor/CommentsMenu/CommentsMenu.tsx
index 79ae4851ee6..c56c059a952 100644
--- a/frontend/src/metabase/documents/components/Editor/CommentsMenu/CommentsMenu.tsx
+++ b/frontend/src/metabase/documents/components/Editor/CommentsMenu/CommentsMenu.tsx
@@ -36,13 +36,13 @@ export const CommentsMenu = forwardRef<HTMLDivElement, Props>(
contentEditable={false}
data-testid="comments-menu"
draggable={false}
- mt={rem(-2)}
+ mt={rem(active ? 0 : 2)}
pl="xl"
ref={ref}
style={style}
>
<CommentsButton<typeof ForwardRefLink>
- variant={active ? "filled" : "default"}
+ active={active}
unresolvedCommentsCount={unresolvedCommentsCount}
component={ForwardRefLink}
to={commentUrl}
diff --git a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
index e47823d612d..5f9fa89b139 100644
--- a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
+++ b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
@@ -133,7 +133,6 @@ export const EmbedQuestionSettingsSidebar = ({
<Menu position="bottom-start">
<Menu.Target>
<Button
- variant="default"
disabled={!selectedElem}
rightSection={<Icon ml="xxs" size={10} name="chevrondown" />}
leftSection={
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
index 93fc7496469..86df4920db4 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
@@ -747,7 +747,7 @@ export const CardEmbedComponent = memo(
<CommentsButton
// don't use Link component here since it messes with tiptap's link handling
disabled={hasUnsavedChanges || !commentsPath}
- variant={isOpen ? "filled" : "default"}
+ active={isOpen}
unresolvedCommentsCount={unresolvedCommentsCount}
onClick={() => {
navigate(commentsPath);
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/CreateStructuredQuestionModal.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/CreateStructuredQuestionModal.tsx
index 560a104bd0c..dfcf180a2d7 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/CreateStructuredQuestionModal.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/CreateStructuredQuestionModal.tsx
@@ -125,7 +125,7 @@ export const CreateStructuredQuestionModal = ({
/>
</Box>
<Flex mt="xl" justify="flex-end" gap="0.5rem">
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<Button
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/ModifyQuestionModal.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/ModifyQuestionModal.tsx
index a44ee9112fc..7f1a1979a65 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/ModifyQuestionModal.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/ModifyQuestionModal.tsx
@@ -140,7 +140,7 @@ export const ModifyQuestionModal = ({
/>
</Box>
<Flex mt="xl" justify="flex-end" gap="0.5rem">
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<Button variant="filled" onClick={handleSave}>
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
index c80eca4b0a5..88748084667 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
@@ -474,7 +474,7 @@ export const NativeQueryModal = ({
bg="background_page-primary"
className={S.footer}
>
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<Button
diff --git a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts
index 40abbbecdae..6e7b6ebd141 100644
--- a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts
+++ b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts
@@ -32,13 +32,19 @@ export const SDK_TO_MAIN_APP_COLORS_MAPPING: Record<
border: ["border", "border-neutral"],
filter: ["filter", "core-filter"],
summarize: ["summarize", "core-summarize"],
- "text-primary": ["text-primary"],
+ "text-primary": [
+ "text-primary",
+ "button_label-default-neutral-default",
+ "button_label-light-neutral-default",
+ "button_label-subtle-neutral-default",
+ ],
"text-secondary": ["text-secondary"],
"text-tertiary": ["text-tertiary", "text-disabled"],
background: [
"background-primary",
"background_page-primary",
"background_surface-primary",
+ "button-default-neutral-default",
],
"background-secondary": [
"background-secondary",
diff --git a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsx
index c54991bb3df..ed9b2879d19 100644
--- a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsx
+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsx
@@ -86,7 +86,7 @@ export const EmbedModalContentStatusBar = ({
<Box component="span" display="inline-flex">
<Button
variant="subtle"
- color="feedback-negative"
+ color="negative"
disabled={isReadOnly}
loading={isUnpublishing || isFetching}
onClick={() => {
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.tsx b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.tsx
index 299b052ab3f..bddae5ecea6 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.tsx
@@ -12,9 +12,7 @@ export function CopyLinkButton({ url }: { url: string }) {
{({ copied, copy }) => (
<Button
variant="filled"
- h="2rem"
px="lg"
- py="sm"
leftSection={
<Icon name={copied ? "verified_round" : "link"} aria-hidden />
}
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton.tsx b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton.tsx
index 7ddec54c03f..064cdee943e 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton.tsx
@@ -9,10 +9,7 @@ export function EmbedButton({ onClick }: { onClick: () => void }) {
return (
<Button
- variant="default"
- h="2rem"
px="lg"
- py="sm"
leftSection={<Icon name="embed" aria-hidden />}
onClick={() => {
closeMenu();
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx
index 61660ba00c4..f883752609c 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx
@@ -100,7 +100,6 @@ export const EnableGuestEmbedsSection = ({
<Button
variant={isAccepted ? "default" : "filled"}
onClick={handleEnable}
- size="xs"
disabled={isAccepted}
leftSection={isAccepted && <Icon name="check" />}
>
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx
index 6b96112e4f6..34e4f550978 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx
@@ -90,7 +90,6 @@ export const EnableModularEmbeddingSection = ({
<Button
variant={isAccepted ? "default" : "filled"}
onClick={handleEnable}
- size="xs"
disabled={isAccepted}
leftSection={isAccepted && <Icon name="check" />}
>
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx
index bf4b85cf1ea..524c80450ea 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx
@@ -126,7 +126,6 @@ export const SdkIframeEmbedSetupContent = () => {
<Group className={S.Navigation} justify="space-between">
{canGoBack && (
<Button
- variant="default"
onClick={handleBack}
disabled={!allowPreviewAndNavigation}
>
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/SelectEmbedExperienceStep/ResourceCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/SelectEmbedExperienceStep/ResourceCard.tsx
index 334dd52cfa0..577a27f3fd8 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/SelectEmbedExperienceStep/ResourceCard.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/SelectEmbedExperienceStep/ResourceCard.tsx
@@ -191,12 +191,12 @@ export const ResourceCard = () => {
</Text>
<Button
- variant="default"
leftSection={<Icon name={icon} c="core-brand" size={16} />}
rightSection={<Icon name="chevrondown" size={12} />}
onClick={openPicker}
data-testid="embed-browse-entity-button"
aria-label={label}
+ size="lg"
fullWidth
styles={{ label: { flex: 1, textAlign: "left" } }}
>
diff --git a/frontend/src/metabase/embedding/mcp/McpQuestionView.tsx b/frontend/src/metabase/embedding/mcp/McpQuestionView.tsx
index ff75278a4fc..5a53ddf1ee0 100644
--- a/frontend/src/metabase/embedding/mcp/McpQuestionView.tsx
+++ b/frontend/src/metabase/embedding/mcp/McpQuestionView.tsx
@@ -103,7 +103,7 @@ export function McpQuestionView({
h={32}
align="stretch"
bd="1px solid var(--mb-color-border-neutral)"
- bdrs="sm"
+ bdrs="xs"
style={{ overflow: "hidden" }}
data-testid="query-explorer-bar"
>
diff --git a/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeControlPopover.module.css b/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeControlPopover.module.css
deleted file mode 100644
index 24877b0d785..00000000000
--- a/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeControlPopover.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.popoverTargetButton:hover {
- background-color: var(--mb-color-background_surface-hover);
-}
diff --git a/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeControlPopover.tsx b/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeControlPopover.tsx
index d3ea9e42d75..210994b4c95 100644
--- a/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeControlPopover.tsx
+++ b/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeControlPopover.tsx
@@ -2,8 +2,6 @@ import { useState } from "react";
import { Button, Popover } from "metabase/ui";
-import S from "./TimeControlPopover.module.css";
-
export function TimeControlPopover({
label,
children,
@@ -17,14 +15,11 @@ export function TimeControlPopover({
<Popover opened={isOpen} onChange={setIsOpen}>
<Popover.Target>
<Button
- size="xs"
- h={32}
- fw="normal"
px="lg"
variant="subtle"
- color="text-primary"
- lh="1"
- classNames={{ root: S.popoverTargetButton }}
+ color="neutral"
+ radius={0}
+ h="100%"
onClick={() => setIsOpen(!isOpen)}
>
{label}
diff --git a/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeRangeControl.tsx b/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeRangeControl.tsx
index 83989d8d715..c1c36c7bd64 100644
--- a/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeRangeControl.tsx
+++ b/frontend/src/metabase/embedding/mcp/TimeControlBar/TimeRangeControl.tsx
@@ -22,11 +22,11 @@ export function TimeRangeControl({
closePopover();
}}
renderSubmitButton={({ value }) => (
- <Flex justify="space-between" w="100%">
+ <Flex justify="space-between" align="center" w="100%">
{timeRange.hasActiveFilter ? (
<Button
- variant="subtle"
- c="text-secondary"
+ variant="transparent"
+ size="compact-md"
onClick={() => {
timeRange.onClear();
closePopover();
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/DatabaseRoutingStepContent.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/DatabaseRoutingStepContent.tsx
index 4c83aeba469..4586cde0498 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/DatabaseRoutingStepContent.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/DatabaseRoutingStepContent.tsx
@@ -31,7 +31,6 @@ export const DatabaseRoutingStepContent = () => {
<Button
component={ExternalLink}
href={docsUrl}
- variant="outline"
rightSection={<Icon name="external" size={16} />}
mt="sm"
>
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/TestJwtStep.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/TestJwtStep.tsx
index 9a71c5d5890..af2aea4e937 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/TestJwtStep.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/TestJwtStep.tsx
@@ -44,7 +44,7 @@ export const TestJwtStep = () => {
</Text>
<Group justify="flex-end">
- <Button variant="outline" onClick={() => setShowTroubleshooting(true)}>
+ <Button onClick={() => setShowTroubleshooting(true)}>
{t`No, I couldn't log in`}
</Button>
@@ -113,7 +113,7 @@ const SsoTroubleshootingView = ({ onDone }: { onDone: () => void }) => {
</Stack>
<Group justify="flex-end">
- <Button component="a" href={helpUrl} target="_blank" variant="outline">
+ <Button component="a" href={helpUrl} target="_blank">
{t`Contact customer support`}
</Button>
diff --git a/frontend/src/metabase/embedding/setup-guide/hooks/use-get-setup-guide-steps.ts b/frontend/src/metabase/embedding/setup-guide/hooks/use-get-setup-guide-steps.ts
index f33f1f28e04..c77c25be039 100644
--- a/frontend/src/metabase/embedding/setup-guide/hooks/use-get-setup-guide-steps.ts
+++ b/frontend/src/metabase/embedding/setup-guide/hooks/use-get-setup-guide-steps.ts
@@ -31,7 +31,7 @@ export const useGetSetupGuideSteps = (): SetupGuideStep[] => {
onClick: () => {
openEmbedModal({ initialState: {} });
},
- variant: "outline",
+ variant: "default",
},
],
};
@@ -44,7 +44,7 @@ export const useGetSetupGuideSteps = (): SetupGuideStep[] => {
title: t`Connect a database`,
description: t`Connect your own database or upload a CSV and start working with your real data.`,
modal: { type: "add-data", initialTab: "db" },
- variant: "outline",
+ variant: "default",
},
],
};
@@ -57,7 +57,7 @@ export const useGetSetupGuideSteps = (): SetupGuideStep[] => {
title: t`Create a dashboard`,
description: t`Automatically generate a dashboard from your data using x-rays.`,
modal: { type: "xray-dashboard" },
- variant: "outline",
+ variant: "default",
},
],
};
@@ -70,7 +70,7 @@ export const useGetSetupGuideSteps = (): SetupGuideStep[] => {
title: t`Configure data permissions and enable tenants`,
description: t`Set granular permissions for multi-tenancy to control data access. Share dashboards, questions, and models with external users and allow them to create content, while restricting access to internal or other tenants' data.`,
to: "/admin/embedding/setup-guide/permissions",
- variant: "outline",
+ variant: "default",
stepId: "data-permissions-and-enable-tenants",
},
],
@@ -84,7 +84,7 @@ export const useGetSetupGuideSteps = (): SetupGuideStep[] => {
title: t`Configure SSO`,
description: t`Configure JWT authentication to ensure only authorized users can access your embeds.`,
to: "/admin/embedding/setup-guide/sso",
- variant: "outline",
+ variant: "default",
stepId: "sso-configured",
},
],
@@ -105,7 +105,7 @@ export const useGetSetupGuideSteps = (): SetupGuideStep[] => {
},
});
},
- variant: "outline",
+ variant: "default",
},
],
};
diff --git a/frontend/src/metabase/embedding/setup-guide/types/setup-guide.ts b/frontend/src/metabase/embedding/setup-guide/types/setup-guide.ts
index 6584c99a53e..79a807bbeef 100644
--- a/frontend/src/metabase/embedding/setup-guide/types/setup-guide.ts
+++ b/frontend/src/metabase/embedding/setup-guide/types/setup-guide.ts
@@ -43,7 +43,7 @@ export interface SetupGuideAction {
anchor?: string;
/** CTA button variant. */
- variant?: "outline" | "subtle" | "filled";
+ variant?: "default" | "subtle" | "filled";
/** Which modal to trigger? */
modal?: SetupGuideModalToTrigger;
diff --git a/frontend/src/metabase/explorations/components/NewExplorationData/NewExplorationData.tsx b/frontend/src/metabase/explorations/components/NewExplorationData/NewExplorationData.tsx
index e4c781e0239..5d4c01e473b 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationData/NewExplorationData.tsx
+++ b/frontend/src/metabase/explorations/components/NewExplorationData/NewExplorationData.tsx
@@ -211,10 +211,6 @@ export function NewExplorationData({ selection }: NewExplorationDataProps) {
<Group justify="space-between" align="center" flex="none">
<Title order={3} fs="1rem" lh={1.4}>{t`Research plan`}</Title>
<Button
- variant="outline"
- color="text-primary"
- bd="1px solid text-tertiary"
- size="sm"
disabled={isManualDataPickingDisabled}
onClick={() => setActiveModal("metrics")}
>
@@ -241,8 +237,7 @@ export function NewExplorationData({ selection }: NewExplorationDataProps) {
)}
<Button
variant="subtle"
- c="text-secondary"
- size="sm"
+ color="neutral"
bd="1px dashed border"
bdrs="xl"
leftSection={
@@ -298,7 +293,6 @@ export function NewExplorationData({ selection }: NewExplorationDataProps) {
/>
<Button
className={cx(!canStart && CS.hidden)}
- size="sm"
flex="none"
variant="filled"
loading={isStarting}
diff --git a/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.module.css b/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.module.css
index d138839510e..c000381f256 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.module.css
+++ b/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.module.css
@@ -4,12 +4,6 @@
}
}
-.buttonHoverSecondary {
- &:hover {
- background-color: var(--mb-color-background-secondary) !important;
- }
-}
-
.explorationsContainer {
overflow-y: auto;
}
diff --git a/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.tsx b/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.tsx
index 9758c201aea..3f5f13e5ea4 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.tsx
+++ b/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.tsx
@@ -89,8 +89,8 @@ export function NewExplorationEntry({ selection }: NewExplorationEntryProps) {
<Button
component={ForwardRefLink}
to={Urls.newQuestion({ mode: "ask" })}
- c="text-secondary"
- bd="none"
+ variant="subtle"
+ color="neutral"
flex="none"
leftSection={<Icon name="arrow_left" />}
>
@@ -130,9 +130,8 @@ export function NewExplorationEntry({ selection }: NewExplorationEntryProps) {
)}
<Flex justify="space-between" align="center">
<Button
- c="text-secondary"
- bd="none"
- className={S.buttonHoverSecondary}
+ variant="subtle"
+ color="neutral"
leftSection={<Icon name="collection" />}
onClick={() => setIsCollectionPickerOpen(true)}
>
@@ -140,9 +139,8 @@ export function NewExplorationEntry({ selection }: NewExplorationEntryProps) {
</Button>
<Flex gap="sm">
<Button
- c="text-secondary"
- bd="none"
- className={S.buttonHoverSecondary}
+ variant="subtle"
+ color="neutral"
onClick={handleManualSetup}
>
{t`Manual setup`}
diff --git a/frontend/src/metabase/explorations/components/NewExplorationPlan/NewExplorationPlan.tsx b/frontend/src/metabase/explorations/components/NewExplorationPlan/NewExplorationPlan.tsx
index bb6551acc59..d13615d7f76 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationPlan/NewExplorationPlan.tsx
+++ b/frontend/src/metabase/explorations/components/NewExplorationPlan/NewExplorationPlan.tsx
@@ -46,9 +46,9 @@ export function NewExplorationPlan({ selection }: NewExplorationPlanProps) {
<Button
component={ForwardRefLink}
to={Urls.newExploration()}
- c="text-secondary"
- bd="none"
- leftSection={<Icon name="arrow_left" c="brand" />}
+ variant="transparent"
+ size="compact-md"
+ leftSection={<Icon name="arrow_left" />}
>
{t`All projects`}
</Button>
diff --git a/frontend/src/metabase/forms/components/FormSecretKey/FormSecretKey.tsx b/frontend/src/metabase/forms/components/FormSecretKey/FormSecretKey.tsx
index 1ea30832218..b906fb1815a 100644
--- a/frontend/src/metabase/forms/components/FormSecretKey/FormSecretKey.tsx
+++ b/frontend/src/metabase/forms/components/FormSecretKey/FormSecretKey.tsx
@@ -39,6 +39,7 @@ export const FormSecretKey = forwardRef(function FormSecretKey(
miw={value ? undefined : "10rem"}
onClick={openModal}
variant="filled"
+ size="lg"
>
{value ? t`Regenerate key` : t`Set up key`}
</Button>
diff --git a/frontend/src/metabase/forms/components/FormSecretKey/SetupKeyModal.tsx b/frontend/src/metabase/forms/components/FormSecretKey/SetupKeyModal.tsx
index 5dc41760e36..1c86eb82a71 100644
--- a/frontend/src/metabase/forms/components/FormSecretKey/SetupKeyModal.tsx
+++ b/frontend/src/metabase/forms/components/FormSecretKey/SetupKeyModal.tsx
@@ -81,7 +81,12 @@ export const SetupKeyModal = (props: SetupKeyDialogProps) => {
flex="1 0 auto"
aria-label={t`New secret key`}
/>
- <Button flex="0 0 auto" variant="filled" onClick={generateToken}>
+ <Button
+ flex="0 0 auto"
+ variant="filled"
+ size="lg"
+ onClick={generateToken}
+ >
{t`Regenerate key`}
</Button>
</Flex>
diff --git a/frontend/src/metabase/forms/components/FormSubmitButton/FormSubmitButton.tsx b/frontend/src/metabase/forms/components/FormSubmitButton/FormSubmitButton.tsx
index d2392e037b7..88ee82ca480 100644
--- a/frontend/src/metabase/forms/components/FormSubmitButton/FormSubmitButton.tsx
+++ b/frontend/src/metabase/forms/components/FormSubmitButton/FormSubmitButton.tsx
@@ -24,6 +24,7 @@ export const FormSubmitButton = forwardRef(function FormSubmitButton(
failedLabel,
disabled,
color,
+ variant,
onSuccess,
...props
}: FormSubmitButtonProps,
@@ -37,13 +38,17 @@ export const FormSubmitButton = forwardRef(function FormSubmitButton(
successLabel,
failedLabel,
});
- const submitColor = getSubmitButtonColor(status, { color });
+ const hasStatusColor = variant && variant !== "default";
+ const submitColor = hasStatusColor
+ ? getSubmitButtonColor(status, { color })
+ : color;
return (
<Button
{...props}
ref={ref}
type="submit"
+ variant={variant}
color={submitColor}
disabled={isDisabled}
loading={status === "pending"}
@@ -61,9 +66,9 @@ const getSubmitButtonColor = (
) => {
switch (status) {
case "fulfilled":
- return "feedback-positive";
+ return "positive";
case "rejected":
- return "feedback-negative";
+ return "negative";
default:
return color;
}
diff --git a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx
index f8460fabcce..1a5be90b6bc 100644
--- a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx
+++ b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx
@@ -100,7 +100,7 @@ export const CustomHomePageModal = ({
</Box>
<Flex mt="xl" justify="flex-end" gap="0.5rem">
- <Button variant="subtle" onClick={handleClose}>
+ <Button variant="subtle" color="neutral" onClick={handleClose}>
{t`Cancel`}
</Button>
<Button variant="filled" disabled={!dashboardId} onClick={handleSave}>
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx
index 4d4a1489bb5..9aea38bae30 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx
+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx
@@ -22,16 +22,12 @@ export const EmbedJsContent = ({
}: EmbedJsContentProps) => {
const cta = match({ variant, hasEmbeddingFeature })
.with({ variant: "ee", hasEmbeddingFeature: true }, () => (
- <Button
- component={Link}
- to={"/admin/embedding/setup-guide"}
- variant="outline"
- >
+ <Button component={Link} to={"/admin/embedding/setup-guide"}>
{t`Go to setup guide`}
</Button>
))
.with({ variant: "ee", hasEmbeddingFeature: false }, () => (
- <Button component={Link} to={"/admin/settings/license"} variant="outline">
+ <Button component={Link} to={"/admin/settings/license"}>
{t`Activate license`}
</Button>
))
@@ -61,7 +57,7 @@ export const EmbedJsContent = ({
<ExternalLink href={embedJsDocsUrl}>
<Button
- variant={cta ? "subtle" : "outline"}
+ variant={cta ? "subtle" : "default"}
>{t`Read the docs`}</Button>
</ExternalLink>
</Group>
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/SDKContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/SDKContent.tsx
index d1546c7c725..05831feffc2 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/SDKContent.tsx
+++ b/frontend/src/metabase/home/components/EmbedHomepage/SDKContent.tsx
@@ -23,7 +23,7 @@ export const SDKContent = ({
</Text>
<Group gap="lg">
<ExternalLink href={sdkQuickstartUrl}>
- <Button variant="outline">{t`Check out the Quickstart`}</Button>
+ <Button>{t`Check out the Quickstart`}</Button>
</ExternalLink>
<ExternalLink href={sdkDocsUrl}>
<Button variant="subtle">{t`Read the docs`}</Button>
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx
index 236256ad22b..5d3bfdbee85 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx
+++ b/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx
@@ -43,7 +43,7 @@ export const StaticEmbedContent = ({
to={exampleDashboardLink}
onClick={trackEmbeddingHomepageExampleDashboardClick}
>
- <Button variant="outline">{t`Embed an example dashboard`}</Button>
+ <Button>{t`Embed an example dashboard`}</Button>
</Link>
)}
<ExternalLink href={learnMoreStaticEmbedUrl}>
diff --git a/frontend/src/metabase/home/components/Onboarding/ChecklistItemActions.tsx b/frontend/src/metabase/home/components/Onboarding/ChecklistItemActions.tsx
index d6c1c896a41..8ec94d75eac 100644
--- a/frontend/src/metabase/home/components/Onboarding/ChecklistItemActions.tsx
+++ b/frontend/src/metabase/home/components/Onboarding/ChecklistItemActions.tsx
@@ -39,7 +39,7 @@ const ChecklistItemAction = ({
value: ChecklistItemValue;
action: ChecklistAction;
}) => {
- const variant = cta === "primary" ? "outline" : "subtle";
+ const variant = cta === "primary" ? "default" : "subtle";
const handleClick = () => {
trackChecklistItemCTAClicked(value, cta);
onClick?.();
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
index 512760aea23..40246bcc7b8 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
@@ -152,8 +152,8 @@ export function AIProviderList() {
)}
<Button
- variant={hasConnections ? "subtle" : "filled"}
- p={hasConnections ? 0 : undefined}
+ variant={hasConnections ? "transparent" : "filled"}
+ size={hasConnections ? "compact-md" : "md"}
w="fit-content"
leftSection={<Icon name="add" />}
onClick={startAdding}
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ProviderConnectionForm.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ProviderConnectionForm.tsx
index f7fc30fb0d7..54f45fea50e 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ProviderConnectionForm.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ProviderConnectionForm.tsx
@@ -348,8 +348,8 @@ function AdvancedSettings({
<Stack gap="lg">
<Button
type="button"
- variant="subtle"
- p={0}
+ variant="transparent"
+ size="compact-md"
w="fit-content"
aria-expanded={isOpened}
onClick={onToggle}
diff --git a/frontend/src/metabase/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsx
index 54a04464b72..052738058f4 100644
--- a/frontend/src/metabase/metabot/components/Metabot.tsx
+++ b/frontend/src/metabase/metabot/components/Metabot.tsx
@@ -49,7 +49,6 @@ const MetabotErrorFallback = ({ onRetry }: { onRetry: () => void }) => {
</Text>
<Button
variant="subtle"
- size="compact-lg"
onClick={onRetry}
data-testid="metabot-error-retry"
>
diff --git a/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
index 1fba187d6b0..303fb44c2bb 100644
--- a/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
@@ -49,8 +49,8 @@ export function MetabotAppBarButton({
opacity={isFullPageMetabot ? 0.5 : undefined}
bd="1px solid var(--mb-color-border-neutral)"
p="sm"
- h="2.25rem"
- w="2.25rem"
+ h="2rem"
+ w="2rem"
aria-label={label}
onClick={handleClick}
{...rest}
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
index 48c27f3d52c..f2b35d10ef8 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
@@ -171,14 +171,7 @@ export const AgentSuggestionMessage = ({
h="1.375rem"
gap="sm"
>
- <Button
- size="compact-xs"
- variant="subtle"
- fw="normal"
- fz="sm"
- c="text-disabled"
- disabled
- >
+ <Button size="compact-md" variant="transparent" disabled>
{isNew ? t`Create` : t`Apply`}
</Button>
</Flex>
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
index 55e1bb8558c..7857d649270 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
@@ -161,9 +161,6 @@
display: block;
height: auto;
text-align: start;
- line-height: 1.4;
- padding-top: 0.4rem;
- padding-bottom: 0.4rem;
span {
text-wrap-mode: wrap;
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
index 0640928ccf9..ec36f819a30 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
@@ -154,8 +154,6 @@ export const MetabotChat = ({
{suggestedPrompts.map(({ prompt }, index) => (
<Box key={index}>
<Button
- fz="sm"
- size="xs"
onClick={() => metabot.submitInput(prompt)}
className={Styles.promptSuggestionButton}
>
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
index f6785ef30dc..83e020edbf8 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
@@ -537,9 +537,7 @@ const AgentErroredTurnAlert = ({
cta={
isOutOfSync && onRefreshConversation ? (
<Button
- variant="default"
- size="compact-xs"
- fz="xs"
+ size="sm"
onClick={onRefreshConversation}
data-testid="metabot-chat-message-refresh"
>
@@ -616,9 +614,7 @@ const AbortedTurnAlert = ({
cta={
!debug && onRetry ? (
<Button
- variant="default"
- size="compact-xs"
- fz="xs"
+ size="sm"
onClick={onRetry}
data-testid="metabot-chat-message-retry"
>
@@ -677,9 +673,7 @@ const IncompleteTurnAlert = ({
cta={
resumePrompt && onContinue ? (
<Button
- variant="default"
- size="compact-xs"
- fz="xs"
+ size="sm"
onClick={() => onContinue(resumePrompt)}
data-testid="metabot-chat-message-continue"
>
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
index fff4f511428..667584176ee 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
@@ -138,7 +138,7 @@ export const MetabotFeedbackModal = ({
</Text>
<Group justify="flex-end" gap="lg" mt="lg">
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<Button variant="filled" type="submit">{c(
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.module.css
index 363064ad77a..8f033cca032 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.module.css
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.module.css
@@ -6,7 +6,7 @@
}
.header {
- padding: 0.5rem 0.25rem 0.5rem 0.75rem;
+ padding: 0.5rem 0.75rem;
}
.title {
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx
index b7748db81cc..216865a7384 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx
@@ -241,9 +241,8 @@ function SaveChartAction({
component={ForwardRefLink}
to={Urls.question(question.setId(savedCardId))}
target="_blank"
- variant="subtle"
- color="text-secondary"
- size="compact-xs"
+ variant="transparent"
+ size="compact-md"
leftSection={<Icon name="check" size={14} />}
>
{t`Saved`}
@@ -252,8 +251,8 @@ function SaveChartAction({
.with({ readonly: true }, () => null)
.with({ savedCardId: P.nullish, readonly: false }, () => (
<Button
- variant="subtle"
- size="compact-xs"
+ variant="transparent"
+ size="compact-md"
onClick={() => setIsSaveModalOpen(true)}
>
{t`Save`}
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotLongChatNotice.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotLongChatNotice.tsx
index cb8a0d505b8..4968f7cf921 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotLongChatNotice.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotLongChatNotice.tsx
@@ -56,10 +56,9 @@ export const MetabotLongChatNotice = ({
.jt`This chat is nearing the ${contextLimit}.`}
</Text>
<Button
- variant="subtle"
- size="compact-sm"
+ variant="transparent"
+ size="compact-md"
onClick={onNewChat}
- fw="bold"
data-testid="metabot-long-chat-new-chat"
>{t`New chat`}</Button>
{variant === "warning" && (
diff --git a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.module.css b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.module.css
index 814066a3fe2..de29cdda329 100644
--- a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.module.css
+++ b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.module.css
@@ -26,11 +26,6 @@
padding: 0.25rem 0.125rem;
}
-.submitButton:disabled {
- background-color: var(--mb-color-background_surface-primary);
- color: var(--mb-color-text-primary);
-}
-
.cancelButton {
order: -1;
}
diff --git a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx
index 0cbcaceff69..8b4782ed310 100644
--- a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx
@@ -133,33 +133,31 @@ export const MetabotInlineSQLPrompt = ({
{canUseSqlGeneration && (
<Tooltip disabled={isLoading} label={t`Send to ${metabotName}`}>
<Button
- className={S.submitButton}
data-testid="metabot-inline-sql-generate"
- size="xs"
variant="filled"
px="0"
- w="1.875rem"
- styles={{ label: { display: "flex" } }}
+ w="2rem"
+ leftSection={
+ isLoading ? (
+ <Loader
+ size="xs"
+ color="text-disabled"
+ data-testid="metabot-inline-sql-generating"
+ />
+ ) : (
+ <Icon name="send" />
+ )
+ }
onClick={handleSubmit}
disabled={isSubmitDisabled}
- >
- {isLoading ? (
- <Loader
- size="xs"
- color="text-disabled"
- data-testid="metabot-inline-sql-generating"
- />
- ) : (
- <Icon name="send" />
- )}
- </Button>
+ />
</Tooltip>
)}
<Button
className={S.cancelButton}
data-testid="metabot-inline-sql-cancel"
- size="xs"
variant="subtle"
+ color="neutral"
onClick={handleClose}
>
{t`Cancel`}
diff --git a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx
index 2f5294475ad..396408599d8 100644
--- a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx
@@ -69,11 +69,8 @@ export const MetabotManagedProviderLimitActions = ({
return (
<Flex align="center" gap="sm" wrap="wrap" {...rest}>
<Button
- h="1rem"
- variant="subtle"
- size="xs"
- fz="sm"
- p={0}
+ variant="transparent"
+ size="compact-md"
onClick={handleConfigure}
>
{t`Use a different AI provider`}
@@ -82,14 +79,11 @@ export const MetabotManagedProviderLimitActions = ({
•
</Text>
<Button
- h="1rem"
component={ExternalLink}
href={storeUrl}
target="_blank"
- variant="subtle"
- size="xs"
- fz="sm"
- p={0}
+ variant="transparent"
+ size="compact-md"
>
{t`Start paid subscription`}
</Button>
@@ -99,20 +93,18 @@ export const MetabotManagedProviderLimitActions = ({
}
return (
- <Flex direction="column" align="start" gap="xxs" {...rest}>
+ <Flex direction="column" align="start" gap="lg" {...rest}>
<Button
- variant="subtle"
- size="xs"
- p={0}
+ variant="transparent"
+ size="compact-md"
onClick={handleConfigure}
>{t`Use a different AI provider`}</Button>
<Button
component={ExternalLink}
href={storeUrl}
target="_blank"
- variant="subtle"
- size="xs"
- p={0}
+ variant="transparent"
+ size="compact-md"
>
{t`Start paid subscription`}
</Button>
diff --git a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
index 0d6464eac3b..2ceb93253dc 100644
--- a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
+++ b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
@@ -11,8 +11,6 @@ import { memo, useEffect, useMemo, useRef, useState } from "react";
import { useLatest } from "react-use";
import { t } from "ttag";
-import CS from "metabase/css/core/index.css";
-import { MetabotIcon } from "metabase/metabot/components/MetabotIcon";
import { useUserMetabotPermissions } from "metabase/metabot/hooks";
import { useDispatch, useSelector } from "metabase/redux";
import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";
@@ -275,28 +273,17 @@ export const MetabotComponent = memo(
direction="column"
mb="lg"
>
- <Box
- pos="absolute"
- top={0}
- right={0}
- opacity="0.5"
- className={S.closeButton}
- >
- {editor.options.editable ? (
+ <Box pos="absolute" top={0} right={0} className={S.closeButton}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
+ {editor.options.editable && (
<Button
variant="subtle"
- p="sm"
- m="sm"
+ color="neutral"
size="sm"
+ m="xxs"
+ leftSection={<Icon name="close" data-hide-on-print />}
onClick={() => deleteNode()}
- >
- <Icon name="close" data-hide-on-print />
- <MetabotIcon data-show-on-print />
- </Button>
- ) : (
- <Box p="lg">
- <MetabotIcon />
- </Box>
+ />
)}
</Box>
<Flex flex={1} direction="column" className={S.contentWrapper}>
@@ -334,17 +321,14 @@ export const MetabotComponent = memo(
position="bottom"
>
<Button
- size="sm"
disabled={!isMetabotEnabled}
onClick={() =>
isLoading ? handleStopMetabot() : handleRunMetabot()
}
- classNames={{
- label: CS.flex, // ensures icon is vertically centered
- }}
+ leftSection={isLoading ? <Icon name="close" /> : undefined}
data-hide-on-print
>
- {isLoading ? <Icon name="close" /> : t`Run`}
+ {isLoading ? null : t`Run`}
</Button>
</Tooltip>
)}
diff --git a/frontend/src/metabase/metadata/components/DiscardFieldValuesButton/DiscardFieldValuesButton.tsx b/frontend/src/metabase/metadata/components/DiscardFieldValuesButton/DiscardFieldValuesButton.tsx
index 6c407205bf7..45fd5e6225e 100644
--- a/frontend/src/metabase/metadata/components/DiscardFieldValuesButton/DiscardFieldValuesButton.tsx
+++ b/frontend/src/metabase/metadata/components/DiscardFieldValuesButton/DiscardFieldValuesButton.tsx
@@ -25,7 +25,7 @@ export const DiscardFieldValuesButton = ({ fieldId }: Props) => {
};
return (
- <Button c="feedback-negative" variant="subtle" onClick={handleClick}>
+ <Button color="negative" variant="subtle" onClick={handleClick}>
{started ? t`Discard triggered!` : t`Discard cached field values`}
</Button>
);
diff --git a/frontend/src/metabase/metadata/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx b/frontend/src/metabase/metadata/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
index c7904a94fc1..bdb7902cdf9 100644
--- a/frontend/src/metabase/metadata/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
+++ b/frontend/src/metabase/metadata/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
@@ -25,7 +25,7 @@ export const DiscardTableFieldValuesButton = ({ tableId }: Props) => {
};
return (
- <Button c="feedback-negative" variant="subtle" onClick={handleClick}>
+ <Button color="negative" variant="subtle" onClick={handleClick}>
{started ? t`Discard triggered!` : t`Discard cached field values`}
</Button>
);
diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx
index fdeb3eb8afb..3ff0b9fd656 100644
--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx
+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx
@@ -144,9 +144,8 @@ export const CustomMappingModal = ({
<Button
disabled={hasEmptyValues}
- miw={128}
type="submit"
- variant="primary"
+ variant="filled"
>{t`Save`}</Button>
</Group>
</form>
diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
index 5bae42034f0..c11d5c5c0f5 100644
--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
@@ -329,9 +329,8 @@ export const RemappingPicker = ({
<Group mt="sm">
<Button
- p={0}
- size="compact-xs"
- variant="subtle"
+ size="compact-md"
+ variant="transparent"
disabled={isLoadingFieldValues}
onClick={() => setIsCustomMappingOpen(true)}
>
diff --git a/frontend/src/metabase/metadata/components/NoDatabasesEmptyState/NoDatabasesEmptyState.tsx b/frontend/src/metabase/metadata/components/NoDatabasesEmptyState/NoDatabasesEmptyState.tsx
index 166e7ca5008..133a1fc9af0 100644
--- a/frontend/src/metabase/metadata/components/NoDatabasesEmptyState/NoDatabasesEmptyState.tsx
+++ b/frontend/src/metabase/metadata/components/NoDatabasesEmptyState/NoDatabasesEmptyState.tsx
@@ -19,9 +19,9 @@ export const NoDatabasesEmptyState = () => {
{/* no need to check if user is admin because this page can only be viewed by admins */}
<Button
component={Link}
- size="md"
to="/admin/databases/create"
- variant="primary"
+ variant="filled"
+ size="lg"
>{t`Connect a database`}</Button>
</Stack>
);
diff --git a/frontend/src/metabase/metadata/components/RescanFieldButton/RescanFieldButton.tsx b/frontend/src/metabase/metadata/components/RescanFieldButton/RescanFieldButton.tsx
index ccbefdf561c..b0d48538b23 100644
--- a/frontend/src/metabase/metadata/components/RescanFieldButton/RescanFieldButton.tsx
+++ b/frontend/src/metabase/metadata/components/RescanFieldButton/RescanFieldButton.tsx
@@ -25,7 +25,7 @@ export const RescanFieldButton = ({ fieldId }: Props) => {
};
return (
- <Button variant="default" onClick={handleClick}>
+ <Button onClick={handleClick}>
{started ? t`Scan triggered!` : t`Re-scan field`}
</Button>
);
diff --git a/frontend/src/metabase/metadata/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx b/frontend/src/metabase/metadata/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
index 6a1253d004b..d0cda1498f8 100644
--- a/frontend/src/metabase/metadata/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
+++ b/frontend/src/metabase/metadata/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
@@ -25,7 +25,7 @@ export const RescanTableFieldsButton = ({ tableId }: Props) => {
};
return (
- <Button variant="default" onClick={handleClick}>
+ <Button onClick={handleClick}>
{started ? t`Scan triggered!` : t`Re-scan table`}
</Button>
);
diff --git a/frontend/src/metabase/metadata/components/ResponsiveButton/ResponsiveButton.tsx b/frontend/src/metabase/metadata/components/ResponsiveButton/ResponsiveButton.tsx
index 06918e29d98..a1b2bff17f3 100644
--- a/frontend/src/metabase/metadata/components/ResponsiveButton/ResponsiveButton.tsx
+++ b/frontend/src/metabase/metadata/components/ResponsiveButton/ResponsiveButton.tsx
@@ -2,7 +2,7 @@ import { useElementSize } from "@mantine/hooks";
import { useLayoutEffect } from "react";
import _ from "underscore";
-import { Button, type ButtonProps, Flex, Icon, Tooltip } from "metabase/ui";
+import { Button, type ButtonProps, Icon, Tooltip } from "metabase/ui";
import type { IconName } from "metabase-types/api";
interface Props extends Omit<ButtonProps, "leftSection"> {
children: string;
@@ -33,19 +33,14 @@ export const ResponsiveButton = ({
<Tooltip disabled={showLabel} label={children}>
<Button
aria-label={children}
- h={32}
leftSection={
- showLabel && showIconWithLabel ? <Icon name={icon} /> : undefined
+ !showLabel || showIconWithLabel ? <Icon name={icon} /> : undefined
}
px={showLabel ? (showIconWithLabel ? "sm" : "lg") : "xxs"}
- py="xxs"
- size="xs"
w={showLabel ? undefined : 32}
{...props}
>
- <Flex align="center" justify="center" h="100%" w="100%">
- {showLabel ? children : <Icon name={icon} size={16} />}
- </Flex>
+ {showLabel ? children : null}
</Button>
</Tooltip>
@@ -61,18 +56,13 @@ export const ResponsiveButton = ({
>
<Button
disabled
- h={32}
hidden
leftSection={showIconWithLabel ? <Icon name={icon} /> : undefined}
px={showIconWithLabel ? "sm" : "lg"}
- py="xxs"
ref={measureRef}
- size="xs"
{...props}
>
- <Flex align="center" justify="center" h="100%" w="100%">
- {children}
- </Flex>
+ {children}
</Button>
</span>
</>
diff --git a/frontend/src/metabase/metadata/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx b/frontend/src/metabase/metadata/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
index bed92b26d47..87c7b02801d 100644
--- a/frontend/src/metabase/metadata/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
+++ b/frontend/src/metabase/metadata/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
@@ -21,7 +21,7 @@ export function SyncTableSchemaButton({ tableId }: { tableId: TableId }) {
};
return (
- <Button variant="default" onClick={handleClick}>
+ <Button onClick={handleClick}>
{started ? t`Sync triggered!` : t`Sync table schema`}
</Button>
);
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.tsx b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.tsx
index 28fc60fc87a..ecdbdb29c42 100644
--- a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.tsx
@@ -349,7 +349,11 @@ export function DimensionPickerSidebar(props: DimensionPickerSidebarProps) {
{defaultSectionHeader}
</Text>
{showSeeAll && (
- <Button onClick={handleSeeAll} p={0} size="xs" variant="subtle">
+ <Button
+ onClick={handleSeeAll}
+ variant="transparent"
+ size="compact-md"
+ >
{t`See all`}
</Button>
)}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.module.css
index 6eb8f875a67..d777c75bda8 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.module.css
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.module.css
@@ -36,11 +36,6 @@
height: 2rem;
padding-inline: 1rem;
border-radius: 0.5rem;
-
- &.controlButton:hover {
- color: var(--mb-color-text-primary);
- background-color: var(--mb-color-background_surface-hover);
- }
}
.compactCenterControls {
@@ -52,8 +47,6 @@
border-radius: 0.75rem;
border: 1px solid var(--mb-color-border-neutral);
color: var(--mb-color-text-primary);
- font-weight: 700;
- height: 2.5rem;
width: 100%;
&.xAxisButton:hover {
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.tsx
index c59c7fc4fe8..1e091f6b19a 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.tsx
@@ -59,7 +59,8 @@ export function CenterControls(props: CenterControlsProps) {
className={S.xAxisButton}
aria-label={t`X-axis controls`}
variant="subtle"
- color="text-primary"
+ size="lg"
+ color="neutral"
leftSection={<Icon name="gear" size={16} />}
onClick={() => setIsXAxisPopoverOpen(!isXAxisPopoverOpen)}
data-testid="metrics-viewer-x-axis-controls"
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/BinningButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/BinningButton.tsx
index 192fc533b62..36ae07344a9 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/BinningButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/BinningButton.tsx
@@ -74,13 +74,10 @@ export function BinningButton({
<Popover.Target>
<Button
className={S.controlButton}
- h="2rem"
- fw={400}
- py={0}
px="lg"
bdrs="sm"
variant="subtle"
- color="text-primary"
+ color="neutral"
onClick={() => setIsOpen(!isOpen)}
>
{displayLabel}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx
index 8262e30365e..df79cb28c50 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx
@@ -58,13 +58,10 @@ export function BucketButton({
<Button
className={S.controlButton}
justify="space-between"
- h="2rem"
- fw={400}
- py={0}
px="lg"
bdrs="sm"
variant="subtle"
- color="text-primary"
+ color="neutral"
onClick={() => setIsOpen(!isOpen)}
>
{currentUnit
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ControlsContent.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ControlsContent.tsx
index 25f034af954..05d75ccc892 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ControlsContent.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ControlsContent.tsx
@@ -122,10 +122,9 @@ export function ControlsContent(props: ControlsContentProps) {
<Button
className={S.controlButton}
justify="space-between"
- fw="bold"
aria-label={t`Change column`}
variant="subtle"
- color="text-primary"
+ color="neutral"
leftSection={
columnPickerIcon ? (
<Icon
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx
index 53e6275a4d9..93c0f81a6d5 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx
@@ -88,13 +88,10 @@ export function DimensionFilterButton({
<Button
className={S.controlButton}
justify="space-between"
- h="2rem"
- fw={400}
- py={0}
px="lg"
bdrs="sm"
variant="subtle"
- color="text-primary"
+ color="neutral"
onClick={() => setIsOpen(!isOpen)}
>
{filterName}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/NoBreakoutControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/NoBreakoutControls.tsx
index 1c2d7f4bc2a..8e25756718b 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/NoBreakoutControls.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/NoBreakoutControls.tsx
@@ -15,10 +15,9 @@ export function NoBreakoutControls() {
<Box className={S.controlSection}>
<Button
className={S.controlButton}
- fw="bold"
aria-label={t`No breakout`}
variant="subtle"
- color="text-primary"
+ color="neutral"
leftSection={<Icon c="core-brand" name="unreferenced" size={16} />}
onClick={openSidebar}
>
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx
index 753816e8ccd..30a4848487a 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx
@@ -282,10 +282,7 @@ export function MetricSearchInput({
{isFocused && !pendingFocusRef.current && isExpressionDirty && (
<Button
variant="light"
- color="core-brand"
- size="xs"
- py="sm"
- px="sm"
+ color="brand"
leftSection={<Icon size="0.75rem" name="enter_or_return" />}
disabled={!!validationError}
data-testid="run-expression-button"
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css
index 77dcc77d0ee..113ed0200f8 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css
@@ -11,12 +11,3 @@
.filterPillsSection {
border-radius: 0 0 1rem 1rem;
}
-
-.filterButtonWithCount {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-.filterButtonAttachment {
- border-left: 1px solid var(--mb-color-border-filter);
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx
index c7d4c4617bf..7851a40fc8c 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx
@@ -99,16 +99,13 @@ export function MetricSearchPanel() {
<Button.Group>
<Button
variant="light"
- color="core-filter"
- size="xs"
- p="sm"
+ color="filter"
leftSection={
<Icon
name={hasFilters ? "filter_plus" : "filter"}
size={16}
/>
}
- className={hasFilters ? S.filterButtonWithCount : undefined}
>
{t`Filter`}
</Button>
@@ -116,16 +113,12 @@ export function MetricSearchPanel() {
<Tooltip label={toggleLabel}>
<Button
variant="light"
- color="core-filter"
- size="xs"
- py="sm"
- px="lg"
+ color="filter"
aria-label={toggleLabel}
onClick={(event) => {
event.stopPropagation();
setIsFilterPillsExpanded((prev) => !prev);
}}
- className={S.filterButtonAttachment}
>
{filterCount}
</Button>
diff --git a/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx b/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx
index af7a45eff56..a51f9e65b86 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx
@@ -92,7 +92,7 @@ export function AddDimensionsPanel({
mt="xxs"
>{t`You can pick one or many.`}</Text>
</Box>
- <Button variant="filled" onClick={onDone} size="sm">{t`Done`}</Button>
+ <Button variant="filled" onClick={onDone}>{t`Done`}</Button>
</Group>
{(!isEmpty || isSearchActive) && (
diff --git a/frontend/src/metabase/metrics/components/MetricDimensions/DimensionList.tsx b/frontend/src/metabase/metrics/components/MetricDimensions/DimensionList.tsx
index a7d895585e3..ee7a0367e84 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensions/DimensionList.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensions/DimensionList.tsx
@@ -92,7 +92,6 @@ export function DimensionList({
<Button
disabled={isAddDisabled}
onClick={onAdd}
- size="sm"
>{t`Available dimensions`}</Button>
</Group>
</Group>
diff --git a/frontend/src/metabase/metrics/components/MetricDimensions/DimensionSettingsPanel.tsx b/frontend/src/metabase/metrics/components/MetricDimensions/DimensionSettingsPanel.tsx
index 79c4dd40753..5eab630d997 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensions/DimensionSettingsPanel.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensions/DimensionSettingsPanel.tsx
@@ -159,7 +159,7 @@ export function DimensionSettingsPanel({
>
<Group
align="center"
- flex="0 0 2.25rem"
+ flex="0 0 2rem"
justify="space-between"
wrap="nowrap"
>
@@ -168,8 +168,6 @@ export function DimensionSettingsPanel({
<Button
loading={isSettingDefault || isFetching}
onClick={dimension.default ? handleRemoveDefault : handleSetDefault}
- size="sm"
- variant="default"
>
{dimension.default ? t`Remove default` : t`Set as default`}
</Button>
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/ExploreMetricButton.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/ExploreMetricButton.tsx
index 739afea9d04..fef32922645 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/ExploreMetricButton.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/ExploreMetricButton.tsx
@@ -14,8 +14,6 @@ export function ExploreMetricButton({ cardId }: ExploreMetricButtonProps) {
<Button
component={ForwardRefLink}
to={Urls.exploreMetric(cardId)}
- variant="default"
- size="xs"
leftSection={<Icon name="click" />}
data-testid="explore-link"
>
diff --git a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
index 8d29bb1fd51..7892c79f7da 100644
--- a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
+++ b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
@@ -83,12 +83,13 @@ export const Logs = ({
placeholder={t`Filter logs`}
rightSection={
query.length > 0 ? (
+ // TODO: replace with ActionIcon (GDGT-2457)
<Button
aria-label={t`Clear`}
- c="text-primary"
leftSection={<Icon name="close" />}
- size="xs"
variant="subtle"
+ color="neutral"
+ size="sm"
onClick={() => {
patchUrlState({ query: "" });
refollow();
@@ -137,13 +138,14 @@ export const Logs = ({
)}
<Button
+ size="lg"
component={Link}
to={Urls.monitorLogLevels()}
leftSection={<Icon name="pulse" />}
- variant="default"
>{t`Customize log levels`}</Button>
<Button
+ size="lg"
disabled={!hasFilteredLogs}
leftSection={<Icon name="download" />}
variant="filled"
diff --git a/frontend/src/metabase/monitor/tools/notifications/ChangeOwnerModal/ChangeOwnerModal.tsx b/frontend/src/metabase/monitor/tools/notifications/ChangeOwnerModal/ChangeOwnerModal.tsx
index 364cc97aec5..f731da6b01e 100644
--- a/frontend/src/metabase/monitor/tools/notifications/ChangeOwnerModal/ChangeOwnerModal.tsx
+++ b/frontend/src/metabase/monitor/tools/notifications/ChangeOwnerModal/ChangeOwnerModal.tsx
@@ -52,9 +52,7 @@ export const ChangeOwnerModal = ({
<UserPicker value={selectedCreator} onChange={setSelectedCreator} />
<Flex justify="flex-end" gap="sm">
- <Button variant="default" onClick={onClose}>
- {t`Cancel`}
- </Button>
+ <Button onClick={onClose}>{t`Cancel`}</Button>
<Button
variant="filled"
disabled={selectedCreator === null || isSubmitting}
diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx
index ffe8cd459f1..98003362b54 100644
--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx
+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx
@@ -219,7 +219,7 @@ export const NotificationsAdminPage = () => {
title: count === 1 ? t`Delete 1 alert?` : t`Delete ${count} alerts?`,
message: t`Recipients will stop receiving these alerts.`,
confirmButtonText: t`Delete`,
- confirmButtonProps: { color: "feedback-negative" },
+ confirmButtonProps: { color: "negative" },
size: "md",
onConfirm: () =>
deleteNotifications(
@@ -235,7 +235,7 @@ export const NotificationsAdminPage = () => {
title: t`Delete this alert?`,
message: t`Recipients will stop receiving this alert.`,
confirmButtonText: t`Delete`,
- confirmButtonProps: { color: "feedback-negative" },
+ confirmButtonProps: { color: "negative" },
onConfirm: () => deleteNotifications([id], "detail_sidebar"),
});
},
diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
index 25b9e3fb7d2..74d845a5c20 100644
--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
@@ -135,12 +135,13 @@ const MobileNavbar = ({ adminPaths, currentPath }: AdminMobileNavbarProps) => {
return (
<Group ref={ref} hiddenFrom="md" gap="0.5rem" align="center">
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
onClick={() => setMobileNavOpen((prev) => !prev)}
- variant="subtle"
- p="0.25rem"
+ variant="transparent"
+ size="compact-md"
leftSection={
- <Icon name="burger" size={32} color="text-primary-inverse" />
+ <Icon name="burger" size={24} color="text-primary-inverse" />
}
/>
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
index d5dc2fa2477..c7e9bb0cda2 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
@@ -172,7 +172,7 @@ export const AppSwitcher = ({ className }: { className?: string }) => {
<Menu.Target>
{appsSection ? (
<ActionIcon
- size="2.25rem"
+ size="2rem"
p="sm"
variant="outline"
bd="1px solid var(--mb-color-border-neutral)"
diff --git a/frontend/src/metabase/nav/components/NewItemButton/NewItemButton.tsx b/frontend/src/metabase/nav/components/NewItemButton/NewItemButton.tsx
index 69fde087aea..24556b8f29c 100644
--- a/frontend/src/metabase/nav/components/NewItemButton/NewItemButton.tsx
+++ b/frontend/src/metabase/nav/components/NewItemButton/NewItemButton.tsx
@@ -16,8 +16,6 @@ const NewItemButton = ({ collectionId }: NewItemButtonProps) => {
trigger={
<Button
variant="filled"
- size="sm"
- p="sm"
leftSection={<Icon name="add" size={16} />}
aria-label={t`New`}
onClick={() => trackAppNewButtonClicked()}
diff --git a/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx b/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx
index 15e44d8c460..76a7e5a6941 100644
--- a/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx
@@ -17,9 +17,7 @@ export const CommandPaletteTrigger = ({
onClick={onClick}
p="0.25rem"
bg="background_page-secondary"
- fw={700}
- fz="8pt"
- lh="8pt"
+ size="sm"
mr="0.5rem"
style={{
borderRadius: "0.25rem",
diff --git a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.module.css b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.module.css
index dc185ded5fd..9896178f020 100644
--- a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.module.css
+++ b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.module.css
@@ -8,13 +8,10 @@
}
.searchTextButton {
- height: 100%;
width: 100%;
- padding: 0 0.5rem 0 0.25rem;
display: inline-flex;
align-items: center;
justify-content: space-between;
- font-weight: bold;
gap: 0.25rem;
&:hover {
diff --git a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
index e15e628a0fc..a406f4008df 100644
--- a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
@@ -23,13 +23,14 @@ export const SearchButton = (props: ButtonProps) => {
const isSmallScreen = useIsSmallScreen();
if (isSmallScreen) {
+ // TODO: replace with ActionIcon (GDGT-2457)
return (
<Button
- h="36px"
- leftSection={<Icon name="search" />}
variant="subtle"
+ color="neutral"
+ size="sm"
+ leftSection={<Icon name="search" />}
onClick={handleClick}
- color="text-secondary"
aria-label="Search"
/>
);
@@ -37,7 +38,6 @@ export const SearchButton = (props: ButtonProps) => {
return (
<Button
- h="36px"
w="240px"
c={searchText ? "text-primary" : "text-disabled"}
leftSection={<Icon name="search" c="text-primary" />}
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
index 601aeaa1f6d..97a52aff920 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
@@ -235,18 +235,16 @@ export const CSVUpload = ({
</div>
{uploadState.file ? (
<Button
- variant="subtle"
- p={0}
- h="auto"
+ variant="transparent"
+ size="compact-md"
onClick={() => setUploadState({ file: null, error: null })}
>
{t`Remove`}
</Button>
) : (
<Button
- variant="subtle"
- p={0}
- h="auto"
+ variant="transparent"
+ size="compact-md"
onClick={handleFileSelectClick}
>
{t`Select a file`}
@@ -258,18 +256,17 @@ export const CSVUpload = ({
<Button
aria-label={t`Select a collection`}
onClick={() => openCollectionPicker()}
+ leftSection={<Icon name="folder" />}
rightSection={<Icon name="chevrondown" />}
styles={{
inner: {
justifyContent: "space-between",
},
+ label: { flex: 1 },
root: { flex: 1 },
}}
>
- <Group gap="sm" flex={1}>
- <Icon name="folder" />
- <CollectionName id={uploadCollectionId} />
- </Group>
+ <CollectionName id={uploadCollectionId} />
</Button>
<Button
variant="filled"
diff --git a/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx b/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx
index 565904af121..836b60f3c95 100644
--- a/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx
+++ b/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx
@@ -24,12 +24,13 @@ export const ChannelSettingsBlock = ({
<Text className={CS.textShortLineHeight}>{title}</Text>
</Group>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
+ variant="subtle"
+ color="neutral"
+ size="sm"
data-testid="remove-channel-button"
leftSection={<Icon name="close" />}
- color="text-primary"
- variant="subtle"
- size="compact-md"
onClick={onRemoveChannel}
/>
</Group>
diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
index 0c1a5df5e50..377e862822b 100644
--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
@@ -440,8 +440,8 @@ export const CreateOrEditQuestionAlertModal = ({
className={CS.borderTop}
>
<Button
- variant="outline"
- color="core-brand"
+ variant="subtle"
+ color="brand"
disabled={!hasValidTarget}
loading={isLoading}
onClick={onSendNow}
@@ -452,7 +452,7 @@ export const CreateOrEditQuestionAlertModal = ({
<Button onClick={onClose}>{t`Cancel`}</Button>
<Button
variant="filled"
- color={hasError ? "feedback-negative" : "core-brand"}
+ color={hasError ? "negative" : "brand"}
disabled={!isValid || isCreating || isUpdating}
loading={isCreating || isUpdating}
onClick={onCreateOrEditAlert}
diff --git a/frontend/src/metabase/notifications/modals/DeleteAlertConfirmModal.tsx b/frontend/src/metabase/notifications/modals/DeleteAlertConfirmModal.tsx
index 8aa9fd73988..75943a91c5f 100644
--- a/frontend/src/metabase/notifications/modals/DeleteAlertConfirmModal.tsx
+++ b/frontend/src/metabase/notifications/modals/DeleteAlertConfirmModal.tsx
@@ -25,7 +25,7 @@ export const DeleteAlertConfirmModal = ({
<Button onClick={onClose}>{t`Cancel`}</Button>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={onConfirm}
>{t`Delete it`}</Button>
</Flex>
diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.module.css b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.module.css
index 6710169d114..3b2df7360da 100644
--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.module.css
+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.module.css
@@ -37,7 +37,7 @@
display: none;
position: absolute;
- /* 1rem - 0.6875rem (small icon button paddings) */
- right: 0.3125rem;
- top: 0.3125rem;
+ /* 1rem - 4px (small icon button paddings) */
+ right: 0.75rem;
+ top: 0.75rem;
}
diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItemActionButton.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItemActionButton.tsx
index 473179bb508..679daaada5f 100644
--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItemActionButton.tsx
+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItemActionButton.tsx
@@ -14,12 +14,13 @@ export const AlertListItemActionButton = ({
onClick,
}: Props): JSX.Element => (
<Tooltip label={label}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- color="core-brand"
+ variant="subtle"
+ color="neutral"
+ size="sm"
aria-label={label}
leftSection={<Icon name={iconName} />}
- size="xs"
- variant="subtle"
onClick={onClick}
/>
</Tooltip>
diff --git a/frontend/src/metabase/notifications/modals/UnsubscribeConfirmModal.tsx b/frontend/src/metabase/notifications/modals/UnsubscribeConfirmModal.tsx
index 856e7e8fbf2..3b36eda195e 100644
--- a/frontend/src/metabase/notifications/modals/UnsubscribeConfirmModal.tsx
+++ b/frontend/src/metabase/notifications/modals/UnsubscribeConfirmModal.tsx
@@ -23,7 +23,7 @@ export const UnsubscribeConfirmModal = ({
<Button onClick={onClose}>{t`Cancel`}</Button>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={onConfirm}
>{t`Unsubscribe`}</Button>
</Flex>
diff --git a/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx b/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx
index afe2a7b3e69..81fa25b1660 100644
--- a/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx
+++ b/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { match } from "ts-pattern";
import { t } from "ttag";
+import { ForwardRefLink } from "metabase/common/components/Link";
import { Link } from "metabase/common/components/Link/Link";
import CS from "metabase/css/core/index.css";
import { getNotificationHandlersGroupedByTypes } from "metabase/notifications/utils";
@@ -82,7 +83,7 @@ export const NotificationChannelsAddMenu = ({
return (
<Menu position="bottom-start">
<Menu.Target>
- <Button variant="subtle" p={0} mt="-0.75rem" mb="-0.75rem">
+ <Button variant="transparent" size="compact-md">
{hasAddedNoChannels
? t`Add a destination`
: t`Add another destination`}
@@ -166,17 +167,7 @@ const MenuItemLink = ({
to: string;
children: React.ReactNode;
}) => (
- <Menu.Item py="0">
- <Button
- variant="subtle"
- size="xs-compact"
- component={Link}
- to={to}
- target="_blank"
- pl="0"
- fw="normal"
- >
- {children}
- </Button>
+ <Menu.Item component={ForwardRefLink} to={to} target="_blank">
+ {children}
</Menu.Item>
);
diff --git a/frontend/src/metabase/parameters/components/TagEditor/TagEditorHelp/TagEditorHelp.tsx b/frontend/src/metabase/parameters/components/TagEditor/TagEditorHelp/TagEditorHelp.tsx
index 03a167f0b78..27400b335a2 100644
--- a/frontend/src/metabase/parameters/components/TagEditor/TagEditorHelp/TagEditorHelp.tsx
+++ b/frontend/src/metabase/parameters/components/TagEditor/TagEditorHelp/TagEditorHelp.tsx
@@ -208,7 +208,6 @@ const TagExample = ({ datasetQuery, setDatasetQuery }: TagExampleProps) => (
{setDatasetQuery && (
<Button
className={CS.mt1}
- size="xs"
onClick={() => setDatasetQuery(datasetQuery, true)}
>
{t`Try it`}
diff --git a/frontend/src/metabase/parameters/components/TemporalUnitSettings/TemporalUnitSettings.tsx b/frontend/src/metabase/parameters/components/TemporalUnitSettings/TemporalUnitSettings.tsx
index 724e2c1cfc1..99e836c1c97 100644
--- a/frontend/src/metabase/parameters/components/TemporalUnitSettings/TemporalUnitSettings.tsx
+++ b/frontend/src/metabase/parameters/components/TemporalUnitSettings/TemporalUnitSettings.tsx
@@ -34,7 +34,7 @@ export function TemporalUnitSettings({
<Popover width="target">
<Popover.Target>
<Button
- fw="normal"
+ size="lg"
rightSection={<Icon name="chevrondown" />}
fullWidth
px={rem(11)} // needs to be the same as default input paddingLeft in Input.styled.tsx
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceSettings/ValuesSourceSettings.tsx b/frontend/src/metabase/parameters/components/ValuesSourceSettings/ValuesSourceSettings.tsx
index 74d6448aba7..c65f4d3155b 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceSettings/ValuesSourceSettings.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceSettings/ValuesSourceSettings.tsx
@@ -117,10 +117,8 @@ function RadioContainer({
<Button
onClick={onEditClick}
disabled={disableEdit}
- variant="subtle"
- p={0}
+ variant="transparent"
size="compact-md"
- h="100%"
>
<Box
component="span"
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
index 29a1c0c7846..7e43563c9eb 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
@@ -697,8 +697,7 @@ const DatasetEditorInnerView = (props: DatasetEditorInnerProps) => {
buttons={[
<Button
key="cancel"
- variant="subtle"
- size="sm"
+ variant="on-dark-secondary"
onClick={handleCancelClick}
>{t`Cancel`}</Button>,
<Tooltip
@@ -716,8 +715,7 @@ const DatasetEditorInnerView = (props: DatasetEditorInnerProps) => {
activeText={t`Saving…`}
failedText={t`Save failed`}
successText={t`Saved`}
- variant="filled"
- size="sm"
+ variant="on-dark-primary"
/>
</Tooltip>,
]}
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
index 63802776284..5f4d2efc791 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
@@ -70,7 +70,6 @@ export const DatasetEditorSettingsSidebar = ({
/>
{display === "list" && (
<Button
- variant="default"
onClick={() =>
dispatch(
setUIControls({ isShowingListViewConfiguration: true }),
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/ListViewColumnsSidebar.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/ListViewColumnsSidebar.tsx
index c0ccb27f04c..2be1fc18e94 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/ListViewColumnsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/ListViewColumnsSidebar.tsx
@@ -75,7 +75,7 @@ export function ListViewColumnsSidebar({
<Stack p="2.5rem">
<Group justify="space-between" align="center" h="1.5rem">
<Text fw="bold">{t`Customize List layout`}</Text>
- <Button size="xs" variant="subtle" onClick={onDone}>{t`Done`}</Button>
+ <Button variant="subtle" size="sm" onClick={onDone}>{t`Done`}</Button>
</Group>
<Stack gap="lg">
<TextInput
diff --git a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx
index 970bbb43e34..4e6a295fff4 100644
--- a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx
+++ b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx
@@ -29,6 +29,7 @@ export function NewDatasetModal({ onClose }: { onClose: () => void }) {
key="cancel"
onClick={onClose}
variant="subtle"
+ color="neutral"
>{t`Cancel`}</Button>,
<Button
key="action"
diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
index b257e79467d..75765d5edb8 100644
--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
@@ -76,7 +76,7 @@ export const NotebookNativePreview = () => {
title={t`Converting this question to SQL will break any dashboard filters connected to its columns`}
message={t`This question is part of an embedded dashboard. Converting the query to SQL will break any dashboard filters that map to its columns, since the conversion won't include SQL variables for the filters to connect to. You can, however, manually add those variables to the converted SQL, then connect the dashboard filters to those variables.`}
confirmButtonText={t`Convert to SQL`}
- confirmButtonProps={{ color: "core-brand", variant: "filled" }}
+ confirmButtonProps={{ color: "brand", variant: "filled" }}
onConfirm={handleConfirm}
onClose={handleClose}
/>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css
index 7cc271938dd..9d90c3bcb33 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css
@@ -1,23 +1,4 @@
.Root {
flex-basis: 40%;
flex-grow: 0;
-
- .FooterButtonGroup {
- .Button {
- border: 1px solid var(--mb-color-background_page-primary);
-
- /* compatibility with Button.Group */
- &:not(:last-of-type) {
- border-right-width: 0.5px;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- }
-
- &:not(:first-of-type) {
- border-left-width: 0.5px;
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- }
- }
- }
}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
index aae55f37789..d539dc21f5e 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
@@ -1,12 +1,11 @@
import cx from "classnames";
import { t } from "ttag";
-import { ViewButton } from "metabase/common/components/ViewButton";
import CS from "metabase/css/core/index.css";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { useDispatch, useSelector } from "metabase/redux";
import type { QueryBuilderUIControls } from "metabase/redux/store";
-import { Button, Group } from "metabase/ui";
+import { Button, Group, Icon } from "metabase/ui";
import {
onCloseChartSettings,
@@ -51,32 +50,22 @@ export const LeftViewFooterButtonGroup = () => {
return (
<Group className={cx(CS.flex1, S.Root)}>
- <Button.Group className={S.FooterButtonGroup}>
- <ViewButton
- medium
- labelBreakpoint="sm"
+ <Button.Group>
+ <Button
+ variant="light"
data-testid="viz-type-button"
- active={isShowingChartTypeSidebar}
- className={S.Button}
+ aria-pressed={isShowingChartTypeSidebar}
onClick={handleVizTypeClick}
>
{t`Visualization`}
- </ViewButton>
- <ViewButton
+ </Button>
+ <Button
+ variant="light"
disabled={question?.display() === "list"}
- className={S.Button}
- active={isShowingChartSettingsSidebar}
- icon="gear"
- iconSize={16}
- medium
- onlyIcon
- labelBreakpoint="sm"
data-testid="viz-settings-button"
- onClick={
- isShowingChartSettingsSidebar
- ? () => dispatch(onCloseChartSettings())
- : () => dispatch(onOpenChartSettings())
- }
+ aria-pressed={isShowingChartSettingsSidebar}
+ leftSection={<Icon name="gear" />}
+ onClick={handleVizSettingClick}
/>
</Button.Group>
</Group>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css
index 094f6a9bbe8..2af3ebecd50 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css
@@ -1,34 +1,7 @@
-.FilterButton {
- &[data-variant="default"] {
- transition:
- background 300ms linear,
- border 300ms linear;
-
- &:hover {
- color: var(--mb-color-core-filter);
- background-color: color-mix(
- in srgb,
- var(--mb-color-core-filter) 10%,
- var(--mb-color-core-white)
- );
- border-color: color-mix(
- in srgb,
- var(--mb-color-core-filter) 40%,
- var(--mb-color-core-white)
- );
- }
-
- /* this prevents the divider between the button group from changing color */
- &:hover&.FiltersActive {
- border-right-color: var(--mb-color-border-neutral);
- }
- }
-}
-
@container query-builder (max-width: 50em) {
.ActionButtonRoot[data-variant="default"] {
flex-shrink: 0;
- padding: 11px;
+ padding-inline: 8px;
}
.ActionButtonLabel {
@@ -40,87 +13,10 @@
}
}
-.FilterButtonAttachment {
- &[data-variant="default"] {
- padding: 0.5rem;
- transition:
- background 300ms linear,
- border 300ms linear;
-
- &:hover {
- background-color: color-mix(
- in srgb,
- var(--mb-color-core-filter) 10%,
- var(--mb-color-core-white)
- );
- border-color: color-mix(
- in srgb,
- var(--mb-color-core-filter) 40%,
- var(--mb-color-core-white)
- );
- }
-
- &:hover,
- &[data-expanded="true"] {
- .FilterCountChip {
- color: var(--mb-color-text-primary-inverse);
- background-color: var(--mb-color-core-filter);
- }
- }
- }
-}
-
-.FilterCountChip {
- font-size: 0.6875rem;
- border-radius: 10px;
- line-height: 1rem;
- padding-inline: 0.5rem;
- color: var(--mb-color-text-primary);
- background-color: color-mix(
- in srgb,
- var(--mb-color-core-filter) 15%,
- var(--mb-color-core-white)
- );
-}
-
.SummarizeButton {
transition:
background 300ms linear,
border 300ms linear;
-
- &:hover:not([data-active="true"]) {
- color: var(--mb-color-core-summarize);
- border-color: color-mix(
- in srgb,
- var(--mb-color-core-summarize) 40%,
- var(--mb-color-core-white)
- );
- background-color: color-mix(
- in srgb,
- var(--mb-color-core-summarize) 15%,
- var(--mb-color-core-white)
- );
- }
-}
-
-.NotebookButton {
- transition:
- background 300ms linear,
- border 300ms linear;
-
- &:hover:not([data-active="true"]) {
- color: var(--mb-color-core-brand);
- border-color: color-mix(
- in srgb,
- var(--mb-color-core-brand) 40%,
- var(--mb-color-core-white)
- );
- background-color: color-mix(
- in srgb,
- var(--mb-color-core-brand) 15%,
- var(--mb-color-core-white)
- );
- }
}
.BackButton {
@@ -161,6 +57,7 @@
.ViewHeaderActionPanel {
display: flex;
+ flex-shrink: 0;
align-items: center;
margin-left: auto;
gap: 0.5rem;
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
index 8fd49fa3175..f272e367290 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
@@ -1,5 +1,4 @@
import { useDisclosure } from "@mantine/hooks";
-import cx from "classnames";
import { useMemo } from "react";
import { t } from "ttag";
@@ -9,7 +8,7 @@ import { MultiStageFilterPicker } from "metabase/querying/filters/components/Fil
import type { FilterChangeOpts } from "metabase/querying/filters/components/FilterPicker/types";
import { useDispatch } from "metabase/redux";
import type { QueryBuilderMode } from "metabase/redux/store";
-import { Button, Icon, Popover, Tooltip } from "metabase/ui";
+import { Badge, Button, Icon, Popover, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
@@ -55,9 +54,6 @@ export function FilterHeaderButton({
<Popover opened={isOpened} position="bottom-start" onDismiss={close}>
<Popover.Target>
<Button
- className={cx(ViewTitleHeaderS.FilterButton, {
- [ViewTitleHeaderS.FiltersActive]: hasFilters,
- })}
classNames={{
root: ViewTitleHeaderS.ActionButtonRoot,
label: ViewTitleHeaderS.ActionButtonLabel,
@@ -83,15 +79,20 @@ export function FilterHeaderButton({
<Tooltip label={label}>
<Button
aria-label={label}
- className={ViewTitleHeaderS.FilterButtonAttachment}
onClick={isExpanded ? onCollapse : onExpand}
data-testid="filters-visibility-control"
data-expanded={isExpanded}
- style={{ borderLeft: "none" }} // mantine puts a double border between buttons in groups
>
- <div className={ViewTitleHeaderS.FilterCountChip}>
- {items?.length}
- </div>
+ <Badge
+ size="xs"
+ variant="filled"
+ color="neutral"
+ bg={isExpanded ? "core-filter-strong" : undefined}
+ c={isExpanded ? "text-primary-inverse" : undefined}
+ style={{ cursor: "inherit" }}
+ >
+ {items.length}
+ </Badge>
</Button>
</Tooltip>
)}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.module.css
deleted file mode 100644
index ac8d3bbaeda..00000000000
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.QueryBuilderBackButton {
- border-color: color-mix(
- in srgb,
- var(--mb-color-border-neutral),
- black 5%
- ) !important;
-}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
index c436b030d1a..8b8f316d110 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
@@ -11,8 +11,6 @@ import type { CollectionItemModel, DashboardId } from "metabase-types/api";
import { navigateBackToDashboard } from "../../../../../store/actions";
import { getParentEntity } from "../../../../../store/selectors";
-import S from "./QueryBuilderBackButton.module.css";
-
export type QueryBuilderBackButtonProps = {
noLink?: boolean;
onClick?: () => void;
@@ -57,7 +55,6 @@ export function QueryBuilderBackButton({
return (
<Tooltip label={label}>
<ActionIcon
- className={S.QueryBuilderBackButton}
variant="outline"
radius="xl"
size="2.625rem"
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionNotebookButton/QuestionNotebookButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionNotebookButton/QuestionNotebookButton.tsx
index 33aa2ab084c..359f3e6e09c 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionNotebookButton/QuestionNotebookButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionNotebookButton/QuestionNotebookButton.tsx
@@ -36,7 +36,6 @@ export function QuestionNotebookButton({
return (
<Button
data-testid="notebook-button"
- className={ViewTitleHeaderS.NotebookButton}
classNames={{
root: ViewTitleHeaderS.ActionButtonRoot,
label: ViewTitleHeaderS.ActionButtonLabel,
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
index ba0dfedd91d..cc24056bf8d 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
@@ -14,6 +14,13 @@ interface QuestionSummarizeWidgetProps {
onCloseSummary: () => void;
}
+const SUMMARIZE_ACTIVE_VARS = {
+ "--button-bg": "var(--mb-color-core-summarize)",
+ "--button-hover":
+ "color-mix(in srgb, var(--mb-color-core-summarize) 88%, transparent)",
+ "--button-pressed": "var(--mb-color-core-summarize)",
+};
+
export function QuestionSummarizeWidget({
isShowingSummarySidebar,
editSummary,
@@ -39,8 +46,10 @@ export function QuestionSummarizeWidget({
return (
<Button
- color="core-summarize"
variant={isShowingSummarySidebar ? "filled" : "default"}
+ vars={() => ({
+ root: isShowingSummarySidebar ? SUMMARIZE_ACTIVE_VARS : {},
+ })}
leftSection={<Icon name="sum" />}
onClick={handleClick}
data-active={isShowingSummarySidebar}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
index 310e3a0cd7f..39a0b40f0f8 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
@@ -240,8 +240,6 @@ export function ViewTitleHeaderRightSide({
<Button
className={ViewTitleHeaderS.SaveButton}
data-testid="qb-save-button"
- px="lg"
- py="sm"
variant="subtle"
aria-disabled={isSaveDisabled || undefined}
data-disabled={isSaveDisabled || undefined}
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx
index 1ef62452781..d66855add1a 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx
@@ -53,12 +53,7 @@ export function ModelCacheManagementSection({ model }: Props) {
const canRefreshCache =
persistedModel && checkCanRefreshModelCache(persistedModel);
- const refreshButtonLabel =
- persistedModel?.state === "creating" ? (
- t`Create now`
- ) : (
- <Icon name="refresh" tooltip={t`Refresh now`} />
- );
+ const isCreating = persistedModel?.state === "creating";
const canManageDB = model.canManageDB();
@@ -89,17 +84,27 @@ export function ModelCacheManagementSection({ model }: Props) {
</Flex>
{isError && <Box pt="sm">{lastRefreshLabel}</Box>}
</Box>
- {canRefreshCache && canManageDB && (
- <Button
- variant="subtle"
- p="xxs"
- c="text-primary"
- size="xs"
- onClick={() => onRefresh(model.id())}
- >
- {refreshButtonLabel}
- </Button>
- )}
+ {canRefreshCache &&
+ canManageDB &&
+ (isCreating ? (
+ <Button
+ variant="transparent"
+ size="compact-md"
+ onClick={() => onRefresh(model.id())}
+ >
+ {t`Create now`}
+ </Button>
+ ) : (
+ // TODO: replace with ActionIcon (GDGT-2457)
+ <Button
+ variant="subtle"
+ color="neutral"
+ size="sm"
+ aria-label={t`Refresh now`}
+ leftSection={<Icon name="refresh" tooltip={t`Refresh now`} />}
+ onClick={() => onRefresh(model.id())}
+ />
+ ))}
</Flex>
)}
</>
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ToggleFullList.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ToggleFullList.tsx
index 48f8d8482ff..18439f3db7a 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ToggleFullList.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ToggleFullList.tsx
@@ -29,7 +29,7 @@ export const ToggleFullList = ({
.t`Showing ${sliceLength} of ${fullLength} questions`}
</Text>
}
- <Button p={0} lh={1} variant="subtle" onClick={toggle}>
+ <Button variant="transparent" size="compact-md" onClick={toggle}>
{isExpanded ? t`Show less` : t`Show all`}
</Button>
</Group>
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css
index 8277aa039eb..5e85331e68d 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css
@@ -1,8 +1,7 @@
.AddAggregationButtonRoot {
&[data-variant="subtle"] {
- padding: 0.625rem;
+ padding-inline: 0.625rem;
color: var(--mb-color-core-summarize);
- background-color: var(--mb-color-background_page-secondary);
&:hover {
color: var(--mb-color-core-summarize);
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
index e0debcb020c..6cf632df43e 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
@@ -37,7 +37,6 @@ export function AddAggregationButton({
<Button
className={AddAggregationButtonS.AddAggregationButtonRoot}
variant="subtle"
- size="sm"
leftSection={<Icon name="add" />}
onClick={() => setIsOpened(!isOpened)}
aria-label={t`Add aggregation`}
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css
index c6f918256bd..f92481c7699 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css
@@ -10,26 +10,11 @@
}
.AddButton {
- width: 34px;
+ width: 32px;
margin-left: 0.5rem;
color: var(--mb-color-text-primary-inverse);
}
-.RemoveButton {
- &[data-variant="subtle"] {
- color: var(--mb-color-text-primary-inverse);
- background-color: transparent;
- opacity: 0.6;
- transition: all 100ms;
-
- &:hover {
- color: var(--mb-color-text-primary-inverse);
- background-color: transparent;
- opacity: 1;
- }
- }
-}
-
.Content {
display: flex;
flex: auto;
@@ -51,6 +36,7 @@
/* to increase specificity */
.AddButton {
+ height: auto;
transition: none;
}
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
index 0d1d9c801a7..8e5314aedb1 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
@@ -133,12 +133,13 @@ export function BreakoutColumnListItem({
: onAddBreakout(column)
}
/>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
{isSelected && (
<Button
- className={BreakoutColumnListItemS.RemoveButton}
- variant="subtle"
- size="xs"
- leftSection={<Icon name="close" />}
+ variant="transparent"
+ size="compact-md"
+ w="2rem"
+ leftSection={<Icon c="icon-primary-inverse" name="close" />}
onClick={handleRemoveColumn}
aria-label={t`Remove dimension`}
/>
@@ -146,10 +147,12 @@ export function BreakoutColumnListItem({
</Flex>
{!isSelected && (
<Tooltip label={t`Add grouping`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- className={BreakoutColumnListItemS.AddButton}
variant="subtle"
+ color="neutral"
size="sm"
+ className={BreakoutColumnListItemS.AddButton}
leftSection={<Icon name="add" />}
aria-label={t`Add dimension`}
onClick={handleAddClick}
diff --git a/frontend/src/metabase/querying/click-actions/actions/NativeQueryClickFallback.tsx b/frontend/src/metabase/querying/click-actions/actions/NativeQueryClickFallback.tsx
index 7034de891e9..debbb06fee2 100644
--- a/frontend/src/metabase/querying/click-actions/actions/NativeQueryClickFallback.tsx
+++ b/frontend/src/metabase/querying/click-actions/actions/NativeQueryClickFallback.tsx
@@ -26,8 +26,8 @@ export const NativeQueryClickFallback: LegacyDrill = ({ question }) => {
const button = (
<Button
key="save-button"
- variant="subtle"
- p={0}
+ variant="transparent"
+ size="compact-md"
onClick={() => dispatch(setUIControls({ modal: MODAL_TYPES.SAVE }))}
>
{c('in the sentence "Save this question to drill-through"').t`Save`}
diff --git a/frontend/src/metabase/querying/common/components/BooleanPicker/BooleanPicker.tsx b/frontend/src/metabase/querying/common/components/BooleanPicker/BooleanPicker.tsx
index fcd50e094fc..3354002c2ea 100644
--- a/frontend/src/metabase/querying/common/components/BooleanPicker/BooleanPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/BooleanPicker/BooleanPicker.tsx
@@ -50,7 +50,7 @@ export function BooleanPicker({
</Radio.Group>
{hasExpandButton && (
<Button
- c="text-secondary"
+ color="neutral"
variant="subtle"
aria-label={t`More options`}
rightSection={<Icon name="chevrondown" />}
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/DatePickerMenuItem.module.css b/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/DatePickerMenuItem.module.css
new file mode 100644
index 00000000000..844b87e3429
--- /dev/null
+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/DatePickerMenuItem.module.css
@@ -0,0 +1,15 @@
+.item {
+ display: block;
+ width: 100%;
+ padding: 12px 16px;
+ font-family: inherit;
+ font-size: 14px;
+ font-weight: 700;
+ line-height: 16px;
+ color: var(--mb-color-text-primary);
+
+ &:hover,
+ &[data-selected] {
+ color: var(--mb-color-text-brand);
+ }
+}
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/DatePickerMenuItem.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/DatePickerMenuItem.tsx
new file mode 100644
index 00000000000..9b9d4ebee83
--- /dev/null
+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/DatePickerMenuItem.tsx
@@ -0,0 +1,21 @@
+import type { ButtonHTMLAttributes } from "react";
+
+import { UnstyledButton, type UnstyledButtonProps } from "metabase/ui";
+
+import S from "./DatePickerMenuItem.module.css";
+
+type DatePickerMenuItemProps = UnstyledButtonProps &
+ ButtonHTMLAttributes<HTMLButtonElement> & {
+ isSelected?: boolean;
+ };
+
+export const DatePickerMenuItem = ({
+ isSelected,
+ ...props
+}: DatePickerMenuItemProps) => (
+ <UnstyledButton
+ className={S.item}
+ mod={{ selected: isSelected }}
+ {...props}
+ />
+);
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/index.ts
new file mode 100644
index 00000000000..6c4c7e0aebc
--- /dev/null
+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePickerMenuItem/index.ts
@@ -0,0 +1 @@
+export * from "./DatePickerMenuItem";
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.module.css b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.module.css
deleted file mode 100644
index 74a6fec5c33..00000000000
--- a/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.module.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.Button {
- color: var(--mb-color-text-primary);
-
- &:hover {
- color: var(--mb-color-core-brand);
- background-color: transparent;
- }
-}
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsx
index 2ac8cda283f..69697be3887 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsx
@@ -7,11 +7,11 @@ import type {
RelativeDatePickerValue,
RelativeIntervalDirection,
} from "metabase/querying/common/types";
-import { Box, Button, Divider } from "metabase/ui";
+import { Box, Divider } from "metabase/ui";
+import { DatePickerMenuItem } from "../DatePickerMenuItem";
import { MIN_WIDTH } from "../constants";
-import Styles from "./DateShortcutPicker.module.css";
import { getShortcutOptionGroups, getTypeOptions } from "./utils";
interface DateShortcutPickerProps {
@@ -46,17 +46,12 @@ export function DateShortcutPicker({
<Fragment key={groupIndex}>
{groupIndex > 0 && <Divider mx="lg" my="sm" />}
{group.map((option, optionIndex) => (
- <Button
+ <DatePickerMenuItem
key={optionIndex}
- classNames={{
- root: Styles.Button,
- }}
- display="block"
- variant="subtle"
onClick={() => onChange(option.value)}
>
{option.label}
- </Button>
+ </DatePickerMenuItem>
))}
</Fragment>
))}
@@ -64,18 +59,13 @@ export function DateShortcutPicker({
<Divider mx="lg" my="sm" />
)}
{typeOptions.map((option, optionIndex) => (
- <Button
+ <DatePickerMenuItem
key={optionIndex}
- classNames={{
- root: Styles.Button,
- }}
- display="block"
- variant="subtle"
onClick={() => onSelectType(option.type)}
data-testid={`date-picker-type-${option.type}`}
>
{option.label}
- </Button>
+ </DatePickerMenuItem>
))}
</Box>
);
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx
index 8d681b31074..3b94c8dafd4 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx
@@ -12,7 +12,6 @@ import { useSetting } from "metabase/settings";
import type { PopoverBackButtonProps } from "metabase/ui";
import {
Box,
- Button,
Checkbox,
Divider,
Group,
@@ -21,6 +20,7 @@ import {
Text,
} from "metabase/ui";
+import { DatePickerMenuItem } from "../DatePickerMenuItem";
import { MIN_WIDTH } from "../constants";
import type { DatePickerSubmitButtonProps } from "../types";
import { renderDefaultSubmitButton } from "../utils";
@@ -128,33 +128,24 @@ export function ExcludeOptionPicker({
<Divider />
<Box p="sm">
{unitOptions.map((option, index) => (
- <Button
+ <DatePickerMenuItem
key={index}
- c="text-primary"
- display="block"
- variant="subtle"
onClick={() => onSelectUnit(option.unit)}
>
{option.label}
- </Button>
+ </DatePickerMenuItem>
))}
{unitOptions.length > 0 && operatorOptions.length > 0 && (
<Divider mx="lg" my="sm" />
)}
{operatorOptions.map((option, index) => (
- <Button
+ <DatePickerMenuItem
key={index}
- c={
- option.operator === value?.operator
- ? "text-brand"
- : "text-primary"
- }
- display="block"
- variant="subtle"
+ isSelected={option.operator === value?.operator}
onClick={() => handleChange(option.operator)}
>
{option.label}
- </Button>
+ </DatePickerMenuItem>
))}
</Box>
</Box>
@@ -255,5 +246,5 @@ function ExcludeValuePicker({
}
function BackButton(props: PopoverBackButtonProps) {
- return <PopoverBackButton px="lg" py="sm" {...props} />;
+ return <PopoverBackButton px="lg" py="md" h="auto" {...props} />;
}
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsx
index 9a7537640ec..200997a7216 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsx
@@ -44,7 +44,6 @@ export function CurrentDatePicker({
>
<Button
variant={unit === value?.unit ? "filled" : "default"}
- radius="xl"
aria-selected={unit === value?.unit}
onClick={() => handleClick(unit)}
>
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx
index aab43508f2a..6b2243244a5 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx
@@ -101,10 +101,13 @@ export function DateIntervalPicker({
}}
/>
<Tooltip label={t`Starting from…`} position="bottom">
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- aria-label={t`Starting from…`}
- c="text-secondary"
variant="subtle"
+ color="neutral"
+ size="sm"
+ ml="sm"
+ aria-label={t`Starting from…`}
leftSection={<Icon name="arrow_left_to_line" />}
onClick={handleStartingFromClick}
/>
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx
index 1681c4443a7..213806651a7 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx
@@ -138,9 +138,11 @@ export function DateOffsetIntervalPicker({
floatingStrategy: "fixed",
}}
/>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- c="text-secondary"
variant="subtle"
+ color="neutral"
+ size="sm"
leftSection={<Icon name="close" />}
aria-label={t`Remove offset`}
onClick={handleOffsetRemove}
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx
index de71193f2a4..1f1f8b7dfd8 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx
@@ -66,7 +66,7 @@ export function RelativeDatePicker({
return (
<Tabs value={direction} onChange={handleTabChange}>
- <Flex>
+ <Flex align="center">
<PopoverBackButton
px="sm"
h="var(--tab-height)"
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx
index 24a4fe92062..1562c4c269c 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx
@@ -80,7 +80,7 @@ export function SpecificDatePicker({
return (
<Tabs value={value.operator} onChange={handleTabChange}>
- <Flex>
+ <Flex align="center">
<PopoverBackButton
px="sm"
h="var(--tab-height)"
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsx
index fcb56a9ddbe..728cea024c5 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsx
@@ -13,7 +13,7 @@ export function TimeToggle({ hasTime, ...props }: TimeToggleProps) {
return (
<Button
- c="text-secondary"
+ color="neutral"
variant="subtle"
leftSection={<Icon name="clock" />}
aria-label={label}
diff --git a/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsx b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsx
index 79c801f7aa9..8ac2144e883 100644
--- a/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsx
@@ -60,7 +60,6 @@ function ShortcutButton({ value, shortcut, onChange }: ShortcutButtonProps) {
return (
<Button
variant={isSelected ? "filled" : "default"}
- fw="normal"
aria-selected={isSelected}
onClick={() => onChange(shortcut.value)}
>
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css
index 6bfe281daf9..e8a83e397c5 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css
@@ -2,7 +2,6 @@
color: var(--mb-color-text-primary);
transition: color 0.3s linear;
border: none;
- height: fit-content;
&:hover {
color: var(--mb-color-core-brand);
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
index 4b3d91d1080..4cca9580b80 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
@@ -91,11 +91,12 @@ export const NativeQueryEditorActionButtons = (
)}
{showFormatButton && onFormatQuery && (
<Tooltip label={t`Auto-format`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
className={S.button}
aria-label={t`Auto-format`}
- p={0}
leftSection={
<Icon name="format_code" size={NATIVE_EDITOR_ICON_SIZE} />
}
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
index cc180caa6db..667d65919c2 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
@@ -414,10 +414,8 @@ export const NativeQueryEditorRoot = forwardRef<
>
<Button
data-testid="accept-proposed-changes-button"
- variant="filled"
- bg="feedback-positive"
- px="0"
- w="2.5rem"
+ variant="light"
+ color="positive"
onClick={() => {
const proposedQuery =
proposedQuestion.legacyNativeQuery();
@@ -427,9 +425,8 @@ export const NativeQueryEditorRoot = forwardRef<
onAcceptProposed(proposedQuery.datasetQuery());
}
}}
- >
- <Icon name="check" />
- </Button>
+ leftSection={<Icon name="check" />}
+ />
</Tooltip>
<Tooltip
label={t`Reject proposed changes`}
@@ -437,14 +434,11 @@ export const NativeQueryEditorRoot = forwardRef<
>
<Button
data-testid="reject-proposed-changes-button"
- w="2.5rem"
- px="0"
- variant="filled"
- bg="feedback-negative"
+ variant="light"
+ color="negative"
onClick={onRejectProposed}
- >
- <Icon name="close" />
- </Button>
+ leftSection={<Icon name="close" />}
+ />
</Tooltip>
</>
)}
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx
index 0ff25ae871e..19dee580210 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx
@@ -121,9 +121,8 @@ function SnippetFormInner({
type="button"
className={S.ArchiveButton}
leftSection={<Icon name="archive" />}
- variant="subtle"
- color="text-secondary"
- size="sm"
+ variant="transparent"
+ size="compact-md"
onClick={onArchive}
>
{t`Archive`}
@@ -133,7 +132,7 @@ function SnippetFormInner({
</Flex>
<Flex align="center" justify="center" gap="sm">
{!!onCancel && (
- <Button type="button" size="sm" onClick={onCancel}>
+ <Button type="button" onClick={onCancel}>
{t`Cancel`}
</Button>
)}
@@ -141,7 +140,6 @@ function SnippetFormInner({
label={t`Save`}
disabled={!dirty && !isInitiallyDirty}
variant="filled"
- size="sm"
/>
</Flex>
</Flex>
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.module.css b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.module.css
index d4ac1f06e86..3776b711fe5 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.module.css
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.module.css
@@ -26,15 +26,3 @@
background-color: var(--mb-color-background_page-secondary);
overflow-wrap: break-word;
}
-
-.QueryErrorLink {
- color: var(--mb-color-core-brand);
- font-size: 0.75rem;
- line-height: 1rem;
- font-weight: bold;
- text-decoration: none;
-
- &:hover {
- text-decoration: underline;
- }
-}
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx
index e5cc7e967ca..fc763241ca1 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx
@@ -14,7 +14,7 @@ import { getEngineNativeType } from "metabase/databases/utils/engine";
import { useSelector } from "metabase/redux";
import { getLearnUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
-import { Box, Center, Flex, Icon } from "metabase/ui";
+import { Box, Button, Center, Flex, Icon } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { DatasetError, DatasetErrorType } from "metabase-types/api";
@@ -160,14 +160,15 @@ export function VisualizationError({
<Box className={VisErrorS.QueryErrorMessage}>{processedError}</Box>
<Flex align="center" my="lg" gap="lg">
{isSql && showMetabaseLinks && (
- <ExternalLink
- className={VisErrorS.QueryErrorLink}
+ <Button
+ component={ExternalLink}
href={getLearnUrl(
"grow-your-data-skills/learn-sql/debugging-sql/sql-syntax",
)}
+ variant="subtle"
>
{t`Learn how to debug SQL errors`}
- </ExternalLink>
+ </Button>
)}
{errorAction}
</Flex>
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
index e7529fc477c..55023e4feeb 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
@@ -71,7 +71,6 @@ export function VisualizationResult(props: QueryVisualizationProps) {
{supportsBackToPreviousResult && (
<Button
- variant="default"
onClick={() =>
onNavigateBack ? onNavigateBack() : window.history.back()
}
diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.module.css b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.module.css
index 3230b0ce322..f39fcdc0f5f 100644
--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.module.css
+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.module.css
@@ -10,7 +10,4 @@
.HeaderButton {
color: var(--mb-color-text-secondary);
- width: 36px;
- height: 36px;
- padding: 0;
}
diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx
index 9f88ea1ffc1..c07a9b61a76 100644
--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx
+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx
@@ -192,13 +192,14 @@ class SnippetSidebarInner extends Component<
}
}}
/>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- variant="transparent"
+ variant="subtle"
+ color="neutral"
+ size="sm"
onClick={this.hideSearch}
- className={S.HeaderButton}
- >
- <Icon name="close" />
- </Button>
+ leftSection={<Icon name="close" />}
+ />
</>
) : (
<>
@@ -214,6 +215,7 @@ class SnippetSidebarInner extends Component<
<Flex
align="center"
justify="flex-end"
+ gap="md"
data-testid="snippet-header-buttons"
>
{PLUGIN_SNIPPET_SIDEBAR_HEADER_BUTTONS.map((f) =>
@@ -221,24 +223,26 @@ class SnippetSidebarInner extends Component<
)}
{snippets.length >= MIN_SNIPPETS_FOR_SEARCH && (
+ // TODO: replace with ActionIcon (GDGT-2457)
<Button
- variant="transparent"
+ variant="subtle"
+ color="neutral"
+ size="sm"
onClick={this.showSearch}
- className={S.HeaderButton}
- >
- <Icon name="search" />
- </Button>
+ leftSection={<Icon name="search" />}
+ />
)}
{showAddMenu && (
<Menu position="bottom-end">
<Menu.Target>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- variant="transparent"
- className={S.HeaderButton}
- >
- <Icon name="add" />
- </Button>
+ variant="subtle"
+ color="neutral"
+ size="sm"
+ leftSection={<Icon name="add" />}
+ />
</Menu.Target>
<Menu.Dropdown>
{[
diff --git a/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx
index 16a521db009..50ba53b0846 100644
--- a/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx
+++ b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx
@@ -49,7 +49,6 @@ export const ColumnAndSeparatorRow = ({
onChange(index, column, separator);
}}
/>
-
<ColumnInput
query={query}
stageIndex={stageIndex}
@@ -60,17 +59,15 @@ export const ColumnAndSeparatorRow = ({
onChange(index, column, separator);
}}
/>
-
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
{showRemove && (
<Button
- styles={{
- root: {
- border: "none",
- },
- }}
+ variant="subtle"
+ color="neutral"
+ size="sm"
+ mb="sm"
aria-label={t`Remove column`}
leftSection={<Icon name="close" />}
- variant="default"
onClick={() => {
onRemove(index);
}}
diff --git a/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx
index 567ef1c8a84..33907f3b739 100644
--- a/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx
+++ b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx
@@ -117,6 +117,7 @@ export function ColumnInput({
<Popover.Target>
<Button
data-testid="column-input"
+ size="lg"
ref={button}
onMouseDownCapture={handleButtonClick}
onKeyDown={handleKeyDown}
diff --git a/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsx
index 5a21def4136..1d34aee8e68 100644
--- a/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsx
+++ b/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsx
@@ -200,8 +200,8 @@ export function CombineColumns({
{isUsingDefaultSeparator && (
<Box>
<Button
- p={0}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
onClick={handleEditSeparators}
>
{jt`Separated by ${formatSeparator(
@@ -213,8 +213,8 @@ export function CombineColumns({
<Button
leftSection={<Icon name="add" />}
- p={0}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
onClick={handleRowAdd}
>
{t`Add column`}
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/CloseModal/CloseModal.tsx b/frontend/src/metabase/querying/components/expressions/Editor/CloseModal/CloseModal.tsx
index fac47185a0d..bbfe3e35644 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/CloseModal/CloseModal.tsx
+++ b/frontend/src/metabase/querying/components/expressions/Editor/CloseModal/CloseModal.tsx
@@ -20,7 +20,7 @@ export function CloseModal({
onConfirm={onDiscardChanges}
onClose={onKeepEditing || _.noop}
confirmButtonText={t`Discard changes`}
- confirmButtonProps={{ color: "core-brand", variant: "filled" }}
+ confirmButtonProps={{ color: "brand", variant: "filled" }}
closeButtonText={t`Keep editing`}
/>
);
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
index 3b5105b3da5..c58d519d1ff 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
+++ b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
@@ -203,22 +203,22 @@ export function Editor(props: EditorProps) {
<Button
aria-label={t`Function browser`}
onClick={toggleFunctionBrowser}
+ size="sm"
variant={isFunctionBrowserOpen ? "filled" : "subtle"}
className={S.toolbarButton}
- size="xs"
- p="x"
leftSection={<Icon name="function" />}
/>
</ButtonTooltip>
{source.trim() !== "" && error == null && isValidated && (
<ButtonTooltip label={t`Auto-format`}>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
+ variant="subtle"
+ color="neutral"
+ size="sm"
aria-label={t`Auto-format`}
onClick={formatExpression}
className={S.toolbarButton}
- variant="subtle"
- size="xs"
- p="xxs"
disabled={isFormatting || error != null}
leftSection={<Icon name="format_code" />}
/>
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/Shortcuts/Shortcuts.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Shortcuts/Shortcuts.tsx
index b5614344079..7902d36a027 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/Shortcuts/Shortcuts.tsx
+++ b/frontend/src/metabase/querying/components/expressions/Editor/Shortcuts/Shortcuts.tsx
@@ -21,8 +21,6 @@ export function Shortcuts({
<Button
key={index}
variant="light"
- radius="5rem"
- size="xs"
onClick={shortcut.action}
leftSection={<Icon name={shortcut.icon} />}
>
diff --git a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsx b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsx
index a668a6b0880..60bed7d1988 100644
--- a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsx
+++ b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsx
@@ -225,15 +225,10 @@ export const ExpressionWidget = (props: ExpressionWidgetProps) => {
<Button
onClick={onClose}
variant="subtle"
- size="xs"
+ color="neutral"
>{t`Cancel`}</Button>
)}
- <Button
- variant="filled"
- disabled={!isValid}
- onClick={handleSubmit}
- size="xs"
- >
+ <Button variant="filled" disabled={!isValid} onClick={handleSubmit}>
{(initialName || initialClause) && !readOnly
? t`Update`
: t`Done`}
diff --git a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css
index 216951c4316..906e89a9913 100644
--- a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css
+++ b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css
@@ -7,6 +7,8 @@
height: 3rem;
.HeaderButton[data-variant="subtle"] {
+ --mb-button-padding-x: 0px;
+
color: var(--mb-color-text-disabled);
&:not(:disabled):hover {
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
index f15cf8516a0..287539ed5cc 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
@@ -70,7 +70,9 @@ export function DateFilterPicker({
renderBackButton={() =>
onBack ? (
<PopoverBackButton
- p="sm"
+ px="sm"
+ py="md"
+ h="auto"
onClick={onBack}
disabled={readOnly}
withArrow={!readOnly}
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
index e836c95ac77..8653f1e3f7e 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
@@ -23,7 +23,6 @@ export function FilterOperatorPicker<T extends Lib.FilterOperator>({
<Menu>
<Menu.Target>
<Button
- fw="normal"
rightSection={<Icon name="chevrondown" />}
aria-label={t`Filter operator`}
className={S.root}
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx
index e1e1d924acb..9a0ee144de5 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { Button, Divider, Icon, Tooltip } from "metabase/ui";
+import { Button, Icon, Tooltip } from "metabase/ui";
type FilterSubmitButtonProps = {
isNew?: boolean;
@@ -29,7 +29,6 @@ export function FilterSubmitButton({
<Button type="submit" variant="filled" disabled={isDisabled}>
{t`Apply filter`}
</Button>
- <Divider orientation="vertical" />
<Tooltip label={addButtonLabel}>
<Button
type="button"
diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorHeader/MetricEditorHeader.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorHeader/MetricEditorHeader.tsx
index c7a67e08ba6..ff9c488bb53 100644
--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorHeader/MetricEditorHeader.tsx
+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorHeader/MetricEditorHeader.tsx
@@ -37,16 +37,11 @@ export function MetricEditorHeader({
className={S.root}
title={question.displayName() ?? t`New metric`}
buttons={[
- <Button key="cancel" variant="subtle" size="sm" onClick={onCancel}>
+ <Button key="cancel" variant="on-dark-secondary" onClick={onCancel}>
{t`Cancel`}
</Button>,
!question.isSaved() ? (
- <Button
- key="create"
- variant="filled"
- size="sm"
- onClick={handleCreate}
- >
+ <Button key="create" variant="on-dark-primary" onClick={handleCreate}>
{t`Save`}
</Button>
) : (
@@ -59,8 +54,7 @@ export function MetricEditorHeader({
activeText={t`Saving…`}
failedText={t`Save failed`}
successText={t`Saved`}
- variant="filled"
- size="sm"
+ variant="on-dark-primary"
/>
),
]}
diff --git a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.module.css b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.module.css
index 9257a395455..678c0267811 100644
--- a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.module.css
+++ b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.module.css
@@ -1,15 +1,3 @@
-.ModalExternalLink {
- color: var(--mb-color-core-brand);
- font-size: 0.75rem;
- line-height: 1rem;
- font-weight: bold;
- text-decoration: none;
-
- &:hover {
- text-decoration: underline;
- }
-}
-
.code {
background-color: var(--mb-color-background_page-secondary);
border-radius: var(--mantine-radius-sm);
diff --git a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx
index 5cb9d4436a3..9760d70c5ca 100644
--- a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx
@@ -9,7 +9,7 @@ import { formatNativeQuery } from "metabase/databases/utils/engine";
import { useSelector } from "metabase/redux";
import { getLearnUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
-import { Box, Flex, Icon, Loader, Stack } from "metabase/ui";
+import { Box, Button, Flex, Icon, Loader, Stack } from "metabase/ui";
import * as Lib from "metabase-lib";
import type {
NativeDatasetResponse,
@@ -66,9 +66,9 @@ export function NativeQueryPreview({
{formattedError && showMetabaseLinks && (
<Flex justify="end" mt="xl">
- <ExternalLink className={S.ModalExternalLink} href={learnUrl}>
+ <Button component={ExternalLink} href={learnUrl} variant="subtle">
{t`Learn how to debug SQL errors`}
- </ExternalLink>
+ </Button>
</Flex>
)}
</Stack>
diff --git a/frontend/src/metabase/querying/notebook/components/Notebook/VisualizationButton.tsx b/frontend/src/metabase/querying/notebook/components/Notebook/VisualizationButton.tsx
index baeb6ca0d66..f707ec2b0bc 100644
--- a/frontend/src/metabase/querying/notebook/components/Notebook/VisualizationButton.tsx
+++ b/frontend/src/metabase/querying/notebook/components/Notebook/VisualizationButton.tsx
@@ -41,6 +41,7 @@ export const VisualizeButton = ({
return (
<Button
variant="filled"
+ size="lg"
style={{ minWidth: 220 }}
onClick={visualizeQuestion}
>
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
index 6db3be41944..363f137b233 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
@@ -121,8 +121,8 @@ export const NotebookNativePreview = ({
{!readOnly && (
<Box ta="end" p="1.5rem">
<Button
- variant="subtle"
- p={0}
+ variant="transparent"
+ size="compact-md"
onClick={handleConvertClick}
disabled={!showQuery || disableConvert}
>
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
index 2a97a3aa519..8ba36d1775a 100644
--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
@@ -192,7 +192,7 @@ export const MoveCardModal = ({ card, onClose }: MoveCardModalProps) => {
</Radio.Group>
</>
}
- confirmButtonProps={{ color: "core-brand", variant: "filled" }}
+ confirmButtonProps={{ color: "brand", variant: "filled" }}
confirmButtonText={t`Done`}
/>
);
@@ -223,7 +223,7 @@ export const MoveCardModal = ({ card, onClose }: MoveCardModalProps) => {
}
message={t`You can move it to a collection if you want to use it in both dashboards.`}
confirmButtonText={t`Okay`}
- confirmButtonProps={{ color: "core-brand", variant: "filled" }}
+ confirmButtonProps={{ color: "brand", variant: "filled" }}
/>
);
}
diff --git a/frontend/src/metabase/reference/components/EditHeader.tsx b/frontend/src/metabase/reference/components/EditHeader.tsx
index 8b1593199a9..2e711499a26 100644
--- a/frontend/src/metabase/reference/components/EditHeader.tsx
+++ b/frontend/src/metabase/reference/components/EditHeader.tsx
@@ -39,7 +39,6 @@ export const EditHeader = memo(function EditHeader({
<div className={cx(CS.wrapper, CS.px3, S.editHeader)}>
<div className={S.editHeaderButtons}>
<Button
- variant="outline"
onClick={() => {
endEditing();
reinitializeForm();
diff --git a/frontend/src/metabase/reference/components/EditableReferenceHeader.tsx b/frontend/src/metabase/reference/components/EditableReferenceHeader.tsx
index e89ccd06154..feb089b717e 100644
--- a/frontend/src/metabase/reference/components/EditableReferenceHeader.tsx
+++ b/frontend/src/metabase/reference/components/EditableReferenceHeader.tsx
@@ -2,7 +2,7 @@ import cx from "classnames";
import { memo } from "react";
import { t } from "ttag";
-import { Link } from "metabase/common/components/Link";
+import { ForwardRefLink } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
import L from "metabase/reference/components/List/List.module.css";
import { Button, Ellipsified, Icon, TextInputBlurChange } from "metabase/ui";
@@ -102,11 +102,12 @@ const EditableReferenceHeader = ({
headerLink && (
<Button
key="2"
+ component={ForwardRefLink}
+ to={headerLink}
variant="filled"
className={cx(CS.flex, CS.flexAlignRight, CS.mr2)}
- style={{ fontSize: 14 }}
>
- <Link to={headerLink}>{t`See this ${type}`}</Link>
+ {t`See this ${type}`}
</Button>
),
]
@@ -114,7 +115,6 @@ const EditableReferenceHeader = ({
{user && user.is_superuser && !isEditing && (
<Button
leftSection={<Icon name="pencil" />}
- style={{ fontSize: 14 }}
type="button"
onClick={startEditing}
>
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/components/CommentsButton.tsx b/frontend/src/metabase/rich_text_editing/tiptap/components/CommentsButton.tsx
index e69d72e41dc..c6d770c9c93 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/components/CommentsButton.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/components/CommentsButton.tsx
@@ -5,22 +5,27 @@ import { Button, type ButtonProps, Icon } from "metabase/ui";
type Props<C extends ElementType = "button"> = ButtonProps & {
unresolvedCommentsCount: number;
+ active?: boolean;
component?: C;
} & Omit<ComponentPropsWithoutRef<C>, keyof ButtonProps | "component">;
export const CommentsButton = <C extends ElementType = "button">({
unresolvedCommentsCount,
+ active,
...props
}: Props<C>) => {
+ // TODO: replace with ActionIcon (GDGT-2457)
return (
<Button
aria-label={t`Comments`}
- bd={0}
+ variant={active ? "filled" : "transparent"}
+ size={active ? "sm" : "compact-md"}
leftSection={
- <Icon name={unresolvedCommentsCount > 0 ? "comment" : "add_comment"} />
+ <Icon
+ name={unresolvedCommentsCount > 0 ? "comment" : "add_comment"}
+ c={active ? undefined : "icon-primary"}
+ />
}
- px="sm"
- size="xs"
// Unjustified type cast. FIXME
{...(props as ButtonProps)}
>
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.module.css b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.module.css
index 8e464d55e25..168059c94ba 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.module.css
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.module.css
@@ -69,7 +69,3 @@
pointer-events: none;
color: var(--mb-color-text-disabled);
}
-
-.commentsButton[data-variant="default"]:not(:hover) {
- background-color: transparent;
-}
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx
index 25e653ebf0b..f76f72f9642 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx
@@ -230,9 +230,8 @@ const SupportingTextComponent = ({
})}
>
<CommentsButton
- className={S.commentsButton}
disabled={!commentsPath}
- variant={isOpen ? "filled" : "default"}
+ active={isOpen}
unresolvedCommentsCount={unresolvedCommentsCount}
onClick={(e) => {
e.preventDefault();
diff --git a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
index f661f73c058..f9c0fd7a517 100644
--- a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
+++ b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
@@ -12,7 +12,7 @@ import type {
} from "metabase/common/search/types";
import { useSelector } from "metabase/redux";
import { getIsNavbarOpen } from "metabase/selectors/app";
-import { Box, Button, Center, Icon, Popover, Stack, Text } from "metabase/ui";
+import { Box, Button, Icon, Popover, Stack, Text } from "metabase/ui";
import { isNotNull } from "metabase/utils/types";
import type { IconName } from "metabase-types/api";
@@ -130,18 +130,14 @@ export const DropdownSidebarFilter = ({
</Text>
</GroupOverflowHidden>
)}
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- data-testid="sidebar-filter-dropdown-button"
- size="compact-xs"
- mr="0.25rem"
- c="inherit"
variant="subtle"
+ color="neutral"
+ size="sm"
+ data-testid="sidebar-filter-dropdown-button"
onClick={onClearFilter}
- leftSection={
- <Center m="-0.25rem">
- <Icon size={16} name={getDropdownIcon()} />
- </Center>
- }
+ leftSection={<Icon name={getDropdownIcon()} />}
/>
</GroupOverflowHidden>
</DropdownFieldSet>
diff --git a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.tsx b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.tsx
index abf48683ff4..93bb39230cd 100644
--- a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.tsx
+++ b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.tsx
@@ -88,8 +88,7 @@ export const SearchUserPicker = ({
data-testid="selected-user-button"
key={userId}
c="core-brand"
- px="lg"
- py="sm"
+ px="md"
maw="100%"
rightSection={<Icon name="close" />}
onClick={() => removeUser(user)}
diff --git a/frontend/src/metabase/search/components/UserListElement/UserListElement.tsx b/frontend/src/metabase/search/components/UserListElement/UserListElement.tsx
index 25ae597398c..4b20f4c9635 100644
--- a/frontend/src/metabase/search/components/UserListElement/UserListElement.tsx
+++ b/frontend/src/metabase/search/components/UserListElement/UserListElement.tsx
@@ -18,8 +18,6 @@ export const UserListElement = ({
data-testid="user-list-element"
onClick={() => onClick(value)}
data-is-selected={isSelected}
- px="sm"
- py="xxs"
variant="subtle"
bg={isSelected ? "core-brand" : undefined}
justify="start"
diff --git a/frontend/src/metabase/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/segments/components/SegmentEditor/DataStep/DataStep.tsx
index 425cd5fd214..5eba5aa00f6 100644
--- a/frontend/src/metabase/segments/components/SegmentEditor/DataStep/DataStep.tsx
+++ b/frontend/src/metabase/segments/components/SegmentEditor/DataStep/DataStep.tsx
@@ -72,9 +72,8 @@ export function DataStep({
{isNew ? (
<Button
- variant="subtle"
- p={0}
- c="text-primary"
+ variant="transparent"
+ size="compact-md"
rightSection={<Icon name="chevrondown" />}
onClick={() => setIsOpened(true)}
>
diff --git a/frontend/src/metabase/segments/components/SegmentEditor/FilterStep/FilterStep.tsx b/frontend/src/metabase/segments/components/SegmentEditor/FilterStep/FilterStep.tsx
index 116a17f4d16..147ce356fb5 100644
--- a/frontend/src/metabase/segments/components/SegmentEditor/FilterStep/FilterStep.tsx
+++ b/frontend/src/metabase/segments/components/SegmentEditor/FilterStep/FilterStep.tsx
@@ -142,9 +142,8 @@ const AddFilterButton = forwardRef(function AddFilterButton(
<Button
ref={ref}
c="text-disabled"
- p={compact ? undefined : 0}
- variant={compact ? "default" : "subtle"}
- size={compact ? "compact-md" : "md"}
+ variant={compact ? "default" : "transparent"}
+ size={compact ? "sm" : "compact-md"}
disabled={disabled}
rightSection={<Icon name="add" />}
aria-label={compact ? t`Add filters` : undefined}
diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx
index dc32d41dd07..ffcd6e99e4a 100644
--- a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx
+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx
@@ -101,17 +101,16 @@ export const LicenseTokenForm = ({
/>
</Flex>
<Divider mx={{ base: "-2rem", sm: "-4rem" }} mt="xxl" mb="lg" />
- <Box>
+ <Stack gap="xs" align="flex-start">
<Button
onClick={onSkip}
- variant="subtle"
- px={0}
- fw="normal"
+ variant="transparent"
+ size="compact-md"
>{t`I'll activate later`}</Button>
- <Text c="text-disabled" size="sm">
+ <Text c="text-secondary" size="sm">
{t`You won't have access to paid features until you activate.`}
</Text>
- </Box>
+ </Stack>
</Form>
)}
</FormProvider>
diff --git a/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx b/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx
index 58b753565af..d67ed91a037 100644
--- a/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx
+++ b/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx
@@ -138,11 +138,8 @@ const UploadErrorDisplay = ({ upload }: { upload: FileUpload }) => {
return (
<>
<Button
- variant="subtle"
- size="xs"
- h="1rem"
- p={0}
- fz="sm"
+ variant="transparent"
+ size="compact-md"
onClick={() => setShowErrorModal(true)}
>
{t`Show error details`}
diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx
index 8109ac30cc6..8e28c1d8b6f 100644
--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx
+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx
@@ -98,6 +98,7 @@ const TimelineDetailsModal = ({
/>
{canWrite && !isArchive && (
<Button
+ size="lg"
component={ForwardRefLink}
to={Urls.newEventInCollection(timeline)}
role="button"
diff --git a/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx b/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx
index b5a2e9bcd87..0468ce951e6 100644
--- a/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx
+++ b/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx
@@ -49,7 +49,7 @@ const TimelineEmptyState = ({
</Box>
{canWrite && (
<Link to={link} target={shouldOpenLinkInNewTab ? "_blank" : undefined}>
- <Button variant="filled" w="12.5rem">
+ <Button variant="filled" size="lg" w="12.5rem">
{t`Create event`}
</Button>
</Link>
diff --git a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx
index df2673e2596..d3c35840e5d 100644
--- a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx
+++ b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx
@@ -32,7 +32,7 @@ const DeleteEventModal = ({
<Button onClick={onClose}>{t`Cancel`}</Button>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
onClick={handleSubmit}
>{t`Delete`}</Button>
</ModalFooter>
diff --git a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx
index 332ff41642d..0e16f20ce54 100644
--- a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx
@@ -30,11 +30,7 @@ const DeleteTimelineModal = ({
<ModalHeader title={t`Delete ${timeline?.name}?`} onClose={onClose} />
<ModalFooter hasPadding>
<Button onClick={onClose}>{t`Cancel`}</Button>
- <Button
- variant="filled"
- color="feedback-negative"
- onClick={handleSubmit}
- >
+ <Button variant="filled" color="negative" onClick={handleSubmit}>
{t`Delete`}
</Button>
</ModalFooter>
diff --git a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
index 54eca3dc37a..48733d7272b 100644
--- a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
+++ b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
@@ -149,15 +149,20 @@ const EventForm = ({
setFieldValue("timestamp", date.toISOString());
}}
/>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
+ size="sm"
+ mb="sm"
onClick={() => setFieldValue("time_matters", false)}
aria-label={t`Remove time`}
variant="subtle"
+ color="neutral"
leftSection={<Icon name="close" />}
/>
</Flex>
) : (
<Button
+ size="lg"
onClick={() => setFieldValue("time_matters", true)}
>{t`Add time`}</Button>
)}
diff --git a/frontend/src/metabase/timelines/common/components/FormArchiveButton/FormArchiveButton.tsx b/frontend/src/metabase/timelines/common/components/FormArchiveButton/FormArchiveButton.tsx
index 91a99585eca..4f3b3c608f0 100644
--- a/frontend/src/metabase/timelines/common/components/FormArchiveButton/FormArchiveButton.tsx
+++ b/frontend/src/metabase/timelines/common/components/FormArchiveButton/FormArchiveButton.tsx
@@ -18,7 +18,7 @@ const FormArchiveButton = ({
className={S.archiveButton}
type="button"
variant="subtle"
- color="feedback-negative"
+ color="negative"
px={0}
onClick={onClick}
>
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx b/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx
index 01853c8b95f..510b2cc6e88 100644
--- a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx
+++ b/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx
@@ -47,7 +47,7 @@ const TimelineEmptyState = ({
</Text>
</Box>
{canWrite && onNewEvent != null && (
- <Button variant="filled" w="12.5rem" onClick={onNewEvent}>
+ <Button variant="filled" size="lg" w="12.5rem" onClick={onNewEvent}>
{t`Create event`}
</Button>
)}
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineSidebar/TimelineSidebar.tsx b/frontend/src/metabase/timelines/questions/components/TimelineSidebar/TimelineSidebar.tsx
index 21074f9d688..327ab292da1 100644
--- a/frontend/src/metabase/timelines/questions/components/TimelineSidebar/TimelineSidebar.tsx
+++ b/frontend/src/metabase/timelines/questions/components/TimelineSidebar/TimelineSidebar.tsx
@@ -133,10 +133,10 @@ export const TimelineSidebar = ({
return (
<SidebarContent title={title} onClose={onClose}>
{focusedTimelineEventIds != null && (
- <Box mx="xl" mb="sm">
+ <Box mx="xl" mb="md">
<Button
- p={0}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
leftSection={<Icon name="chevronleft" />}
onClick={handleShowAllEvents}
data-testid="timeline-sidebar-show-all"
diff --git a/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx b/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
index 4d0f4781450..8008e9db41b 100644
--- a/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
+++ b/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
@@ -97,7 +97,7 @@ export function CreateTransformCollectionModal({
/>
<Group justify="flex-end">
<FormErrorMessage />
- <Button variant="subtle" onClick={onClose}>
+ <Button variant="subtle" color="neutral" onClick={onClose}>
{t`Cancel`}
</Button>
<FormSubmitButton label={t`Create`} variant="filled" />
diff --git a/frontend/src/metabase/transforms/components/JobListMoreMenu/JobListMoreMenu.tsx b/frontend/src/metabase/transforms/components/JobListMoreMenu/JobListMoreMenu.tsx
index c8e18d4bcb2..5f77b060029 100644
--- a/frontend/src/metabase/transforms/components/JobListMoreMenu/JobListMoreMenu.tsx
+++ b/frontend/src/metabase/transforms/components/JobListMoreMenu/JobListMoreMenu.tsx
@@ -40,6 +40,7 @@ export function JobListMoreMenu({ jobs }: JobListMoreMenuProps) {
<Menu>
<Menu.Target>
<Button
+ size="lg"
aria-label={t`More job options`}
leftSection={<Icon name="ellipsis" />}
/>
diff --git a/frontend/src/metabase/transforms/components/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx b/frontend/src/metabase/transforms/components/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
index ea5666148c1..ac414d00d98 100644
--- a/frontend/src/metabase/transforms/components/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
+++ b/frontend/src/metabase/transforms/components/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
@@ -62,7 +62,7 @@ function DeleteJobForm({ job, onDelete, onClose }: DeleteJobFormProps) {
<FormSubmitButton
label={t`Delete job`}
variant="filled"
- color="feedback-negative"
+ color="negative"
/>
</Group>
</Stack>
diff --git a/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx b/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx
index d1aebd954df..91c51b8c791 100644
--- a/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx
+++ b/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx
@@ -10,13 +10,13 @@ import { t } from "ttag";
import { useSetting } from "metabase/settings";
import {
Button,
+ type ButtonColor,
type ButtonProps,
Icon,
Loader,
Menu,
Tooltip,
} from "metabase/ui";
-import type { ColorName } from "metabase/ui/colors/types";
import type {
TransformId,
TransformJobId,
@@ -101,9 +101,8 @@ export const RunButton = forwardRef(function RunButton(
px="sm"
aria-label={t`More run options`}
data-testid="run-options-button"
- >
- <Icon name="chevrondown" aria-hidden />
- </Button>
+ leftSection={<Icon name="chevrondown" aria-hidden />}
+ />
</Menu.Target>
<Menu.Dropdown>{menuItems}</Menu.Dropdown>
</Menu>
@@ -135,7 +134,7 @@ type RunButtonOpts = {
type RunButtonInfo = {
label: string;
- color?: ColorName;
+ color?: ButtonColor;
leftSection?: ReactNode;
isDisabled?: boolean;
};
@@ -158,7 +157,6 @@ function getRunButtonInfo({
return {
label: t`Canceling…`,
leftSection: <Loader size="sm" />,
- color: "text-secondary",
isDisabled: true,
};
}
@@ -182,7 +180,7 @@ function getRunButtonInfo({
if (run.status === "succeeded") {
return {
label: t`Ran successfully`,
- color: "feedback-positive",
+ color: "positive",
leftSection: <Icon name="check" aria-hidden />,
isDisabled,
};
@@ -191,15 +189,15 @@ function getRunButtonInfo({
if (run.status === "canceled") {
return {
label: t`Canceled`,
- color: "feedback-warning",
- leftSection: <Icon name="close" c="core-white" aria-hidden />,
+ color: "warning",
+ leftSection: <Icon name="close" aria-hidden />,
isDisabled,
};
}
return {
label: t`Run failed`,
- color: "feedback-negative",
+ color: "negative",
leftSection: <Icon name="warning" aria-hidden />,
isDisabled,
};
diff --git a/frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx b/frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx
index e8daa80efb7..e4ecb7ee05c 100644
--- a/frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx
+++ b/frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx
@@ -61,7 +61,7 @@ function DeleteTagForm({ tag, onDelete, onClose }: DeleteTagFormProps) {
<FormSubmitButton
label={t`Delete tag`}
variant="filled"
- color="feedback-negative"
+ color="negative"
/>
</Group>
</Stack>
diff --git a/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
index ab384b20ee3..1f8827b0a1c 100644
--- a/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
+++ b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
@@ -77,14 +77,7 @@ export function TransformEditor({
onBlur={onBlur}
topBarInnerContent={
showEditButton && (
- <EditDefinitionButton
- bg="transparent"
- fz="sm"
- h="1.5rem"
- px="sm"
- size="xs"
- transformId={transform.id}
- />
+ <EditDefinitionButton size="sm" transformId={transform.id} />
)
}
parametersAreUserVisible={false}
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
index c42b3cbb935..60556d85099 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
@@ -116,7 +116,7 @@ function DeleteTransformForm({
<FormSubmitButton
label={getSubmitButtonLabel(transform, shouldDeleteTarget)}
variant="filled"
- color="feedback-negative"
+ color="negative"
/>
</Group>
</Stack>
diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx
index 9f5ccd0781d..1fdedac201b 100644
--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx
+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx
@@ -62,7 +62,7 @@ export function EnableTransformsCard({
>{t`Because transforms require write access to your database, make sure you know what you’re doing and that you understand the risks.`}</Text>
<Button
loading={loading}
- variant="primary"
+ variant="filled"
onClick={onEnableClick}
>{t`Enable transforms`}</Button>
{finePrint && (
diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
index f7b5d3cfedc..24b3f03c83c 100644
--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
@@ -132,6 +132,7 @@ export const JobListPage = () => {
onChange={(e) => setSearchQuery(e.target.value)}
/>
<Button
+ size="lg"
leftSection={<Icon name="add" />}
component={ForwardRefLink}
to={Urls.newTransformJob()}
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
index af07f57c4db..9952238e3e1 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
@@ -33,7 +33,7 @@ export function CancelationSection({ run }: CancelationSectionProps) {
<div>
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
disabled={isCanceling}
onClick={openModal}
>
diff --git a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunSidebar.tsx b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunSidebar.tsx
index 07d1a1ce70d..e8e392456c2 100644
--- a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunSidebar.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunSidebar.tsx
@@ -213,7 +213,7 @@ function CancelationSection({ run }: CancelationSectionProps) {
<Group justify="flex-end">
<Button
variant="filled"
- color="feedback-negative"
+ color="negative"
disabled={isCanceling}
onClick={openModal}
>
diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/IndexEditorModal/IndexEditorForm.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/IndexEditorModal/IndexEditorForm.tsx
index 9e7996ab960..e4402764c8e 100644
--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/IndexEditorModal/IndexEditorForm.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/IndexEditorModal/IndexEditorForm.tsx
@@ -88,7 +88,11 @@ export function IndexEditorForm({
))}
<Group justify="flex-end">
- <Button variant="subtle" onClick={onClose}>{t`Cancel`}</Button>
+ <Button
+ variant="subtle"
+ color="neutral"
+ onClick={onClose}
+ >{t`Cancel`}</Button>
<FormSubmitButton label={submitLabel} variant="filled" />
</Group>
</Stack>
diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
index 2b584c08b6a..26b84622198 100644
--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
@@ -175,7 +175,7 @@ function useDeleteIndex() {
title: t`Delete this index?`,
message: t`This removes the index from the warehouse.`,
confirmButtonText: t`Delete`,
- confirmButtonProps: { color: "danger" },
+ confirmButtonProps: { color: "negative" },
onConfirm: async () => {
try {
await deleteTableIndex(requestId).unwrap();
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
index 9fbf632a909..513d7f3e9bd 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
@@ -54,6 +54,7 @@ export const CreateTransformMenu = () => {
<Button
aria-label={t`Create a transform`}
disabled
+ size="lg"
leftSection={<Icon name="add" size={16} />}
>
{t`New`}
@@ -69,6 +70,7 @@ export const CreateTransformMenu = () => {
<Tooltip label={t`Create a transform`}>
<Button
aria-label={t`Create a transform`}
+ size="lg"
leftSection={<Icon name="add" size={16} />}
>
{t`New`}
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
index fbe7cd5d504..fd4bb8cdea5 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
@@ -208,7 +208,7 @@ function getSubmitButtonLabel(shouldDeleteTarget: boolean) {
}
function getSubmitButtonColor(shouldDeleteTarget: boolean) {
- return shouldDeleteTarget ? "error" : undefined;
+ return shouldDeleteTarget ? "negative" : undefined;
}
function getUpdateRequest(
diff --git a/frontend/src/metabase/ui/colors/constants/base-colors.ts b/frontend/src/metabase/ui/colors/constants/base-colors.ts
index d361ca5f30e..200e38a454b 100644
--- a/frontend/src/metabase/ui/colors/constants/base-colors.ts
+++ b/frontend/src/metabase/ui/colors/constants/base-colors.ts
@@ -8,6 +8,7 @@
const baseColors = {
white: "hsla(0, 0%, 100%, 1.00)",
black: "hsla(0, 0%, 0%, 1.00)",
+ transparent: "hsla(0, 0%, 100%, 0)",
gold: "hsla(50.6, 100%, 50%, 1)",
upsellGem: "hsla(190, 100%, 50%, 1)",
@@ -156,6 +157,16 @@ const baseColors = {
5: "hsla(0, 100%, 99%, 1)",
},
+ // Lobster Alpha
+ lobsterAlpha: {
+ 50: "hsla(358, 71%, 54%, 0.82)",
+ 40: "hsla(358, 71%, 54%, 0.69)",
+ 30: "hsla(358, 71%, 54%, 0.45)",
+ 20: "hsla(358, 71%, 54%, 0.21)",
+ 10: "hsla(358, 71%, 54%, 0.07)",
+ 5: "hsla(358, 71%, 54%, 0.03)",
+ },
+
// Flamingo
flamingo: {
100: "hsla(334, 75%, 10%, 1)",
@@ -202,6 +213,12 @@ const baseColors = {
},
// Palm
+ palmAlpha: {
+ 30: "hsla(90, 100%, 31%, 0.57)",
+ 20: "hsla(90, 100%, 34%, 0.29)",
+ 10: "hsla(90, 100%, 41%, 0.13)",
+ },
+
palm: {
100: "hsla(94, 85%, 5%, 1)",
90: "hsla(92, 62%, 10%, 1)",
diff --git a/frontend/src/metabase/ui/colors/constants/themes/dark.ts b/frontend/src/metabase/ui/colors/constants/themes/dark.ts
index e1188cc6a20..e5c2c2f54b0 100644
--- a/frontend/src/metabase/ui/colors/constants/themes/dark.ts
+++ b/frontend/src/metabase/ui/colors/constants/themes/dark.ts
@@ -131,13 +131,44 @@ const actualColors = {
"border-filter": baseColors.filter[80],
"border-highlight": baseColors.brand[30],
"border-neutral": baseColors.orionAlphaInverse[20],
+ "border-neutral-inverse-strong": baseColors.orionAlpha[30],
"border-neutral-strong": baseColors.orionAlphaInverse[30],
"border-neutral-strongest": baseColors.orionAlphaInverse[50],
"border-neutral-subtle": baseColors.orionAlphaInverse[10],
"border-on_dark": baseColors.orionAlphaInverse[20],
- "button-label-on_dark-disabled": baseColors.orionAlphaInverse[40],
- "button-label-on_dark-primary": baseColors.orionAlpha[80],
- "button-label-on_dark-secondary": baseColors.white,
+ "button-default-neutral-default": baseColors.orion[95], // Matches background_surface-primary
+ "button-default-neutral-hover": baseColors.orionAlphaInverse[20], // Matches background_surface-primary-hover
+ "button-default-neutral-pressed": baseColors.orionAlphaInverse[10], // Matches background_surface-primary-pressed
+ "button-filled-brand-default": baseColors.brand[20],
+ "button-filled-brand-hover": baseColors.brand[10],
+ "button-filled-brand-pressed": baseColors.brand[20],
+ "button-filled-filter-default": baseColors.filter[20],
+ "button-filled-filter-hover": baseColors.filter[10],
+ "button-filled-filter-pressed": baseColors.filter[20],
+ "button-filled-negative-default": baseColors.lobster[20],
+ "button-filled-negative-hover": baseColors.lobster[10],
+ "button-filled-negative-pressed": baseColors.lobster[20],
+ "button-filled-positive-default": baseColors.palm[20],
+ "button-filled-positive-hover": baseColors.palm[10],
+ "button-filled-positive-pressed": baseColors.palm[20],
+ "button-filled-warning-default": baseColors.dubloon[20],
+ "button-filled-warning-hover": baseColors.dubloon[10],
+ "button-filled-warning-pressed": baseColors.dubloon[20],
+ "button-light-brand-default": baseColors.orionAlphaInverse[10],
+ "button-light-brand-hover": baseColors.orionAlphaInverse[20],
+ "button-light-brand-pressed": baseColors.orionAlphaInverse[10],
+ "button-light-filter-default": baseColors.orionAlphaInverse[10],
+ "button-light-filter-hover": baseColors.orionAlphaInverse[20],
+ "button-light-filter-pressed": baseColors.orionAlphaInverse[10],
+ "button-light-negative-default": baseColors.orionAlphaInverse[10],
+ "button-light-negative-hover": baseColors.orionAlphaInverse[20],
+ "button-light-negative-pressed": baseColors.orionAlphaInverse[10],
+ "button-light-neutral-default": baseColors.orionAlphaInverse[10], // Matches background_surface-secondary
+ "button-light-neutral-hover": baseColors.orionAlphaInverse[20], // Matches background_surface-secondary-hover
+ "button-light-neutral-pressed": baseColors.orionAlphaInverse[10], // Matches background_surface-secondary-pressed
+ "button-light-positive-default": baseColors.orionAlphaInverse[10],
+ "button-light-positive-hover": baseColors.orionAlphaInverse[20],
+ "button-light-positive-pressed": baseColors.orionAlphaInverse[10],
"button-on_dark-disabled": baseColors.orionAlphaInverse[10],
"button-on_dark-primary-default": baseColors.white,
"button-on_dark-primary-hover": baseColors.orion[20],
@@ -145,8 +176,46 @@ const actualColors = {
"button-on_dark-secondary-default": baseColors.orionAlphaInverse[10],
"button-on_dark-secondary-hover": baseColors.orionAlphaInverse[20],
"button-on_dark-secondary-pressed": baseColors.orionAlphaInverse[10],
+ "button-subtle-brand-default": baseColors.transparent,
+ "button-subtle-brand-hover": baseColors.orionAlphaInverse[20],
+ "button-subtle-brand-pressed": baseColors.orionAlphaInverse[10],
+ "button-subtle-negative-default": baseColors.transparent,
+ "button-subtle-negative-hover": baseColors.orionAlphaInverse[20],
+ "button-subtle-negative-pressed": baseColors.orionAlphaInverse[10],
+ "button-subtle-neutral-default": baseColors.transparent,
+ "button-subtle-neutral-hover": baseColors.orionAlphaInverse[20],
+ "button-subtle-neutral-pressed": baseColors.orionAlphaInverse[10],
+ "button-subtle-positive-default": baseColors.transparent,
+ "button-subtle-positive-hover": baseColors.orionAlphaInverse[20],
+ "button-subtle-positive-pressed": baseColors.orionAlphaInverse[10],
+ "button_label-default-neutral-default": baseColors.orionAlphaInverse[80], // Matches text-primary
+ "button_label-filled-brand-default": baseColors.brand[80],
+ "button_label-filled-filter-default": baseColors.filter[80],
+ "button_label-filled-negative-default": baseColors.lobster[80],
+ "button_label-filled-positive-default": baseColors.palm[80],
+ "button_label-filled-warning-default": baseColors.lobster[80],
+ "button_label-light-brand-default": baseColors.brand[30],
+ "button_label-light-brand-hover": baseColors.brand[20],
+ "button_label-light-filter-default": baseColors.filter[30],
+ "button_label-light-filter-hover": baseColors.filter[20],
+ "button_label-light-negative-default": baseColors.lobster[30],
+ "button_label-light-negative-hover": baseColors.lobster[20],
+ "button_label-light-neutral-default": baseColors.orionAlphaInverse[80], // Matches text-primary
+ "button_label-light-positive-default": baseColors.palm[30],
+ "button_label-light-positive-hover": baseColors.palm[20],
+ "button_label-on_dark-disabled": baseColors.orionAlphaInverse[40],
+ "button_label-on_dark-primary": baseColors.orionAlpha[80],
+ "button_label-on_dark-secondary": baseColors.white,
+ "button_label-subtle-brand-default": baseColors.brand[30],
+ "button_label-subtle-brand-hover": baseColors.brand[20],
+ "button_label-subtle-negative-default": baseColors.lobster[30],
+ "button_label-subtle-negative-hover": baseColors.lobster[20],
+ "button_label-subtle-neutral-default": baseColors.orionAlphaInverse[80], // Matches text-primary
+ "button_label-subtle-positive-default": baseColors.palm[30],
+ "button_label-subtle-positive-hover": baseColors.palm[20],
"core-blue-saturated": baseColors.ocean[40],
"core-brand-hover": baseColors.brand[30],
+ "core-filter-strong": baseColors.filter[20],
"core-gold": baseColors.gold,
"core-green-saturated": baseColors.palm[40],
"core-info": baseColors.orion[50],
diff --git a/frontend/src/metabase/ui/colors/constants/themes/light.ts b/frontend/src/metabase/ui/colors/constants/themes/light.ts
index acb5ef391ed..cc14aa1fc03 100644
--- a/frontend/src/metabase/ui/colors/constants/themes/light.ts
+++ b/frontend/src/metabase/ui/colors/constants/themes/light.ts
@@ -129,13 +129,50 @@ const actualColors = {
"border-filter": baseColors.filter[20],
"border-highlight": baseColors.brand[60],
"border-neutral": baseColors.orion[20],
+ "border-neutral-inverse-strong": baseColors.orionAlphaInverse[30],
"border-neutral-strong": baseColors.orionAlpha[30],
"border-neutral-strongest": baseColors.orionAlpha[50],
"border-neutral-subtle": baseColors.orionAlpha[10],
"border-on_dark": baseColors.orionAlphaInverse[20],
- "button-label-on_dark-disabled": baseColors.orionAlphaInverse[40],
- "button-label-on_dark-primary": baseColors.orionAlpha[80],
- "button-label-on_dark-secondary": baseColors.white,
+ "button-default-neutral-default": baseColors.white, // Matches background_surface-primary
+ "button-default-neutral-hover": baseColors.orionAlpha[10], // Matches background_surface-primary-hover
+ "button-default-neutral-pressed": baseColors.orionAlpha[20], // Matches background_surface-primary-pressed
+ "button-filled-brand-default": baseColors.brand[60],
+ "button-filled-brand-hover": baseColors.brand[70],
+ "button-filled-brand-pressed": baseColors.brand[80],
+ "button-filled-filter-default": baseColors.filter[60],
+ "button-filled-filter-hover": baseColors.filter[70],
+ "button-filled-filter-pressed": baseColors.filter[80],
+ "button-filled-negative-default": baseColors.lobster[60],
+ "button-filled-negative-hover": baseColors.lobster[70],
+ "button-filled-negative-pressed": baseColors.lobster[80],
+ "button-filled-positive-default": baseColors.palm[60],
+ "button-filled-positive-hover": baseColors.palm[70],
+ "button-filled-positive-pressed": baseColors.palm[80],
+ "button-filled-warning-default": baseColors.dubloon[20],
+ "button-filled-warning-hover": baseColors.dubloon[30],
+ "button-filled-warning-pressed": baseColors.dubloon[40],
+ "button-light-brand-default":
+ "color-mix(in srgb, var(--mb-color-core-brand) 7%, transparent)",
+ "button-light-brand-hover":
+ "color-mix(in srgb, var(--mb-color-core-brand) 21%, transparent)",
+ "button-light-brand-pressed":
+ "color-mix(in srgb, var(--mb-color-core-brand) 45%, transparent)",
+ "button-light-filter-default":
+ "color-mix(in srgb, var(--mb-color-core-filter) 15%, transparent)",
+ "button-light-filter-hover":
+ "color-mix(in srgb, var(--mb-color-core-filter) 30%, transparent)",
+ "button-light-filter-pressed":
+ "color-mix(in srgb, var(--mb-color-core-filter) 60%, transparent)",
+ "button-light-negative-default": baseColors.lobsterAlpha[10],
+ "button-light-negative-hover": baseColors.lobsterAlpha[20],
+ "button-light-negative-pressed": baseColors.lobsterAlpha[30],
+ "button-light-neutral-default": baseColors.orionAlpha[10], // Matches background_surface-secondary
+ "button-light-neutral-hover": baseColors.orionAlpha[20], // Matches background_surface-secondary-hover
+ "button-light-neutral-pressed": baseColors.orionAlpha[30], // Matches background_surface-secondary-pressed
+ "button-light-positive-default": baseColors.palmAlpha[10],
+ "button-light-positive-hover": baseColors.palmAlpha[20],
+ "button-light-positive-pressed": baseColors.palmAlpha[30],
"button-on_dark-disabled": baseColors.orionAlphaInverse[10],
"button-on_dark-primary-default": baseColors.white,
"button-on_dark-primary-hover": baseColors.orion[20],
@@ -143,8 +180,48 @@ const actualColors = {
"button-on_dark-secondary-default": baseColors.orionAlphaInverse[10],
"button-on_dark-secondary-hover": baseColors.orionAlphaInverse[20],
"button-on_dark-secondary-pressed": baseColors.orionAlphaInverse[10],
+ "button-subtle-brand-default": baseColors.transparent,
+ "button-subtle-brand-hover":
+ "color-mix(in srgb, var(--mb-color-core-brand) 21%, transparent)",
+ "button-subtle-brand-pressed":
+ "color-mix(in srgb, var(--mb-color-core-brand) 45%, transparent)",
+ "button-subtle-negative-default": baseColors.transparent,
+ "button-subtle-negative-hover": baseColors.lobsterAlpha[20],
+ "button-subtle-negative-pressed": baseColors.lobsterAlpha[30],
+ "button-subtle-neutral-default": baseColors.transparent,
+ "button-subtle-neutral-hover": baseColors.orionAlpha[10], // Matches background_surface-primary-hover
+ "button-subtle-neutral-pressed": baseColors.orionAlpha[20], // Matches background_surface-primary-pressed
+ "button-subtle-positive-default": baseColors.transparent,
+ "button-subtle-positive-hover": baseColors.palmAlpha[20],
+ "button-subtle-positive-pressed": baseColors.palmAlpha[30],
+ "button_label-default-neutral-default": baseColors.orionAlpha[80], // Matches text-primary
+ "button_label-filled-brand-default": baseColors.white,
+ "button_label-filled-filter-default": baseColors.white,
+ "button_label-filled-negative-default": baseColors.white,
+ "button_label-filled-positive-default": baseColors.white,
+ "button_label-filled-warning-default": baseColors.lobster[80],
+ "button_label-light-brand-default": baseColors.brand[60],
+ "button_label-light-brand-hover": baseColors.brand[70],
+ "button_label-light-filter-default": baseColors.filter[70],
+ "button_label-light-filter-hover": baseColors.filter[80],
+ "button_label-light-negative-default": baseColors.lobster[70],
+ "button_label-light-negative-hover": baseColors.lobster[80],
+ "button_label-light-neutral-default": baseColors.orionAlpha[80], // Matches text-primary
+ "button_label-light-positive-default": baseColors.palm[70],
+ "button_label-light-positive-hover": baseColors.palm[80],
+ "button_label-on_dark-disabled": baseColors.orionAlphaInverse[40],
+ "button_label-on_dark-primary": baseColors.orionAlpha[80],
+ "button_label-on_dark-secondary": baseColors.white,
+ "button_label-subtle-brand-default": baseColors.brand[60],
+ "button_label-subtle-brand-hover": baseColors.brand[70],
+ "button_label-subtle-negative-default": baseColors.lobster[70],
+ "button_label-subtle-negative-hover": baseColors.lobster[80],
+ "button_label-subtle-neutral-default": baseColors.orionAlpha[80], // Matches text-primary
+ "button_label-subtle-positive-default": baseColors.palm[70],
+ "button_label-subtle-positive-hover": baseColors.palm[80],
"core-blue-saturated": baseColors.ocean[60],
"core-brand-hover": baseColors.brand[50],
+ "core-filter-strong": baseColors.filter[50],
"core-gold": baseColors.gold,
"core-green-saturated": baseColors.palm[60],
"core-info": baseColors.orion[40],
diff --git a/frontend/src/metabase/ui/colors/types/color-keys.ts b/frontend/src/metabase/ui/colors/types/color-keys.ts
index f53a0e4bb22..641333baa83 100644
--- a/frontend/src/metabase/ui/colors/types/color-keys.ts
+++ b/frontend/src/metabase/ui/colors/types/color-keys.ts
@@ -121,13 +121,44 @@ export type MetabaseColorKey =
| "border-filter"
| "border-highlight"
| "border-neutral"
+ | "border-neutral-inverse-strong"
| "border-neutral-strong"
| "border-neutral-strongest"
| "border-neutral-subtle"
| "border-on_dark"
- | "button-label-on_dark-disabled"
- | "button-label-on_dark-primary"
- | "button-label-on_dark-secondary"
+ | "button-default-neutral-default"
+ | "button-default-neutral-hover"
+ | "button-default-neutral-pressed"
+ | "button-filled-brand-default"
+ | "button-filled-brand-hover"
+ | "button-filled-brand-pressed"
+ | "button-filled-filter-default"
+ | "button-filled-filter-hover"
+ | "button-filled-filter-pressed"
+ | "button-filled-negative-default"
+ | "button-filled-negative-hover"
+ | "button-filled-negative-pressed"
+ | "button-filled-positive-default"
+ | "button-filled-positive-hover"
+ | "button-filled-positive-pressed"
+ | "button-filled-warning-default"
+ | "button-filled-warning-hover"
+ | "button-filled-warning-pressed"
+ | "button-light-brand-default"
+ | "button-light-brand-hover"
+ | "button-light-brand-pressed"
+ | "button-light-filter-default"
+ | "button-light-filter-hover"
+ | "button-light-filter-pressed"
+ | "button-light-negative-default"
+ | "button-light-negative-hover"
+ | "button-light-negative-pressed"
+ | "button-light-neutral-default"
+ | "button-light-neutral-hover"
+ | "button-light-neutral-pressed"
+ | "button-light-positive-default"
+ | "button-light-positive-hover"
+ | "button-light-positive-pressed"
| "button-on_dark-disabled"
| "button-on_dark-primary-default"
| "button-on_dark-primary-hover"
@@ -135,10 +166,48 @@ export type MetabaseColorKey =
| "button-on_dark-secondary-default"
| "button-on_dark-secondary-hover"
| "button-on_dark-secondary-pressed"
+ | "button-subtle-brand-default"
+ | "button-subtle-brand-hover"
+ | "button-subtle-brand-pressed"
+ | "button-subtle-negative-default"
+ | "button-subtle-negative-hover"
+ | "button-subtle-negative-pressed"
+ | "button-subtle-neutral-default"
+ | "button-subtle-neutral-hover"
+ | "button-subtle-neutral-pressed"
+ | "button-subtle-positive-default"
+ | "button-subtle-positive-hover"
+ | "button-subtle-positive-pressed"
+ | "button_label-default-neutral-default"
+ | "button_label-filled-brand-default"
+ | "button_label-filled-filter-default"
+ | "button_label-filled-negative-default"
+ | "button_label-filled-positive-default"
+ | "button_label-filled-warning-default"
+ | "button_label-light-brand-default"
+ | "button_label-light-brand-hover"
+ | "button_label-light-filter-default"
+ | "button_label-light-filter-hover"
+ | "button_label-light-negative-default"
+ | "button_label-light-negative-hover"
+ | "button_label-light-neutral-default"
+ | "button_label-light-positive-default"
+ | "button_label-light-positive-hover"
+ | "button_label-on_dark-disabled"
+ | "button_label-on_dark-primary"
+ | "button_label-on_dark-secondary"
+ | "button_label-subtle-brand-default"
+ | "button_label-subtle-brand-hover"
+ | "button_label-subtle-negative-default"
+ | "button_label-subtle-negative-hover"
+ | "button_label-subtle-neutral-default"
+ | "button_label-subtle-positive-default"
+ | "button_label-subtle-positive-hover"
| "core-blue-saturated"
| "core-brand"
| "core-brand-hover"
| "core-filter"
+ | "core-filter-strong"
| "core-gold"
| "core-green-saturated"
| "core-info"
diff --git a/frontend/src/metabase/ui/components/buttons/Button/Button.config.tsx b/frontend/src/metabase/ui/components/buttons/Button/Button.config.tsx
index b8e51326050..0b2721d76b7 100644
--- a/frontend/src/metabase/ui/components/buttons/Button/Button.config.tsx
+++ b/frontend/src/metabase/ui/components/buttons/Button/Button.config.tsx
@@ -1,22 +1,132 @@
-import { Button } from "@mantine/core";
+import { Button, type ButtonProps as MantineButtonProps } from "@mantine/core";
+
+import { color } from "metabase/ui/utils/colors";
import ButtonStyles from "./Button.module.css";
+import type { ButtonColor, ButtonVariant } from "./types";
+
+const BUTTON_VARIANTS = [
+ "default",
+ "filled",
+ "light",
+ "subtle",
+ "transparent",
+ "on-dark-primary",
+ "on-dark-secondary",
+] as const satisfies readonly ButtonVariant[];
+
+const BUTTON_COLORS = [
+ "brand",
+ "filter",
+ "negative",
+ "positive",
+ "warning",
+ "neutral",
+] as const satisfies readonly ButtonColor[];
+
+const DEFAULT_COLORS: Partial<Record<ButtonVariant, ButtonColor>> = {
+ default: "neutral",
+ filled: "brand",
+ light: "brand",
+ subtle: "brand",
+ transparent: "brand",
+};
+
+const CELLS = [
+ "default-neutral",
+ "filled-brand",
+ "filled-filter",
+ "filled-negative",
+ "filled-positive",
+ "filled-warning",
+ "light-brand",
+ "light-filter",
+ "light-negative",
+ "light-neutral",
+ "light-positive",
+ "subtle-brand",
+ "subtle-negative",
+ "subtle-neutral",
+ "subtle-positive",
+] as const satisfies readonly `${ButtonVariant}-${ButtonColor}`[];
+
+const DEFAULT_LABEL_HOVER_CELLS = [
+ "default-neutral",
+ "filled-brand",
+ "filled-filter",
+ "filled-negative",
+ "filled-positive",
+ "filled-warning",
+ "light-neutral",
+ "subtle-neutral",
+] as const satisfies readonly Cell[];
+
+type Cell = (typeof CELLS)[number];
+type DefaultLabelHoverCell = (typeof DEFAULT_LABEL_HOVER_CELLS)[number];
+
+const isButtonVariant = (value: unknown): value is ButtonVariant =>
+ BUTTON_VARIANTS.some((item) => item === value);
+
+const isButtonColor = (value: unknown): value is ButtonColor =>
+ BUTTON_COLORS.some((item) => item === value);
+
+const isCell = (value: string): value is Cell =>
+ CELLS.some((item) => item === value);
+
+const isDefaultLabelHoverCell = (value: Cell): value is DefaultLabelHoverCell =>
+ DEFAULT_LABEL_HOVER_CELLS.some((item) => item === value);
+
+const getCell = (
+ variant: ButtonVariant,
+ buttonColor: MantineButtonProps["color"],
+): Cell | undefined => {
+ const defaultColor = DEFAULT_COLORS[variant];
+ const cellVariant = variant === "transparent" ? "subtle" : variant;
+ const cellColor = isButtonColor(buttonColor) ? buttonColor : defaultColor;
+ const cell = `${cellVariant}-${cellColor}`;
+ if (isCell(cell)) {
+ return cell;
+ }
+ const defaultCell = `${cellVariant}-${defaultColor}`;
+ return isCell(defaultCell) ? defaultCell : undefined;
+};
+
+const getRootVars = ({
+ variant,
+ color: buttonColor,
+}: MantineButtonProps): Record<string, string> => {
+ const cell = isButtonVariant(variant)
+ ? getCell(variant, buttonColor)
+ : undefined;
+ if (!cell) {
+ return {};
+ }
+ return {
+ "--button-color": color(`button_label-${cell}-default`),
+ "--button-hover-color": isDefaultLabelHoverCell(cell)
+ ? color(`button_label-${cell}-default`)
+ : color(`button_label-${cell}-hover`),
+ "--button-bg": color(`button-${cell}-default`),
+ "--button-hover": color(`button-${cell}-hover`),
+ "--button-pressed": color(`button-${cell}-pressed`),
+ };
+};
export const buttonOverrides = {
Button: Button.extend({
defaultProps: {
- color: "core-brand",
variant: "default",
size: "md",
loaderProps: {
- size: "1rem",
+ size: "var(--mb-button-loader-size)",
color: "currentColor",
},
},
+ vars: (_theme, props) => ({ root: getRootVars(props) }),
classNames: {
root: ButtonStyles.root,
label: ButtonStyles.label,
- inner: ButtonStyles.inner,
+ loader: ButtonStyles.loader,
},
}),
};
diff --git a/frontend/src/metabase/ui/components/buttons/Button/Button.mdx b/frontend/src/metabase/ui/components/buttons/Button/Button.mdx
index 5dab5a6fcb1..f84e5d9c8c8 100644
--- a/frontend/src/metabase/ui/components/buttons/Button/Button.mdx
+++ b/frontend/src/metabase/ui/components/buttons/Button/Button.mdx
@@ -1,8 +1,4 @@
-import { Fragment } from "react";
-import { Canvas, Story, Meta } from "@storybook/blocks";
-import { Icon } from "metabase/ui";
-import { Group, Stack } from "metabase/ui";
-import { Button } from "./";
+import { Canvas, Meta } from "@storybook/blocks";
import * as ButtonStories from "./Button.stories";
<Meta of={ButtonStories} />
@@ -46,62 +42,32 @@ Not to use:
<Canvas of={ButtonStories.Default} />
-### Button.Group
+### Variant: Filled
-<Canvas of={ButtonStories.ButtonGroup} />
+<Canvas of={ButtonStories.VariantFilled} />
-### Default size
+### Variant: Default
-<Canvas of={ButtonStories.DefaultSize} />
+<Canvas of={ButtonStories.VariantDefault} />
-#### Custom color
+### Variant: Light
-<Canvas of={ButtonStories.DefaultSizeCustomColor} />
+<Canvas of={ButtonStories.VariantLight} />
-#### Disabled state
+### Variant: Subtle
-<Canvas of={ButtonStories.DefaultSizeDisabled} />
+<Canvas of={ButtonStories.VariantSubtle} />
-#### Loading state
+### Variant: On Dark
-<Canvas of={ButtonStories.DefaultSizeLoading} />
+<Canvas of={ButtonStories.VariantOnDark} />
-### Default size & full width
+### Compact
-<Canvas of={ButtonStories.DefaultSizeFullWidth} />
+Compact sizes (`compact-sm`, `compact-md`) always pair with `variant="transparent"`, and `transparent` always pairs with a compact size. Pass both explicitly; if only one of them is given, `Button` fills in the other (`compact-*` forces `transparent`, `transparent` without a compact size falls back to `compact-md`).
-#### Disabled state
+<Canvas of={ButtonStories.Compact} />
-<Canvas of={ButtonStories.DefaultSizeFullWidthDisabled} />
+### Sections
-#### Loading state
-
-<Canvas of={ButtonStories.DefaultSizeFullWidthLoading} />
-
-### Compact size
-
-<Canvas of={ButtonStories.CompactSize} />
-
-#### Custom color
-
-<Canvas of={ButtonStories.CompactSizeCustomColor} />
-
-#### Disabled state
-
-<Canvas of={ButtonStories.CompactSizeDisabled} />
-
-#### Loading state
-
-<Canvas of={ButtonStories.CompactSizeLoading} />
-
-### Compact size & full width
-
-<Canvas of={ButtonStories.CompactSizeFullWidth} />
-
-#### Disabled state
-
-<Canvas of={ButtonStories.CompactSizeFullWidthDisabled} />
-
-#### Loading state
-
-<Canvas of={ButtonStories.CompactSizeFullWidthLoading} />
+<Canvas of={ButtonStories.Sections} />
diff --git a/frontend/src/metabase/ui/components/buttons/Button/Button.module.css b/frontend/src/metabase/ui/components/buttons/Button/Button.module.css
index 5f0e10e0872..0c1ccb8b365 100644
--- a/frontend/src/metabase/ui/components/buttons/Button/Button.module.css
+++ b/frontend/src/metabase/ui/components/buttons/Button/Button.module.css
@@ -1,168 +1,178 @@
.root {
- --button-height-md: calc(2.5rem * var(--mantine-scale));
- --button-height-compact-md: calc(1.5rem * var(--mantine-scale));
+ --button-height-sm: 24px;
+ --button-height-md: 32px;
+ --button-height-lg: 40px;
+ --button-height-compact-sm: 16px;
+ --button-height-compact-md: 16px;
+ --mb-button-padding-y: 8px;
+ --mb-button-padding-x: 12px;
+ --mb-button-section-gap: 6px;
+ --mb-button-loader-size: 14px;
+ --mb-button-radius: 6px;
font-family: var(--mb-default-font-family);
- padding-inline: rem(15px);
- overflow: hidden;
- line-height: 1.15; /* mimic line-height ratio from mantine v6 */
- font-size: var(--mantine-font-size-md);
+ font-size: 14px;
+ font-weight: 700;
+ line-height: 16px;
+ border-radius: var(--button-radius, var(--mb-button-radius));
+ padding: var(--mb-button-padding-y) var(--mb-button-padding-x);
&:active {
transform: none; /* Remove Mantine's default pressed effect */
}
- [data-position="right"] {
- margin-left: 0.5rem;
- }
+ &[data-size="sm"] {
+ --mb-button-padding-y: 4px;
+ --mb-button-padding-x: 8px;
+ --mb-button-section-gap: 4px;
+ --mb-button-loader-size: 12px;
- [data-position="left"] {
- margin-right: 0.5rem;
- }
+ font-size: 12px;
- &[data-with-left-section],
- &[data-with-right-section] {
- padding: rem(11px) rem(15px);
+ &[data-loading] {
+ --mb-button-padding-y: 6px;
+ }
}
- /* Button with icon only */
- &:has(.label:empty) {
- padding: rem(11px);
-
- &[data-size^="compact"] {
- padding: rem(3px);
- }
+ &[data-size="md"][data-loading] {
+ --mb-button-padding-y: 9px;
+ }
- [data-position="right"],
- [data-position="left"] {
- margin-inline: 0;
- }
+ &[data-size="lg"] {
+ --mb-button-padding-y: 12px;
+ --mb-button-padding-x: 16px;
+ --mb-button-radius: 8px;
}
&[data-size^="compact"] {
- padding: rem(3px) rem(7px);
- }
+ --mb-button-padding-y: 0px;
+ --mb-button-padding-x: 0px;
+ --mb-button-loader-size: 13.75px;
- &[data-variant="default"] {
- color: var(--mb-color-text-primary);
- border-color: var(--mb-color-border-neutral);
- background-color: var(--mb-color-background_page-primary);
-
- &[aria-pressed="true"],
- &:hover {
- color: var(--mb-color-text-brand-hover);
- background-color: var(--mb-color-background_surface-hover);
- }
+ /* 16px height with 16px line-height: Mantine's overflow: hidden on the root clips
+ the descenders of g/p/y. Text truncation is unaffected, it lives on .label. */
+ overflow: visible;
}
- &[data-variant="filled"] {
- color: var(--mb-color-text-primary-inverse);
+ &[data-size="compact-sm"] {
+ --mb-button-section-gap: 4px;
+ --mb-button-loader-size: 11.5px;
+ --mb-button-radius: 4px;
- &:hover {
- border-color: alpha(var(--button-bg), 0.88);
- background-color: alpha(var(--button-bg), 0.88);
- }
+ font-size: 12px;
}
- &[data-variant="subtle"] {
- &:hover {
- color: alpha(var(--button-color), 0.88);
- background-color: transparent;
- }
-
- &:disabled,
- &[data-disabled="true"] {
- color: var(--mb-color-text-disabled);
- border-color: transparent;
- background-color: transparent;
+ &[data-loading]::before {
+ content: none;
+ }
- &:hover {
- color: var(--mb-color-text-disabled);
- border-color: transparent;
- background-color: transparent;
- }
- }
+ [data-position="left"] {
+ margin-inline-end: var(--mb-button-section-gap);
}
- &[data-variant="visualizer"] {
- --button-color: var(--mb-color-core-brand);
- --button-color-hover: var(--mb-color-background_surface-hover);
+ [data-position="right"] {
+ margin-inline-start: var(--mb-button-section-gap);
+ }
- border-radius: 8px;
- display: flex;
- justify-content: flex-start;
- color: var(--mb-color-text-primary);
- font-weight: 500;
- background-color: transparent;
- padding: rem(4px) rem(15px);
+ /* Button with icon only */
+ &:has(.label:empty) {
+ padding-inline: var(--mb-button-padding-y);
- & .inner {
- overflow: hidden;
+ [data-position="left"],
+ [data-position="right"] {
+ margin-inline: 0;
}
+ }
- &:hover {
- color: var(--button-color);
- background-color: var(--button-color-hover);
- }
+ &[data-variant="default"],
+ &[data-variant="filled"] {
+ box-shadow: var(--mantine-shadow-xs);
+ }
+}
- &[aria-pressed="true"] {
- color: var(--mb-color-text-primary-inverse);
- background-color: var(--button-color);
- }
+.root[data-variant="default"] {
+ border-color: var(--mb-color-border-neutral-strong);
+}
- /* Button with icon only */
- &:has(.label:empty) {
- overflow: visible;
+.root[data-variant="default"],
+.root[data-variant="filled"],
+.root[data-variant="light"],
+.root[data-variant="subtle"],
+.root[data-variant="transparent"],
+.root[data-variant^="on-dark-"] {
+ border-width: 0.5px;
+
+ &:hover:not([data-loading]),
+ &[aria-pressed="true"]:not([data-loading]) {
+ color: var(--button-hover-color, var(--button-color));
+ background-color: var(--button-hover);
+ }
- &[data-size^="xs"] {
- padding: rem(2px) rem(6px);
- }
- }
+ &:active:not([data-loading]) {
+ color: var(--button-hover-color, var(--button-color));
+ background-color: var(--button-pressed, var(--button-hover));
+ box-shadow: none;
}
- &[data-variant="inverse"] {
- /* need to implement variantColorResolver to support other colors */
- --button-color: var(--mb-color-core-brand);
- --button-color-hover: var(--mb-color-background_surface-hover);
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
+ color: var(--mb-color-text-disabled);
+ border-color: transparent;
+ background-color: var(--mb-color-background_surface-disabled);
+ box-shadow: none;
+ }
+}
- display: flex;
- justify-content: flex-start;
- color: var(--mb-color-text-primary);
+.root[data-variant="subtle"] {
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
background-color: transparent;
+ }
+}
- &:hover {
- color: var(--button-color);
- background-color: var(--button-color-hover);
+.root[data-variant="transparent"] {
+ &,
+ &:hover:not([data-loading]),
+ &:active:not([data-loading]),
+ &[aria-pressed="true"]:not([data-loading]),
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
+ background-color: transparent;
+ }
+}
- [data-position] {
- color: var(--button-color);
- }
- }
+.root[data-variant="on-dark-primary"] {
+ --button-color: var(--mb-color-button_label-on_dark-primary);
+ --button-hover-color: var(--mb-color-button_label-on_dark-primary);
+ --button-bg: var(--mb-color-button-on_dark-primary-default);
+ --button-hover: var(--mb-color-button-on_dark-primary-hover);
+ --button-pressed: var(--mb-color-button-on_dark-primary-pressed);
+ --button-bd: 0.5px solid transparent;
+}
- [data-position] {
- color: var(--button-color);
- }
+.root[data-variant="on-dark-secondary"] {
+ --button-color: var(--mb-color-button_label-on_dark-secondary);
+ --button-hover-color: var(--mb-color-button_label-on_dark-secondary);
+ --button-bg: var(--mb-color-button-on_dark-secondary-default);
+ --button-hover: var(--mb-color-button-on_dark-secondary-hover);
+ --button-pressed: var(--mb-color-button-on_dark-secondary-pressed);
+ --button-bd: 0.5px solid var(--mb-color-border-on_dark);
+}
- &:disabled,
- &[data-disabled="true"] {
- color: var(--mb-color-text-disabled);
- border-color: transparent;
- background-color: transparent;
+.root[data-variant^="on-dark-"] {
+ box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2);
- &:hover {
- color: var(--mb-color-text-disabled);
- border-color: transparent;
- background-color: transparent;
- }
- }
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
+ color: var(--mb-color-button_label-on_dark-disabled);
+ background-color: var(--mb-color-button-on_dark-disabled);
}
+}
- &:disabled,
- &:disabled:hover {
- color: var(--mb-color-text-disabled);
- border-color: var(--mb-color-border-neutral);
- background-color: var(--mb-color-background_surface-disabled);
- }
+.loader {
+ /* Mantine's loader transition adds +1px on the Y axis; keep the loader centered */
+ top: calc(50% - 1px);
+ display: flex;
}
.label {
@@ -171,10 +181,77 @@
text-overflow: ellipsis;
}
-.leftSection {
- margin-inline-end: 0.5rem;
+:global(.mb-mantine-ButtonGroup-group[data-orientation="horizontal"]) {
+ &:has(> .root[data-variant="default"], > .root[data-variant="filled"]) {
+ border-radius: 6px;
+ box-shadow: var(--mantine-shadow-xs);
+ }
+
+ &:has(
+ > .root[data-variant="default"][data-size="lg"],
+ > .root[data-variant="filled"][data-size="lg"]
+ ) {
+ border-radius: 8px;
+ }
}
-.rightSection {
- margin-inline-start: 0.5rem;
+:global(.mb-mantine-ButtonGroup-group[data-orientation="horizontal"]) > .root {
+ --mb-button-group-divider-color: transparent;
+
+ &[data-variant="default"],
+ &[data-variant="light"] {
+ --mb-button-group-divider-color: var(--mb-color-border-neutral-strong);
+ }
+
+ &[data-variant="filled"] {
+ --mb-button-group-divider-color: var(
+ --mb-color-border-neutral-inverse-strong
+ );
+ }
+
+ &[data-variant][data-size] {
+ box-shadow: none;
+ }
+
+ &[data-variant="filled"],
+ &[data-variant="light"],
+ &[data-variant="subtle"],
+ &[data-variant="transparent"] {
+ border-block-width: 0;
+ }
+
+ &[data-variant][data-size]:not(:last-child) {
+ border-inline-end-width: 0;
+ }
+
+ &[data-variant][data-size]:not(:first-child) {
+ border-inline-start-width: 0;
+ overflow: visible;
+
+ &::before {
+ content: "";
+ position: absolute;
+ inset: 0 auto 0 0;
+ z-index: 1;
+ width: 0;
+ border-radius: 0;
+ border-inline-start: 0.5px solid var(--mb-button-group-divider-color);
+ background-color: transparent;
+ opacity: 1;
+ filter: none;
+ transform: none;
+ transition: none;
+ }
+ }
+
+ &[data-variant="default"] {
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
+ border-color: var(--mb-color-border-neutral-strong);
+ }
+ }
+
+ &:has(.label:empty) {
+ padding-inline: var(--mb-button-padding-x);
+ }
}
diff --git a/frontend/src/metabase/ui/components/buttons/Button/Button.stories.tsx b/frontend/src/metabase/ui/components/buttons/Button/Button.stories.tsx
index 8bd932ad9b4..9df2bc2d895 100644
--- a/frontend/src/metabase/ui/components/buttons/Button/Button.stories.tsx
+++ b/frontend/src/metabase/ui/components/buttons/Button/Button.stories.tsx
@@ -1,9 +1,14 @@
-import { within } from "@storybook/test";
import { Fragment } from "react";
-import { Group, Icon, Stack } from "metabase/ui";
+import { Badge, Box, Icon, KeyboardShortcut } from "metabase/ui";
+import {
+ StoryBoard,
+ StoryJsx,
+ StoryLabel,
+ StorySection,
+} from "metabase/ui/stories/showcase";
-import { Button, type ButtonProps } from "./";
+import { Button, type ButtonProps, type ButtonVariant } from "./";
const args = {
variant: "default",
@@ -17,33 +22,24 @@ const args = {
const argTypes = {
variant: {
- options: ["default", "filled", "outline", "subtle", "inverse"],
+ options: ["default", "filled", "light", "subtle", "transparent"],
control: { type: "inline-radio" },
},
color: {
- options: {
- default: undefined,
- "feedback-positive": "feedback-positive",
- "feedback-negative": "feedback-negative",
- },
+ options: [
+ undefined,
+ "brand",
+ "filter",
+ "negative",
+ "positive",
+ "warning",
+ "neutral",
+ ],
control: { type: "inline-radio" },
},
size: {
- control: {
- type: "select",
- options: [
- "xs",
- "sm",
- "md",
- "lg",
- "xl",
- "compact-xs",
- "compact-sm",
- "compact-md",
- "compact-lg",
- "compact-xl",
- ],
- },
+ options: ["sm", "md", "lg", "compact-sm", "compact-md"],
+ control: { type: "inline-radio" },
},
disabled: {
control: { type: "boolean" },
@@ -68,69 +64,6 @@ const DefaultTemplate = (args: ButtonProps) => (
<Button {...args}>Button</Button>
);
-const ButtonGroupTemplate = (args: ButtonProps) => (
- <Button.Group>
- <Button {...args}>One</Button>
- <Button {...args}>Two</Button>
- <Button {...args}>Three</Button>
- </Button.Group>
-);
-
-const GridRow = (args: ButtonProps) => (
- <Group wrap="nowrap">
- <Button {...args}>Save</Button>
- <Button {...args} leftSection={<Icon name="add" />}>
- New
- </Button>
- <Button {...args} rightSection={<Icon name="chevrondown" />}>
- Category
- </Button>
- <Button {...args} leftSection={<Icon name="play" />} />
- </Group>
-);
-
-const GridRowGroup = (args: ButtonProps) => (
- <Fragment>
- <GridRow {...args} />
- <GridRow {...args} radius="xl" />
- </Fragment>
-);
-
-const GridTemplate = (args: ButtonProps) => (
- <Stack>
- <GridRowGroup {...args} variant="filled" />
- <GridRowGroup {...args} variant="outline" />
- <GridRowGroup {...args} variant="default" />
- <GridRow {...args} variant="subtle" />
- <GridRow {...args} variant="inverse" />
- </Stack>
-);
-
-const LoadingGridRow = (args: ButtonProps) => (
- <Group wrap="nowrap">
- <Button {...args}>Save</Button>
- <Button {...args}>Save</Button>
- <Button {...args} leftSection={<Icon name="play" />} />
- </Group>
-);
-
-const LoadingGridRowGroup = (args: ButtonProps) => (
- <Fragment>
- <LoadingGridRow {...args} />
- <LoadingGridRow {...args} radius="xl" />
- </Fragment>
-);
-
-const LoadingGridTemplate = (args: ButtonProps) => (
- <Stack>
- <LoadingGridRowGroup {...args} variant="filled" />
- <LoadingGridRowGroup {...args} variant="outline" />
- <LoadingGridRowGroup {...args} variant="default" />
- <LoadingGridRow {...args} variant="subtle" />
- <LoadingGridRow {...args} variant="inverse" />
- </Stack>
-);
-
export default {
title: "Components/Buttons/Button",
component: Button,
@@ -142,135 +75,475 @@ export const Default = {
render: DefaultTemplate,
};
-export const ButtonGroup = {
- render: ButtonGroupTemplate,
- name: "Button group",
-};
+const MATRIX_SIZES = ["md", "sm", "lg"] as const;
+const COMPACT_SIZES = ["compact-md", "compact-sm"] as const;
+const MATRIX_STATES = [
+ "default",
+ "hover",
+ "active",
+ "disabled",
+ "loading",
+] as const;
+
+const MATRIX_COLORS = {
+ brand: "brand",
+ filter: "filter",
+ negative: "negative",
+ neutral: "neutral",
+ positive: "positive",
+ warning: "warning",
+} as const;
-export const DefaultSize = {
- render: GridTemplate,
- name: "Default size",
+const COLOR_TITLES: Record<MatrixColor, string> = {
+ brand: "Brand",
+ filter: "Filter",
+ negative: "Negative",
+ neutral: "Neutral",
+ positive: "Positive",
+ warning: "Warning",
};
-export const DefaultSizeCustomColor = {
- render: GridTemplate,
- name: "Default size, custom color",
- args: {
- color: "feedback-negative",
- },
+const STATE_LABELS: Record<MatrixState, string> = {
+ default: "default",
+ hover: "hover",
+ active: "pressed",
+ disabled: "disabled",
+ loading: "loading",
};
-export const DefaultSizeDisabled = {
- render: GridTemplate,
- name: "Default size, disabled",
- args: {
- disabled: true,
- },
+type MatrixSize = (typeof MATRIX_SIZES | typeof COMPACT_SIZES)[number];
+type MatrixState = (typeof MATRIX_STATES)[number];
+type MatrixColor = keyof typeof MATRIX_COLORS;
+
+const matrixColorProp = (color: MatrixColor) =>
+ color === "brand" ? undefined : MATRIX_COLORS[color];
+
+const matrixStateProps = (
+ state: MatrixState,
+): { disabled?: boolean; loading?: boolean } => {
+ if (state === "disabled") {
+ return { disabled: true };
+ }
+ if (state === "loading") {
+ return { loading: true };
+ }
+ return {};
};
-export const DefaultSizeLoading = {
- render: LoadingGridTemplate,
- name: "Default size, loading",
- args: {
- loading: true,
- },
+const matrixCell = (
+ variant: ButtonVariant,
+ color: MatrixColor,
+ size: MatrixSize,
+) => `${color === "brand" ? variant : `${variant}-${color}`}/${size}`;
+
+const matrixJsx = (variant: ButtonVariant, color: MatrixColor) =>
+ color === "brand"
+ ? `<Button variant="${variant}" />`
+ : `<Button variant="${variant}" color="${MATRIX_COLORS[color]}" />`;
+
+const BOARD_BACKGROUND = "background_page-primary";
+
+const matrixGridStyle = (columns: number, columnGap = "2rem") =>
+ ({
+ display: "grid",
+ gridTemplateColumns: `6rem repeat(${columns}, max-content)`,
+ columnGap,
+ rowGap: "1rem",
+ alignItems: "center",
+ justifyItems: "start",
+ }) as const;
+
+interface MatrixSectionProps {
+ title: string;
+ variant: ButtonVariant;
+ color: MatrixColor;
+ sizes: readonly MatrixSize[];
+}
+
+const MatrixSection = ({
+ title,
+ variant,
+ color,
+ sizes,
+}: MatrixSectionProps) => (
+ <StorySection
+ title={title}
+ description={<StoryJsx>{matrixJsx(variant, color)}</StoryJsx>}
+ >
+ <Box style={matrixGridStyle(sizes.length)}>
+ <Box />
+ {sizes.map((size) => (
+ <StoryLabel key={size}>{size}</StoryLabel>
+ ))}
+ {MATRIX_STATES.map((state) => (
+ <Fragment key={state}>
+ <StoryLabel>{STATE_LABELS[state]}</StoryLabel>
+ {sizes.map((size) => (
+ <Button
+ key={size}
+ variant={variant}
+ color={matrixColorProp(color)}
+ size={size}
+ data-spec-cell={`${matrixCell(variant, color, size)}/${state}`}
+ {...matrixStateProps(state)}
+ >
+ Button
+ </Button>
+ ))}
+ </Fragment>
+ ))}
+ </Box>
+ </StorySection>
+);
+
+type GroupItemKind = "text" | "icon";
+
+const groupItemCell = (
+ variant: ButtonVariant,
+ kind: GroupItemKind,
+ color: MatrixColor,
+ size: MatrixSize,
+ state: MatrixState,
+) =>
+ `${matrixCell(variant, color, size).split("/")[0]}-group-${kind}/${size}/${state}`;
+
+const groupJsx = (variant: ButtonVariant, color: MatrixColor) => {
+ const props =
+ color === "brand"
+ ? `variant="${variant}"`
+ : `variant="${variant}" color="${MATRIX_COLORS[color]}"`;
+ return [
+ "<Button.Group>",
+ ` <Button ${props}>Button</Button>`,
+ ` <Button ${props} leftSection={<Icon />} />`,
+ "</Button.Group>",
+ ].join("\n");
};
-export const DefaultSizeFullWidth = {
- render: GridTemplate,
- name: "Default size, full width",
- args: {
- fullWidth: true,
+const groupTitle = (color: MatrixColor) =>
+ color === "brand"
+ ? "Button.Group"
+ : `Button.Group · ${COLOR_TITLES[color].toLowerCase()}`;
+
+const GroupSection = ({
+ variant,
+ color,
+}: {
+ variant: ButtonVariant;
+ color: MatrixColor;
+}) => (
+ <StorySection
+ title={groupTitle(color)}
+ description={<StoryJsx>{groupJsx(variant, color)}</StoryJsx>}
+ >
+ <Box style={matrixGridStyle(MATRIX_SIZES.length)}>
+ <Box />
+ {MATRIX_SIZES.map((size) => (
+ <StoryLabel key={size}>{size}</StoryLabel>
+ ))}
+ {MATRIX_STATES.map((state) => (
+ <Fragment key={state}>
+ <StoryLabel>{STATE_LABELS[state]}</StoryLabel>
+ {MATRIX_SIZES.map((size) => (
+ <Button.Group key={size}>
+ <Button
+ variant={variant}
+ color={matrixColorProp(color)}
+ size={size}
+ data-spec-cell={groupItemCell(
+ variant,
+ "text",
+ color,
+ size,
+ state,
+ )}
+ {...matrixStateProps(state)}
+ >
+ Button
+ </Button>
+ <Button
+ variant={variant}
+ color={matrixColorProp(color)}
+ size={size}
+ leftSection={<Icon name="chevrondown" />}
+ data-spec-cell={groupItemCell(
+ variant,
+ "icon",
+ color,
+ size,
+ state,
+ )}
+ {...matrixStateProps(state)}
+ />
+ </Button.Group>
+ ))}
+ </Fragment>
+ ))}
+ </Box>
+ </StorySection>
+);
+
+interface VariantMatrixProps {
+ title: string;
+ variant: ButtonVariant;
+ colors: readonly MatrixColor[];
+ sizes?: readonly MatrixSize[];
+ groups?: readonly MatrixColor[];
+}
+
+const VariantMatrix = ({
+ title,
+ variant,
+ colors,
+ sizes = MATRIX_SIZES,
+ groups = [],
+}: VariantMatrixProps) => (
+ <StoryBoard title={title} background={BOARD_BACKGROUND} padding="2rem">
+ {colors.map((color) => (
+ <MatrixSection
+ key={color}
+ title={COLOR_TITLES[color]}
+ variant={variant}
+ color={color}
+ sizes={sizes}
+ />
+ ))}
+ {groups.map((color) => (
+ <GroupSection key={color} variant={variant} color={color} />
+ ))}
+ </StoryBoard>
+);
+
+const matrixParameters = {
+ pseudo: {
+ hover: ['[data-spec-cell$="/hover"]'],
+ active: ['[data-spec-cell$="/active"]'],
},
+ controls: { disable: true },
};
-export const DefaultSizeFullWidthDisabled = {
- render: GridTemplate,
- name: "Default size, full width, disabled",
- args: {
- disabled: true,
- fullWidth: true,
- },
+export const VariantFilled = {
+ name: "Variant: Filled",
+ render: () => (
+ <VariantMatrix
+ title="Button · filled"
+ variant="filled"
+ colors={["brand", "negative", "filter", "warning", "positive"]}
+ groups={["brand"]}
+ />
+ ),
+ parameters: matrixParameters,
};
-export const DefaultSizeFullWidthLoading = {
- render: LoadingGridTemplate,
- name: "Default size, full width, loading",
- args: {
- loading: true,
- fullWidth: true,
- },
+export const VariantDefault = {
+ name: "Variant: Default",
+ render: () => (
+ <VariantMatrix
+ title="Button · default"
+ variant="default"
+ colors={["brand"]}
+ groups={["brand"]}
+ />
+ ),
+ parameters: matrixParameters,
};
-export const CompactSize = {
- render: GridTemplate,
- name: "Compact size",
- args: {
- size: "compact-md",
- },
+export const VariantLight = {
+ name: "Variant: Light",
+ render: () => (
+ <VariantMatrix
+ title="Button · light"
+ variant="light"
+ colors={["brand", "negative", "neutral", "filter", "positive"]}
+ groups={["neutral"]}
+ />
+ ),
+ parameters: matrixParameters,
};
-export const CompactSizeCustomColor = {
- render: GridTemplate,
- name: "Compact size, custom color",
- args: {
- color: "feedback-negative",
- size: "compact-md",
- },
- play: async ({ canvasElement }: { canvasElement: HTMLCanvasElement }) => {
- const canvas = within(canvasElement);
- const button = (
- await canvas.findAllByRole("button", {
- name: "Save",
- })
- )[0];
- button.classList.add("pseudo-hover");
- },
+export const VariantSubtle = {
+ name: "Variant: Subtle",
+ render: () => (
+ <VariantMatrix
+ title="Button · subtle"
+ variant="subtle"
+ colors={["brand", "negative", "neutral", "positive"]}
+ groups={["brand", "neutral"]}
+ />
+ ),
+ parameters: matrixParameters,
};
-export const CompactSizeDisabled = {
- render: GridTemplate,
- name: "Compact size, disabled",
- args: {
- size: "compact-md",
- disabled: true,
- },
+const OnDarkTemplate = () => (
+ <StoryBoard title="Button · on dark" padding="2rem" onDark>
+ <MatrixSection
+ title="Primary"
+ variant="on-dark-primary"
+ color="brand"
+ sizes={MATRIX_SIZES}
+ />
+ <MatrixSection
+ title="Secondary"
+ variant="on-dark-secondary"
+ color="brand"
+ sizes={MATRIX_SIZES}
+ />
+ </StoryBoard>
+);
+
+export const VariantOnDark = {
+ name: "Variant: On Dark",
+ render: OnDarkTemplate,
+ parameters: matrixParameters,
};
-export const CompactSizeLoading = {
- render: LoadingGridTemplate,
- name: "Compact size, loading",
- args: {
- size: "compact-md",
- loading: true,
- },
+export const Compact = {
+ render: () => (
+ <VariantMatrix
+ title="Button · compact"
+ variant="transparent"
+ colors={["brand"]}
+ sizes={COMPACT_SIZES}
+ />
+ ),
+ parameters: matrixParameters,
};
-export const CompactSizeFullWidth = {
- render: GridTemplate,
- name: "Compact size, full width",
- args: {
+interface SectionColumn {
+ key: string;
+ variant: ButtonVariant;
+ size: MatrixSize;
+ colors: readonly MatrixColor[];
+}
+
+const SECTION_COLUMNS: readonly SectionColumn[] = [
+ { key: "default", variant: "default", size: "md", colors: ["brand"] },
+ {
+ key: "filled",
+ variant: "filled",
+ size: "md",
+ colors: ["brand", "negative"],
+ },
+ {
+ key: "light",
+ variant: "light",
+ size: "md",
+ colors: ["brand", "negative", "neutral"],
+ },
+ {
+ key: "subtle",
+ variant: "subtle",
+ size: "md",
+ colors: ["brand", "negative", "neutral"],
+ },
+ {
+ key: "compact-md",
+ variant: "transparent",
size: "compact-md",
- fullWidth: true,
+ colors: ["brand"],
},
-};
+];
-export const CompactSizeFullWidthDisabled = {
- render: GridTemplate,
- name: "Compact size, full width, disabled",
- args: {
- size: "compact-md",
- disabled: true,
- fullWidth: true,
+const SECTION_ROW_COLORS = ["brand", "negative", "neutral"] as const;
+
+const SECTION_KINDS = [
+ {
+ key: "left-icon",
+ title: "Left · icon",
+ jsx: 'leftSection={<Icon name="model" />}',
+ props: () => ({ leftSection: <Icon name="model" /> }),
+ },
+ {
+ key: "right-icon",
+ title: "Right · icon",
+ jsx: 'rightSection={<Icon name="chevrondown" />}',
+ props: () => ({ rightSection: <Icon name="chevrondown" /> }),
},
+ {
+ key: "right-kbd",
+ title: "Right · kbd",
+ jsx: 'rightSection={<KeyboardShortcut shortcut="$mod+c" />}',
+ props: () => ({ rightSection: <KeyboardShortcut shortcut="$mod+c" /> }),
+ },
+ {
+ key: "right-badge",
+ title: "Right · badge",
+ jsx: 'rightSection={<Badge variant="light" c="inherit">1</Badge>}',
+ props: () => ({
+ rightSection: (
+ <Badge variant="light" c="inherit">
+ 1
+ </Badge>
+ ),
+ }),
+ },
+] as const;
+
+type SectionKind = (typeof SECTION_KINDS)[number];
+
+const sectionCell = (
+ column: SectionColumn,
+ color: MatrixColor,
+ kind: SectionKind,
+ state: MatrixState,
+) => {
+ const [variant, size] = matrixCell(column.variant, color, column.size).split(
+ "/",
+ );
+ return `${variant}-${kind.key}/${size}/${state}`;
};
-export const CompactSizeFullWidthLoading = {
- render: LoadingGridTemplate,
- name: "Compact size, full width, loading",
- args: {
- size: "compact-md",
- loading: true,
- fullWidth: true,
- },
+const SectionKindSection = ({ kind }: { kind: SectionKind }) => (
+ <StorySection
+ title={kind.title}
+ description={<StoryJsx>{`<Button ${kind.jsx}>Button</Button>`}</StoryJsx>}
+ >
+ <Box style={matrixGridStyle(SECTION_COLUMNS.length, "1rem")}>
+ <Box />
+ {SECTION_COLUMNS.map((column) => (
+ <StoryLabel key={column.key}>{column.key}</StoryLabel>
+ ))}
+ {SECTION_ROW_COLORS.map((color) =>
+ MATRIX_STATES.map((state) => (
+ <Fragment key={`${color}-${state}`}>
+ <StoryLabel>
+ {color} · {STATE_LABELS[state]}
+ </StoryLabel>
+ {SECTION_COLUMNS.map((column) =>
+ column.colors.includes(color) ? (
+ <Button
+ key={column.key}
+ variant={column.variant}
+ size={column.size}
+ color={matrixColorProp(color)}
+ data-spec-cell={sectionCell(column, color, kind, state)}
+ {...matrixStateProps(state)}
+ {...kind.props()}
+ >
+ Button
+ </Button>
+ ) : (
+ <Box key={column.key} />
+ ),
+ )}
+ </Fragment>
+ )),
+ )}
+ </Box>
+ </StorySection>
+);
+
+export const Sections = {
+ render: () => (
+ <StoryBoard
+ title="Button · sections"
+ background={BOARD_BACKGROUND}
+ padding="1.5rem"
+ >
+ {SECTION_KINDS.map((kind) => (
+ <SectionKindSection key={kind.key} kind={kind} />
+ ))}
+ </StoryBoard>
+ ),
+ parameters: matrixParameters,
};
diff --git a/frontend/src/metabase/ui/components/buttons/Button/index.ts b/frontend/src/metabase/ui/components/buttons/Button/index.ts
deleted file mode 100644
index 4262427873f..00000000000
--- a/frontend/src/metabase/ui/components/buttons/Button/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { ButtonProps as MantineButtonProps } from "@mantine/core";
-import type { HTMLAttributes } from "react";
-
-export { Button } from "@mantine/core";
-export type { ButtonGroupProps } from "@mantine/core";
-export { buttonOverrides } from "./Button.config";
-
-export type ButtonProps = MantineButtonProps & {
- animate?: boolean;
- highlightOnHover?: boolean;
- type?: "button" | "submit";
-} & HTMLAttributes<HTMLButtonElement>;
diff --git a/frontend/src/metabase/ui/components/buttons/Button/index.tsx b/frontend/src/metabase/ui/components/buttons/Button/index.tsx
new file mode 100644
index 00000000000..b1a811fe618
--- /dev/null
+++ b/frontend/src/metabase/ui/components/buttons/Button/index.tsx
@@ -0,0 +1,55 @@
+import {
+ Button as MantineButton,
+ type ButtonProps as MantineButtonProps,
+ createPolymorphicComponent,
+} from "@mantine/core";
+import { forwardRef } from "react";
+
+import type { ButtonProps } from "./types";
+
+export type { ButtonGroupProps } from "@mantine/core";
+export { buttonOverrides } from "./Button.config";
+export type {
+ ButtonColor,
+ ButtonProps,
+ ButtonSize,
+ ButtonVariant,
+} from "./types";
+
+type SizeVariantProps = Pick<ButtonProps, "size" | "variant">;
+
+const guardTransparentInvariant = ({
+ size,
+ variant,
+}: SizeVariantProps): SizeVariantProps => {
+ if (size === "compact-sm" || size === "compact-md") {
+ return { size, variant: "transparent" };
+ }
+ if (variant === "transparent") {
+ return { size: "compact-md", variant };
+ }
+ return { size, variant };
+};
+
+const ButtonRoot = forwardRef<HTMLButtonElement, ButtonProps>(
+ function ButtonRoot({ size, variant, color, ...props }, ref) {
+ return (
+ <MantineButton
+ {...props}
+ {...guardTransparentInvariant({ size, variant })}
+ // `color` is overloaded with Figma color names that Button.config.tsx
+ // resolves into button tokens, so it is not a Mantine color
+ color={color as MantineButtonProps["color"]}
+ ref={ref}
+ />
+ );
+ },
+);
+
+const ButtonStaticComponents = { Group: MantineButton.Group };
+
+export const Button = createPolymorphicComponent<
+ "button",
+ ButtonProps,
+ typeof ButtonStaticComponents
+>(Object.assign(ButtonRoot, ButtonStaticComponents));
diff --git a/frontend/src/metabase/ui/components/buttons/Button/types.ts b/frontend/src/metabase/ui/components/buttons/Button/types.ts
new file mode 100644
index 00000000000..3f7e917982b
--- /dev/null
+++ b/frontend/src/metabase/ui/components/buttons/Button/types.ts
@@ -0,0 +1,39 @@
+import type { ButtonProps as MantineButtonProps } from "@mantine/core";
+import type { ButtonHTMLAttributes } from "react";
+
+/**
+ * @inline
+ */
+export type ButtonSize = "sm" | "md" | "lg" | "compact-sm" | "compact-md";
+
+/**
+ * @inline
+ */
+export type ButtonVariant =
+ | "default"
+ | "filled"
+ | "light"
+ | "subtle"
+ | "transparent"
+ | "on-dark-primary"
+ | "on-dark-secondary";
+
+/**
+ * @inline
+ */
+export type ButtonColor =
+ | "brand"
+ | "filter"
+ | "negative"
+ | "positive"
+ | "warning"
+ | "neutral";
+
+export type ButtonProps = Omit<
+ MantineButtonProps,
+ "size" | "variant" | "color"
+> & {
+ size?: ButtonSize;
+ variant?: ButtonVariant;
+ color?: ButtonColor;
+} & ButtonHTMLAttributes<HTMLButtonElement>;
diff --git a/frontend/src/metabase/ui/components/buttons/PopoverBackButton/PopoverBackButton.tsx b/frontend/src/metabase/ui/components/buttons/PopoverBackButton/PopoverBackButton.tsx
index 65cfa4432a8..c477640632a 100644
--- a/frontend/src/metabase/ui/components/buttons/PopoverBackButton/PopoverBackButton.tsx
+++ b/frontend/src/metabase/ui/components/buttons/PopoverBackButton/PopoverBackButton.tsx
@@ -13,13 +13,12 @@ export function PopoverBackButton(props: PopoverBackButtonProps) {
const { withArrow = true, ...rest } = props;
return (
<Button
+ variant="transparent"
+ size="compact-md"
+ justify="flex-start"
p={0}
aria-label={t`Back`}
- c="text-primary"
- fz="1rem"
- lh="1.25rem"
{...rest}
- variant="subtle"
leftSection={withArrow && <Icon name="chevronleft" />}
/>
);
diff --git a/frontend/src/metabase/ui/components/data-display/Kbd/Kbd.module.css b/frontend/src/metabase/ui/components/data-display/Kbd/Kbd.module.css
index 0a99b5897ef..022508a937a 100644
--- a/frontend/src/metabase/ui/components/data-display/Kbd/Kbd.module.css
+++ b/frontend/src/metabase/ui/components/data-display/Kbd/Kbd.module.css
@@ -5,7 +5,7 @@
border-radius: var(--mantine-radius-xxs);
background-color: var(--mb-color-background_surface-secondary);
box-shadow: none;
- color: var(--mb-color-text-primary);
+ color: inherit;
font-family: inherit;
font-weight: 500;
line-height: 1rem;
diff --git a/frontend/src/metabase/ui/components/overlays/Modal/Modal.stories.tsx b/frontend/src/metabase/ui/components/overlays/Modal/Modal.stories.tsx
index 78c60fe4bb2..269c9ef0e9f 100644
--- a/frontend/src/metabase/ui/components/overlays/Modal/Modal.stories.tsx
+++ b/frontend/src/metabase/ui/components/overlays/Modal/Modal.stories.tsx
@@ -74,12 +74,7 @@ const ConfirmationTemplate = (args: ModalProps) => {
<Button type="submit" ml="sm">
Cancel
</Button>
- <Button
- type="submit"
- variant="filled"
- color="feedback-negative"
- ml="sm"
- >
+ <Button type="submit" variant="filled" color="negative" ml="sm">
Delete
</Button>
</Flex>
diff --git a/frontend/src/metabase/ui/stories/showcase/Showcase.tsx b/frontend/src/metabase/ui/stories/showcase/Showcase.tsx
index eb6595923e5..76fcf051f11 100644
--- a/frontend/src/metabase/ui/stories/showcase/Showcase.tsx
+++ b/frontend/src/metabase/ui/stories/showcase/Showcase.tsx
@@ -2,6 +2,8 @@ import type { ReactNode } from "react";
import { Group, Paper, Stack, Text } from "metabase/ui";
+import { useStoryTextColor } from "./context";
+
interface StoryShowcaseProps {
title: string;
children: ReactNode;
@@ -34,14 +36,10 @@ export function StorySection({
}: StorySectionProps) {
return (
<Stack gap="sm">
- <Text fw="bold" c="text-primary">
+ <Text fw="bold" c={useStoryTextColor("primary")}>
{title}
</Text>
- {description != null && (
- <Text size="sm" c="text-secondary">
- {description}
- </Text>
- )}
+ {description != null && <StoryLabel>{description}</StoryLabel>}
{children}
</Stack>
);
@@ -61,10 +59,20 @@ export function StoryRow({
}: StoryRowProps) {
return (
<Group gap="lg" wrap="nowrap">
- <Text size="sm" c="text-secondary" w={labelWidth}>
- {label}
- </Text>
+ <StoryLabel w={labelWidth}>{label}</StoryLabel>
{children}
</Group>
);
}
+
+interface StoryLabelProps {
+ w?: string | number;
+ children: ReactNode;
+}
+
+/** Secondary caption — row/column labels, section notes. */
+export const StoryLabel = ({ w, children }: StoryLabelProps) => (
+ <Text size="sm" c={useStoryTextColor("secondary")} w={w}>
+ {children}
+ </Text>
+);
diff --git a/frontend/src/metabase/ui/stories/showcase/StoryBoard.tsx b/frontend/src/metabase/ui/stories/showcase/StoryBoard.tsx
index 6ae5dbbdb90..d2b505c5f6c 100644
--- a/frontend/src/metabase/ui/stories/showcase/StoryBoard.tsx
+++ b/frontend/src/metabase/ui/stories/showcase/StoryBoard.tsx
@@ -6,6 +6,8 @@ import type { ColorName } from "metabase/ui/colors/types";
import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";
import type { ResolvedColorScheme } from "metabase/utils/color-scheme";
+import { StoryBoardContext, useStoryTextColor } from "./context";
+
const getThemeVars = (
colorScheme: ResolvedColorScheme,
): Record<`--${string}`, string> => {
@@ -31,6 +33,7 @@ const DEFAULT_PADDING = "96px";
interface StoryBoardPanelProps {
colorScheme: ResolvedColorScheme;
+ onDark: boolean;
background: string;
padding: string;
children: ReactNode;
@@ -38,29 +41,34 @@ interface StoryBoardPanelProps {
const StoryBoardPanel = ({
colorScheme,
+ onDark,
background,
padding,
children,
}: StoryBoardPanelProps) => (
- <ThemeProviderContext.Provider value={{ withCssVariables: true }}>
- <ThemeProvider
- resolvedColorScheme={colorScheme}
- cssVariablesSelector={`[data-story-board-theme="${colorScheme}"][data-mantine-color-scheme]`}
- >
- <Stack
- gap="3rem"
- data-story-board-theme={colorScheme}
- data-mantine-color-scheme={colorScheme}
- style={{
- ...getThemeVars(colorScheme),
- padding,
- backgroundColor: background,
- }}
+ <StoryBoardContext.Provider
+ value={{ inverseText: onDark && colorScheme === "light" }}
+ >
+ <ThemeProviderContext.Provider value={{ withCssVariables: true }}>
+ <ThemeProvider
+ resolvedColorScheme={colorScheme}
+ cssVariablesSelector={`[data-story-board-theme="${colorScheme}"][data-mantine-color-scheme]`}
>
- {children}
- </Stack>
- </ThemeProvider>
- </ThemeProviderContext.Provider>
+ <Stack
+ gap="3rem"
+ data-story-board-theme={colorScheme}
+ data-mantine-color-scheme={colorScheme}
+ style={{
+ ...getThemeVars(colorScheme),
+ padding,
+ backgroundColor: background,
+ }}
+ >
+ {children}
+ </Stack>
+ </ThemeProvider>
+ </ThemeProviderContext.Provider>
+ </StoryBoardContext.Provider>
);
interface StoryBoardProps {
@@ -68,18 +76,32 @@ interface StoryBoardProps {
background?: ColorName;
/** Padding around each panel's content — tighten it for dense layouts. */
padding?: string;
+ /**
+ * Components meant for dark surfaces regardless of theme (tooltips etc.):
+ * both panels sit on `tooltip-background`, and story chrome in the light
+ * panel switches to `text-*-inverse`. Component tokens stay untouched.
+ */
+ onDark?: boolean;
children: ReactNode;
}
+const StoryBoardTitle = ({ title }: { title: string }) => (
+ <Text fz="1.5rem" fw="bold" c={useStoryTextColor("primary")}>
+ {title}
+ </Text>
+);
+
export const StoryBoard = ({
title,
background,
padding = DEFAULT_PADDING,
+ onDark = false,
children,
}: StoryBoardProps) => {
+ const panelBackground = onDark ? "tooltip-background" : background;
const getPanelBackground = (colorScheme: ResolvedColorScheme) =>
- background
- ? `var(--mb-color-${background})`
+ panelBackground
+ ? `var(--mb-color-${panelBackground})`
: PANEL_BACKGROUNDS[colorScheme];
return (
@@ -92,16 +114,16 @@ export const StoryBoard = ({
>
<StoryBoardPanel
colorScheme="light"
+ onDark={onDark}
background={getPanelBackground("light")}
padding={padding}
>
- <Text fz="1.5rem" fw="bold" c="text-primary">
- {title}
- </Text>
+ <StoryBoardTitle title={title} />
{children}
</StoryBoardPanel>
<StoryBoardPanel
colorScheme="dark"
+ onDark={onDark}
background={getPanelBackground("dark")}
padding={padding}
>
diff --git a/frontend/src/metabase/ui/stories/showcase/StoryJsx.tsx b/frontend/src/metabase/ui/stories/showcase/StoryJsx.tsx
index 96c20412dba..63191577ca0 100644
--- a/frontend/src/metabase/ui/stories/showcase/StoryJsx.tsx
+++ b/frontend/src/metabase/ui/stories/showcase/StoryJsx.tsx
@@ -1,4 +1,7 @@
import { Text } from "metabase/ui";
+import type { ColorName } from "metabase/ui/colors/types";
+
+import { useStoryTextColor } from "./context";
type JsxTokenType = "punctuation" | "tag" | "attribute" | "value" | "plain";
@@ -51,13 +54,16 @@ export function tokenizeJsx(code: string): JsxToken[] {
return tokens;
}
-const TOKEN_COLOR: Record<JsxTokenType, string> = {
- punctuation: "var(--mb-color-text-secondary)",
- tag: "var(--mb-color-text-primary)",
+const getTokenColors = (
+ primary: ColorName,
+ secondary: ColorName,
+): Record<JsxTokenType, string> => ({
+ punctuation: `var(--mb-color-${secondary})`,
+ tag: `var(--mb-color-${primary})`,
attribute: "var(--mb-color-core-blue-saturated)",
value: "var(--mb-color-core-green-saturated)",
- plain: "var(--mb-color-text-primary)",
-};
+ plain: `var(--mb-color-${primary})`,
+});
interface StoryJsxProps {
children: string;
@@ -65,12 +71,17 @@ interface StoryJsxProps {
/** Monospace JSX with light syntax highlighting (tags, props, values). */
export function StoryJsx({ children }: StoryJsxProps) {
+ const tokenColor = getTokenColors(
+ useStoryTextColor("primary"),
+ useStoryTextColor("secondary"),
+ );
+
return (
<Text ff="monospace" size="sm" fw={500} style={{ whiteSpace: "pre-wrap" }}>
{tokenizeJsx(children).map((token, index) => (
<span
key={`${index}-${token.value}`}
- style={{ color: TOKEN_COLOR[token.type] }}
+ style={{ color: tokenColor[token.type] }}
>
{token.value}
</span>
diff --git a/frontend/src/metabase/ui/stories/showcase/context.ts b/frontend/src/metabase/ui/stories/showcase/context.ts
new file mode 100644
index 00000000000..09280a7465a
--- /dev/null
+++ b/frontend/src/metabase/ui/stories/showcase/context.ts
@@ -0,0 +1,18 @@
+import { createContext, useContext } from "react";
+
+import type { ColorName } from "metabase/ui/colors/types";
+
+interface StoryBoardContextValue {
+ inverseText: boolean;
+}
+
+export const StoryBoardContext = createContext<StoryBoardContextValue>({
+ inverseText: false,
+});
+
+type StoryTextTone = "primary" | "secondary";
+
+export const useStoryTextColor = (tone: StoryTextTone): ColorName => {
+ const { inverseText } = useContext(StoryBoardContext);
+ return inverseText ? `text-${tone}-inverse` : `text-${tone}`;
+};
diff --git a/frontend/src/metabase/ui/stories/showcase/index.ts b/frontend/src/metabase/ui/stories/showcase/index.ts
index 98fec13088a..14af16e4dad 100644
--- a/frontend/src/metabase/ui/stories/showcase/index.ts
+++ b/frontend/src/metabase/ui/stories/showcase/index.ts
@@ -1,3 +1,3 @@
-export { StoryShowcase, StorySection, StoryRow } from "./Showcase";
+export { StoryShowcase, StorySection, StoryRow, StoryLabel } from "./Showcase";
export { StoryBoard } from "./StoryBoard";
export { StoryJsx, tokenizeJsx } from "./StoryJsx";
diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.tsx
index c4a494215ba..52c990622a4 100644
--- a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.tsx
@@ -13,11 +13,11 @@ export const ChartSettingsFooter = ({
onCancel,
onReset,
}: ChartSettingsFooterProps) => (
- <Flex justify="flex-end" gap="lg" py="lg" px="xxl">
+ <Flex justify="flex-end" align="center" gap="lg" py="lg" px="xxl">
{onReset && (
<Button
- variant="subtle"
- color="text-secondary"
+ variant="transparent"
+ size="compact-md"
leftSection={<Icon name="refresh" />}
onClick={onReset}
>{t`Reset to defaults`}</Button>
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
index 28f3751a03f..00e757448e1 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
@@ -1,5 +1,12 @@
-.horizontalButton[data-variant="inverse"] {
- &:hover {
+.horizontalButton {
+ display: flex;
+ justify-content: flex-start;
+
+ [data-position] {
+ color: var(--mb-color-core-brand);
+ }
+
+ &[data-variant][data-size]:hover {
color: var(--mb-color-text-primary-inverse);
background-color: var(--mb-color-core-brand);
@@ -22,14 +29,11 @@
.tokenFilterActionButton {
border-radius: 100px;
- height: 1.4rem;
- padding-bottom: 0.125rem;
border: 1px solid var(--mb-color-input-focus);
}
.tokenFilterActionTokenButton {
border-radius: 100px;
- padding: 0.3125rem 0.875rem;
border: 1px solid var(--mb-color-input-focus);
}
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
index eaf26a0d88e..373e5f195f0 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
@@ -4,8 +4,8 @@ import {
type ClickAction,
isCustomClickAction,
isCustomClickActionWithView,
+ isRegularClickAction,
} from "metabase/visualizations/types";
-import { isRegularClickAction } from "metabase/visualizations/types";
import S from "./ClickActionControl.module.css";
@@ -49,9 +49,8 @@ export const ClickActionControl = ({
case "token-filter":
return (
<Button
- variant="outline"
- fz="xl"
- size="xs"
+ variant="subtle"
+ size="sm"
onClick={handleClick}
className={S.tokenFilterActionButton}
leftSection={
@@ -71,9 +70,8 @@ export const ClickActionControl = ({
case "token":
return (
<Button
- variant="outline"
- size="xs"
- fz="sm"
+ variant="subtle"
+ size="sm"
className={S.tokenFilterActionTokenButton}
onClick={handleClick}
>
@@ -85,38 +83,42 @@ export const ClickActionControl = ({
return (
<Tooltip label={action.tooltip}>
<Button
- variant="outline"
- fz="xl"
- size="xs"
+ variant="subtle"
+ size="sm"
className={S.tokenFilterActionButton}
data-testid={`click-actions-sort-control-${action.name}`}
+ leftSection={
+ typeof action.icon === "string" ? (
+ <Icon size={14} name={action.icon} />
+ ) : undefined
+ }
onClick={handleClick}
- >
- {typeof action.icon === "string" && (
- <Icon size={14} name={action.icon} />
- )}
- </Button>
+ />
</Tooltip>
);
case "formatting":
return (
<Tooltip label={action.tooltip}>
- <Button variant="outline" fz="xl" size="xs" onClick={handleClick}>
- {typeof action.icon === "string" && (
- <Icon size={16} name={action.icon} />
- )}
- </Button>
+ <Button
+ size="sm"
+ leftSection={
+ typeof action.icon === "string" ? (
+ <Icon name={action.icon} />
+ ) : undefined
+ }
+ onClick={handleClick}
+ />
</Tooltip>
);
case "horizontal":
return (
<Button
- size="xs"
p="0.5rem"
mx="-0.5rem"
- variant="inverse"
+ variant="subtle"
+ color="neutral"
classNames={{
root: S.horizontalButton,
label: S.label,
diff --git a/frontend/src/metabase/visualizations/components/PinMap.tsx b/frontend/src/metabase/visualizations/components/PinMap.tsx
index 12b6f8c56c1..aa6aa6a7356 100644
--- a/frontend/src/metabase/visualizations/components/PinMap.tsx
+++ b/frontend/src/metabase/visualizations/components/PinMap.tsx
@@ -344,7 +344,6 @@ export function PinMap(props: PinMapProps) {
{shouldShowDefaultViewChangeButton ? (
<Button
className={cx("PinMapUpdateButton", S.pinMapButton)}
- size="sm"
disabled={disableUpdateButton}
onClick={updateSettings}
>
@@ -354,7 +353,6 @@ export function PinMap(props: PinMapProps) {
{!isDashboard && mapInstance?.supportsFilter() && (
<Button
className={cx("PinMapUpdateButton", S.pinMapButton)}
- size="sm"
onClick={() => {
if (!mapInstance) {
return;
diff --git a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/DashCardLoadingView.tsx b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/DashCardLoadingView.tsx
index d888c49bcb7..c5bb33c6a59 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/DashCardLoadingView.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/DashCardLoadingView.tsx
@@ -55,9 +55,7 @@ export const DashCardLoadingView = ({
<Box style={styles} className={CS.absolute} left={12} bottom={12}>
<HoverCard width={288} offset={4} position="bottom-start">
<HoverCard.Target>
- <Button w={24} h={24} p={0} classNames={{ label: cx(CS.flex) }}>
- <Icon name="snail" size={12} d="flex" />
- </Button>
+ <Button size="sm" leftSection={<Icon name="snail" />} />
</HoverCard.Target>
<HoverCard.Dropdown ml={-8}>
<div className={cx(CS.p2, CS.textCentered)}>
@@ -69,7 +67,7 @@ export const DashCardLoadingView = ({
{showMetabaseLinks && (
<Button
mt={12}
- variant="subtle"
+ variant="transparent"
size="compact-md"
rightSection={<Icon name="external" />}
component={ExternalLink}
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentedControl/ChartSettingSegmentedControl.module.css b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentedControl/ChartSettingSegmentedControl.module.css
new file mode 100644
index 00000000000..ce48e737be1
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentedControl/ChartSettingSegmentedControl.module.css
@@ -0,0 +1,22 @@
+.root {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ overflow: hidden;
+ border: 1px solid var(--mb-color-button-filled-brand-default);
+ border-radius: 6px;
+ background-color: var(--mb-color-background_page-primary);
+}
+
+.root .item[data-variant] {
+ flex: 1 0 0;
+ min-width: 0;
+ height: 38px;
+ border-width: 0;
+ border-radius: 0;
+ box-shadow: none;
+
+ &:not(:first-child) {
+ border-inline-start: 1px solid var(--mb-color-button-filled-brand-default);
+ }
+}
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentedControl/ChartSettingSegmentedControl.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentedControl/ChartSettingSegmentedControl.tsx
index 0aa71f30124..973b32f31f8 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentedControl/ChartSettingSegmentedControl.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentedControl/ChartSettingSegmentedControl.tsx
@@ -1,36 +1,25 @@
-import cx from "classnames";
-
-import CS from "metabase/css/core/index.css";
-import { Box, Button, Center, Icon, Text } from "metabase/ui";
+import { Box, Button, Icon } from "metabase/ui";
import type { ChartSettingSegmentedControlProps } from "metabase/viz-core";
+import S from "./ChartSettingSegmentedControl.module.css";
+
export const ChartSettingSegmentedControl = ({
options,
onChange,
value,
}: ChartSettingSegmentedControlProps) => (
- <Button.Group w="100%">
+ <Box className={S.root}>
{options.map((elem) => (
<Button
- className={cx(CS.borderBrand, CS.flexGrow1)}
- py="sm"
+ className={S.item}
px="xxs"
variant={value === elem.value ? "filled" : "default"}
key={elem.value}
+ leftSection={elem.icon ? <Icon name={elem.icon} /> : undefined}
onClick={() => onChange(elem.value)}
>
- {elem.icon ? (
- <Center>
- <Icon name={elem.icon} size={16}></Icon>
- </Center>
- ) : (
- <Box>
- <Text inherit c="inherit" lh="normal">
- {elem.name}
- </Text>
- </Box>
- )}
+ {elem.icon ? null : elem.name}
</Button>
))}
- </Button.Group>
+ </Box>
);
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx
index dd4c6d1b124..0ab4da5ae11 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx
@@ -96,9 +96,13 @@ export const ChartSettingSegmentsEditor = ({
/>
</td>
<td>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
{(segments.length > 1 || canRemoveAll) && (
<Button
- leftSection={<Icon name="trash" c="text-disabled" />}
+ variant="subtle"
+ color="neutral"
+ size="sm"
+ leftSection={<Icon name="trash" />}
onClick={() =>
onChange(segments.filter((v, i) => i !== index))
}
@@ -120,6 +124,7 @@ export const ChartSettingSegmentsEditor = ({
>{t`Add color ranges to make this number change color depending on it's value`}</Text>
)}
<Button
+ size="lg"
leftSection={<Icon name="add" />}
onClick={() => onChange(segments.concat(newSegment(segments)))}
w="100%"
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
index f67e0d78b69..297334eca6e 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
@@ -6,7 +6,16 @@ import _ from "underscore";
import { ColorSelector } from "metabase/common/components/ColorSelector";
import type { DragEndEvent } from "metabase/common/components/Sortable";
-import { Box, Button, Flex, Group, Icon, Select, Text } from "metabase/ui";
+import {
+ Box,
+ Button,
+ Flex,
+ Group,
+ Icon,
+ Select,
+ Stack,
+ Text,
+} from "metabase/ui";
import { color } from "metabase/ui/colors";
import { getNamedAccentColors } from "metabase/ui/colors/groups";
import { getNullDisplayValue } from "metabase/utils/constants";
@@ -165,10 +174,11 @@ export const ChartSettingSeriesOrder = ({
/>
<Text truncate fw="bold">{t`Other`}</Text>
</Group>
+ {/* TODO: replace with ActionIcon (GDGT-2457) */}
<Button
- size="compact-md"
- color="text-secondary"
variant="subtle"
+ color="neutral"
+ size="sm"
leftSection={<Icon name="gear" />}
aria-label={t`Other series settings`}
onClick={handleOtherSeriesSettingsClick}
@@ -203,24 +213,26 @@ export const ChartSettingSeriesOrder = ({
getItemColor={getItemColor}
dividers={dividers}
/>
- {truncatedItems.length > 0 ? (
- <div>
+ <Stack gap="md" mt="md" align="flex-start">
+ {truncatedItems.length > 0 && (
<Button
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
onClick={() => setIsListTruncated(false)}
>
{t`${truncatedItems.length} more series`}
</Button>
- </div>
- ) : null}
- {canAddSeries && !isSeriesPickerVisible && (
- <Button
- variant="subtle"
- onClick={() => setSeriesPickerVisible(true)}
- >
- {addButtonLabel}
- </Button>
- )}
+ )}
+ {canAddSeries && !isSeriesPickerVisible && (
+ <Button
+ variant="transparent"
+ size="compact-md"
+ onClick={() => setSeriesPickerVisible(true)}
+ >
+ {addButtonLabel}
+ </Button>
+ )}
+ </Stack>
{isSeriesPickerVisible && (
<Select
dropdownOpened
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingTableColumns/ChartSettingTableColumns.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingTableColumns/ChartSettingTableColumns.tsx
index 759716c2ab3..73e383bfc40 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingTableColumns/ChartSettingTableColumns.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingTableColumns/ChartSettingTableColumns.tsx
@@ -31,8 +31,8 @@ export const ChartSettingTableColumns = ({
<div>
{hasEditButton && (
<Button
- pl="0"
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
onClick={() => setIsEditingQuery(!isEditingQuery)}
>
{isEditingQuery ? t`Done picking columns` : t`Add or remove columns`}
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleListing.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleListing.tsx
index dbf4876062d..e0d902940c3 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleListing.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleListing.tsx
@@ -28,8 +28,8 @@ export const RuleListing = ({
</Stack>
<Box>
<Button
- variant="subtle"
- color="text-primary"
+ variant="transparent"
+ size="compact-md"
onClick={onAdd}
leftSection={<Icon name="add" />}
>
diff --git a/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListViewConfiguration.tsx b/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListViewConfiguration.tsx
index 1ae2cdf8e39..232e499abbd 100644
--- a/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListViewConfiguration.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListViewConfiguration.tsx
@@ -382,7 +382,9 @@ export const ListViewConfiguration = ({
className={cx(S.iconColorButton, {
[S.selected]: color === iconConfig.selectedIconColor,
})}
- variant="subtle"
+ variant="transparent"
+ size="compact-md"
+ p={0}
bg={color}
onClick={() => {
handleConfigurationChange({
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.tsx
index 2ff4f0c172a..3152f378a2b 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.tsx
@@ -171,7 +171,7 @@ export function ComparisonPicker({
</IconButtonWrapper>
)
}
- px="1rem"
+ size="lg"
fullWidth
data-testid="comparisons-widget-button"
styles={{
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx
index 55f37fcf048..b024e234d6d 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx
@@ -19,7 +19,6 @@ export const AddComparisonButton = styled((props: ButtonProps) => (
<Button {...props} variant={props.variant ?? "subtle"} />
))`
align-self: flex-start;
- padding: 0;
`;
type ComparisonPickerSecondaryTextProps = TextProps &
@@ -35,8 +34,6 @@ export const ComparisonPickerSecondaryText = styled(
// Unjustified type cast. FIXME
export const ComparisonPickerButton = styled(Button)<ButtonProps>`
- height: 40px;
-
&:hover {
${ComparisonPickerSecondaryText} {
color: var(--mb-color-core-brand);
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.tsx
index d63cfb1a063..c88800f705a 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.tsx
@@ -121,6 +121,8 @@ export function SmartScalarComparisonWidget({
</SortableContext>
</DndContext>
<AddComparisonButton
+ variant="transparent"
+ size="compact-md"
disabled={!canAddComparison}
onClick={handleAddComparison}
>{t`Add comparison`}</AddComparisonButton>
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx b/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx
index 514c3104db5..b2a5a516e81 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx
+++ b/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx
@@ -87,8 +87,8 @@ export const DataImporter = ({
</Title>
{dataSources.length > 0 && (
<Button
- size="xs"
variant="transparent"
+ size="compact-md"
ml="auto"
onClick={() => {
if (showDatasets) {
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.module.css b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.module.css
index 5bf18e844ef..d140f927913 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.module.css
+++ b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.module.css
@@ -1,57 +1,5 @@
-.DatasetsListItem {
- cursor: pointer;
- border-radius: 4px;
- gap: var(--mantine-spacing-xxs);
- height: 46px;
-}
-
-.InfoIcon {
- display: none;
-}
-
.WarningIcon {
position: absolute;
top: 13px;
- left: 19px;
-}
-
-.RemoveButton {
- display: none;
-}
-
-.DatasetsListItem:hover {
- color: var(--mb-color-core-brand);
-
- .InfoIcon {
- display: unset;
- }
-
- .RemoveButton {
- display: unset;
- }
-
- .TableIcon {
- display: none;
- }
-
- .AddButton[data-variant="inverse"] {
- --button-color: var(--mb-color-core-brand);
- }
-}
-
-.DatasetsListItemSelected,
-.DatasetsListItemSelected:hover {
- color: var(--mb-color-text-primary-inverse);
- background-color: var(--mb-color-core-brand);
-}
-
-.DatasetsListItemActions {
- display: flex;
- align-items: center;
- gap: var(--mantine-spacing-xxs);
- padding-left: var(--mantine-spacing-xxs);
-}
-
-.AddButton[data-variant="inverse"] {
- --button-color: var(--mb-color-text-disabled);
+ left: 11px;
}
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.tsx b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.tsx
index 215947c2da5..9e6eac3a50b 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.tsx
+++ b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.tsx
@@ -28,11 +28,13 @@ export const DatasetsListItem = (props: DatasetsListItemProps) => {
return (
<Button
- fullWidth
+ justify="start"
+ flex="0 0 auto"
+ pl={0}
+ variant={selected ? "filled" : "subtle"}
+ color={selected ? "brand" : "neutral"}
data-testid="swap-dataset-button"
- variant="visualizer"
aria-pressed={selected}
- size="xs"
onClick={() => {
if (selected) {
onRemove?.(item);
@@ -42,7 +44,7 @@ export const DatasetsListItem = (props: DatasetsListItemProps) => {
}}
leftSection={
<Box>
- <Icon c="inherit" className={S.TableIcon} name="table2" mr="xxs" />
+ <Icon c="inherit" name="table2" mr="xxs" />
{item.notRecommended && (
<Tooltip
label={t`This dataset might not be fully compatible with your current selection.`}
@@ -57,9 +59,8 @@ export const DatasetsListItem = (props: DatasetsListItemProps) => {
)}
</Box>
}
- style={{ flex: 0, minHeight: 30, paddingLeft: 8, paddingRight: 8 }}
>
- <Ellipsified style={{ height: 17 }}>{item.name}</Ellipsified>
+ <Ellipsified>{item.name}</Ellipsified>
</Button>
);
};
diff --git a/frontend/src/metabase/visualizer/components/Header/Header.tsx b/frontend/src/metabase/visualizer/components/Header/Header.tsx
index 23c6a36dd58..be064164d67 100644
--- a/frontend/src/metabase/visualizer/components/Header/Header.tsx
+++ b/frontend/src/metabase/visualizer/components/Header/Header.tsx
@@ -92,7 +92,6 @@ export function Header({
<Button.Group>
<Tooltip withinPortal={false} label={t`Undo`}>
<Button
- size="sm"
aria-label={t`Undo`}
disabled={!canUndo}
onClick={undo}
@@ -103,7 +102,6 @@ export function Header({
</Tooltip>
<Tooltip withinPortal={false} label={t`Redo`}>
<Button
- size="sm"
aria-label={t`Redo`}
disabled={!canRedo}
onClick={redo}
@@ -115,7 +113,6 @@ export function Header({
</Button.Group>
<Button
variant="filled"
- size="sm"
disabled={!saveButtonEnabled}
onClick={handleSave}
>
diff --git a/loki.config.js b/loki.config.js
index d88b7db6d08..87e79c47030 100644
--- a/loki.config.js
+++ b/loki.config.js
@@ -19,7 +19,7 @@ module.exports = {
"^Components/Inputs/Radio (Overview|Radio\\.Card)$",
"^Components/Inputs/Switch (Overview|Switch\\.Group)$",
"^Components/Parameters/DatePicker",
- "^Components/Buttons/Button Compact size, custom color",
+ "^Components/Buttons/Button (Variant|Compact|Sections)",
"^Components/Overlays/Tooltip",
"^Components/Documents",
"^Components/Feedback/Alert",