diff --git a/resources/images/ams_humidity_tips.svg b/resources/images/ams_humidity_tips.svg index 240c7b130..96055be7d 100644 --- a/resources/images/ams_humidity_tips.svg +++ b/resources/images/ams_humidity_tips.svg @@ -1,13 +1,13 @@ - - + + - + diff --git a/resources/images/im_all_plates_stats.svg b/resources/images/im_all_plates_stats.svg index f2a781004..26d7f97c2 100644 --- a/resources/images/im_all_plates_stats.svg +++ b/resources/images/im_all_plates_stats.svg @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/resources/images/ip_address_step.svg b/resources/images/ip_address_step.svg index 4ff7028b9..56e0b2fe9 100644 --- a/resources/images/ip_address_step.svg +++ b/resources/images/ip_address_step.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/sdcard_state_normal.svg b/resources/images/sdcard_state_normal.svg index e0ae5db61..c9004ca46 100644 --- a/resources/images/sdcard_state_normal.svg +++ b/resources/images/sdcard_state_normal.svg @@ -4,6 +4,6 @@ - + diff --git a/resources/images/tips_arrow.svg b/resources/images/tips_arrow.svg index ba8c9ccd1..cba8d02d9 100644 --- a/resources/images/tips_arrow.svg +++ b/resources/images/tips_arrow.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/web/guide/6/6.css b/resources/web/guide/6/6.css index c12aadd54..3175c3bd9 100644 --- a/resources/web/guide/6/6.css +++ b/resources/web/guide/6/6.css @@ -38,7 +38,7 @@ html,body .Btn_Green:hover { - background-color:#00f0d9; + background-color:#4db6ac; } diff --git a/resources/web/guide/css/common.css b/resources/web/guide/css/common.css index f25e4f0a9..a2d0f19eb 100644 --- a/resources/web/guide/css/common.css +++ b/resources/web/guide/css/common.css @@ -124,7 +124,7 @@ body .NormalBtn:hover { - background-color:#00f0d9; + background-color:#4db6ac; } .GrayBtn @@ -176,7 +176,7 @@ body .SmallBtn_Green:hover { - background-color: #00f0d9; + background-color: #4db6ac; } /*---HyperLink---*/ diff --git a/resources/web/homepage/css/dark.css b/resources/web/homepage/css/dark.css index 6dcb6d658..ba1b49c16 100644 --- a/resources/web/homepage/css/dark.css +++ b/resources/web/homepage/css/dark.css @@ -62,7 +62,7 @@ body /*-----Right Top MenuBtn-----*/ .MenuItem:hover { - border-color: #00f0d9; + border-color: #4db6ac; background-color: #004942; } diff --git a/resources/web/homepage/css/home.css b/resources/web/homepage/css/home.css index da4dc9df6..6252c7281 100644 --- a/resources/web/homepage/css/home.css +++ b/resources/web/homepage/css/home.css @@ -169,7 +169,7 @@ body font-size: 14px; height: 24px; line-height: 24px; - color: #00f0d9; + color: #4db6ac; border: 1px solid #009688; border-radius: 4px; cursor: pointer; @@ -270,7 +270,7 @@ body .MenuItem:hover { - border-color: #00f0d9; + border-color: #4db6ac; background-color: #E0FCEB; } diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 7513d3397..11e87e4d4 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -149,13 +149,13 @@ NotificationManager::PopNotification::PopNotification(const NotificationData &n, m_ErrorColor = ImVec4(0.9, 0.36, 0.36, 1); m_WarnColor = ImVec4(0.99, 0.69, 0.455, 1); - m_NormalColor = ImVec4(0.03, 0.6, 0.18, 1); + m_NormalColor = ImVec4(0, 0.588, 0.533, 1); m_CurrentColor = m_NormalColor; //Default m_WindowBkgColor = ImVec4(1, 1, 1, 1); m_TextColor = ImVec4(.2f, .2f, .2f, 1.0f); - m_HyperTextColor = ImVec4(0.03, 0.6, 0.18, 1); + m_HyperTextColor = ImVec4(0, 0.588, 0.533, 1); m_WindowRadius = 4.0f * wxGetApp().plater()->get_current_canvas3D()->get_scale(); } @@ -196,7 +196,7 @@ void NotificationManager::PopNotification::use_bbl_theme() m_WindowBkgColor = m_is_dark ? ImVec4(45 / 255.f, 45 / 255.f, 49 / 255.f, 1.f) : ImVec4(1, 1, 1, 1); m_TextColor = m_is_dark ? ImVec4(224 / 255.f, 224 / 255.f, 224 / 255.f, 1.f) : ImVec4(.2f, .2f, .2f, 1.0f); - m_HyperTextColor = m_is_dark ? ImVec4(0.03, 0.6, 0.18, 1) : ImVec4(0.03, 0.6, 0.18, 1); + m_HyperTextColor = m_is_dark ? ImVec4(0, 0.588, 0.533, 1) : ImVec4(0, 0.588, 0.533, 1); m_is_dark ? push_style_color(ImGuiCol_Border, {62 / 255.f, 62 / 255.f, 69 / 255.f, 1.f}, true, m_current_fade_opacity) : push_style_color(ImGuiCol_Border, m_CurrentColor, true, m_current_fade_opacity); push_style_color(ImGuiCol_WindowBg, m_WindowBkgColor, true, m_current_fade_opacity); push_style_color(ImGuiCol_Text, m_TextColor, true, m_current_fade_opacity);