diff --git a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg index a845d4f580..430b53146f 100644 --- a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg +++ b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg @@ -104,66 +104,6 @@ - - @BackgroundColor - @ButtonTopBackgroundColor - @GeneralBorderColor - @GeneralBorderColor - @PrimaryColorLighten2 - @PrimaryColorLighten3 - @TextEditFieldBackgroundColor - @GeneralBorderColor - @PrimaryColorLighten3 - @PrimaryColorLighten2 - @PrimaryColor - @PrimaryColorLighten4 - @PrimaryColorDarken5 - @PrimaryColorLighten6 - @PrimaryColorDarken3 - @PrimaryColorLighten3 - @PrimaryColor - @PrimaryColorLighten4 - lighten(@GroupboxBackgroundColor,20) - images_classic - 3px - @PrimaryColorDarken4 - #191919 - darken(@PrimaryColor,5) - darken(@PrimaryColor,8) - darken(@PrimaryColor,15) - darken(@PrimaryColor,20) - darken(@PrimaryColor,200) - darken(@PrimaryColor,5890) - lighten(@PrimaryColor,20) - lighten(@PrimaryColor,40) - lighten(@PrimaryColor,80) - lighten(@PrimaryColor,100) - lighten(@PrimaryColor,300) - lighten(@PrimaryColor,5890) - @CheckBoxBackgroundColor - @GeneralBorderColor - @GeneralDisabledBackgroundColor - #fc6c6c - #ffffff - #8cff5b - #fc6c6c - #77cbff - #ffa256 - #ff9090 - #ffffff - white - @PrimaryColorDarken5 - darken(@TextForegroundColor,40) - @PrimaryColor - #ffffff - darken(@AccentColor,100) - #0095ff - 2px - @ThemeAccentColor1 - blend(@GeneralBackgroundColor,@AccentColor,60) - blend(@GeneralBackgroundHoverColor,@AccentColor,30) - - diff --git a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg index 5cbfd007a6..7f13118993 100644 --- a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg +++ b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg @@ -119,65 +119,6 @@ - - @BackgroundColor - @ButtonTopBackgroundColor - @GeneralBorderColor - @GeneralBorderColor - @PrimaryColorDarken1 - @PrimaryColorLighten3 - @TextEditFieldBackgroundColor - @GeneralBorderColor - @PrimaryColorLighten4 - @PrimaryColor - @PrimaryColor - @PrimaryColorLighten5 - @PrimaryColorDarken4 - @PrimaryColorDarken5 - @PrimaryColorDarken3 - @PrimaryColorDarken4 - @PrimaryColorDarken2 - @PrimaryColorLighten2 - darken(@GroupboxBackgroundColor,20) - images_classic - 3px - @PrimaryColorLighten1 - #F0F0F0 - darken(@PrimaryColor,4) - darken(@PrimaryColor,8) - darken(@PrimaryColor,10) - darken(@PrimaryColor,20) - darken(@PrimaryColor,200) - darken(@PrimaryColor,5890) - lighten(@PrimaryColor,2) - lighten(@PrimaryColor,3) - lighten(@PrimaryColor,4) - lighten(@PrimaryColor,5) - lighten(@PrimaryColor,6) - lighten(@PrimaryColor,7) - @CheckBoxBackgroundColor - @GeneralBorderColor - @GeneralDisabledBackgroundColor - #9d0000 - #000000 - #278100 - #9d0000 - #005991 - #ab4d00 - #9d0000 - #000000 - black - @PrimaryColorDarken4 - lighten(@TextForegroundColor,40) - @PrimaryColorLighten3 - #000000 - @AccentHoverColor - #0061a7 - @ThemeAccentColor1 - blend(@GeneralBackgroundColor,@AccentColor,60) - blend(@GeneralBackgroundHoverColor,@AccentColor,30) - - @@ -214,7 +155,7 @@ - + diff --git a/src/Gui/Stylesheets/CMakeLists.txt b/src/Gui/Stylesheets/CMakeLists.txt index ac16f446dd..11ca09cb0a 100644 --- a/src/Gui/Stylesheets/CMakeLists.txt +++ b/src/Gui/Stylesheets/CMakeLists.txt @@ -6,6 +6,11 @@ SET(Stylesheets_Files "FreeCAD Light.qss" ) +SET(Parameters_Files + "parameters/FreeCAD Dark.yaml" + "parameters/FreeCAD Light.yaml" +) + SET(Overlay_Stylesheets_Files "overlay/Freecad Overlay.qss" #remove below after testing new stylesheet system 8/6/2025 @@ -35,11 +40,12 @@ SOURCE_GROUP("overlay_icons" FILES ${Overlay_icons}) ADD_CUSTOM_TARGET(Stylesheets_data ALL - SOURCES ${Stylesheets_Files} ${Images_Files} ${Images_Files2} ${Overlay_Stylesheets_Files} ${Overlay_icons} + SOURCES ${Stylesheets_Files} ${Parameters_Files} ${Images_Files} ${Images_Files2} ${Overlay_Stylesheets_Files} ${Overlay_icons} ) fc_copy_sources(Stylesheets_data "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets" ${Stylesheets_Files} + ${Parameters_Files} ${Images_Files} ${Images_Files2} ${Overlay_Stylesheets_Files} @@ -51,6 +57,12 @@ INSTALL( DESTINATION ${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets ) +INSTALL( + FILES + ${Parameters_Files} + DESTINATION + ${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets/parameters +) INSTALL( FILES ${Overlay_Stylesheets_Files} diff --git a/src/Gui/Stylesheets/FreeCAD.qss b/src/Gui/Stylesheets/FreeCAD.qss index 902b3f0d8d..92fb60b054 100644 --- a/src/Gui/Stylesheets/FreeCAD.qss +++ b/src/Gui/Stylesheets/FreeCAD.qss @@ -91,10 +91,25 @@ Gui--PropertyEditor--PropertyEditor > QWidget > QFrame:focus { background-color: @AccentColor;/* same as focused background color */} /* hack to hide weird redundant information inside cells with links and no editable data (but editable via "..." button) */ Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QLabel { - background-color: @TextUrlColor;/* same as focused background color */ - border-radius: @InputFieldBorderRadius; + background-color: @PrimaryColor;/* same as focused background color */ + /* border-radius: @InputFieldBorderRadius; */ } +/* Pushbutton style for "..." inside Placement cell which launches Placement tool */ +Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QPushButton, +Gui--PropertyEditor--PropertyEditor > QWidget > PushButton { + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 @ButtonTopBackgroundColor,stop:1 @ButtonBottomBackgroundColor); + border: 1px solid @GeneralBorderColor; + min-width: 16px; /* reset it due to larger value on regular QPushButton, same or bigger value as regular QPushButton min-height */ + border-radius: @InputFieldBorderRadius; + margin: 0px; /* reset */ + padding: 0px; /* reset */ +} + +Gui--PropertyEditor--PropertyEditor > QWidget > QPushButton { + text-align:left; + padding-left: 2px; +} /*================================================================================================== Main window ==================================================================================================*/ @@ -123,13 +138,11 @@ Gui--MDIView QLabel{ Gui--MDIView QScrollArea{ border: 1px solid @GeneralBorderColor; background-color: transparent;/* Added to maintain consistency */} + /* QWidget ---------------------------------------------------------------- This causes much load time. DONT USE "QWidget { " This causes a lot of lag. */ - - - QColorDialog { background-color: @DialogBackgroundColor; border: 1px solid @GeneralBorderColor; @@ -271,7 +284,7 @@ QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QChe QCheckBox::indicator:unchecked:disabled { background-color: @GeneralDisabledBackgroundColor; - border: 1px solid @GeneralBorderHoverColor; + border: 1px solid @CheckBoxBorderColor; } QCheckBox::indicator:checked { @@ -288,6 +301,7 @@ QCheckBox::indicator:checked:disabled { /* background-color: @PrimaryColor; */ border: 1px solid @CheckBoxBorderColor; image: url(qss:@IconsLocationFolderName/check-mark-lightgray.svg); + background-color: @GeneralDisabledBackgroundColor; } QCheckBox::indicator:indeterminate { @@ -299,6 +313,7 @@ QCheckBox::indicator:indeterminate { QCheckBox::indicator:indeterminate:disabled { /* background-color: @PrimaryColor; */ border: 1px solid @CheckBoxBorderColor; + background-color: @GeneralDisabledBackgroundColor; image: url(qss:@IconsLocationFolderName/indeterminate-mark-lightgray.svg); } @@ -503,7 +518,7 @@ QMenu::item { padding-left: 5px; padding-top: 4px; padding-bottom: 4px; - padding-right: 50px; + padding-right: 5px; /* Reserve space for selection border */} QMenu::item:selected { @@ -696,7 +711,6 @@ QScrollBar::handle:vertical { border-top: 1px solid @GeneralBorderColor; border-bottom: 1px solid @GeneralBorderColor; min-height: 20px; - background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 @ButtonTopBackgroundColor, stop:1 @ButtonBottomBackgroundColor); } @@ -704,6 +718,11 @@ QScrollBar::handle:vertical:focus { border: 1px solid @AccentColor; } +QScrollBar::handle:vertical:hover { + background-color: @GeneralBackgroundHoverColor; + border: 1px @ButtonTopBackgroundColor; +} + QScrollBar::add-line, QScrollBar::sub-line { height: 12px; width: 12px; @@ -717,7 +736,7 @@ QScrollBar::add-line:horizontal:hover, QScrollBar::sub-line:horizontal:hover { background-color: @GeneralBackgroundHoverColor; } -QScrollBar::right-arrow, QScrollbar::left-arrow, QScrollBar::up-arrow, QScrollBar::down-arrow { +QScrollBar::right-arrow, QScrollBar::left-arrow, QScrollBar::up-arrow, QScrollBar::down-arrow { margin: 2px; } @@ -1348,7 +1367,7 @@ QComboBox { border-radius: @InputFieldBorderRadius; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 @ButtonTopBackgroundColor,stop:1 @ButtonBottomBackgroundColor ); padding-left: 4px; - padding-right: 2px; + padding-right: 18px; /* 18px for the check-mark that says which item is active */ min-height: 22px; } @@ -1777,8 +1796,8 @@ QDockWidget QTabBar { /*tabbar in dockwidget */ } QTabBar#mdiAreaTabBar::tab:bottom:selected { - background-color: @3DViewBackgroundRefColor; - border-top: @3DViewBackgroundRefColor; + background-color: @ActiveTabBackgroundColor; + border-top: @ActiveTabBackgroundColor; } /*tabbar for files. */ @@ -1863,7 +1882,7 @@ QTabBar::tab:top, QDockWidget QTabBar::tab:top { margin-left: 0px; margin-right: 0px; min-width: 5px; - background-color: @GeneralDisabledBackgroundColor ; + background-color: @InActiveTabBackgroundColor; border-top: 1px solid @GeneralBorderColor; border-bottom: 1px solid @GeneralBorderColor; border-left: 1px solid @GeneralBorderColor; @@ -1873,9 +1892,9 @@ QTabBar::tab:top, QDockWidget QTabBar::tab:top { } QTabBar::tab:top:selected, QDockWidget QTabBar::tab:top:selected { - background-color: @GeneralBackgroundColor; + background-color: @ActiveTabBackgroundColor; border-top: 1px solid @GeneralBorderColor; - border-bottom: 1px solid @GeneralBackgroundColor; + border-bottom: 1px solid @ActiveTabBackgroundColor; border-left: 1px solid @GeneralBorderColor; border-right: 1px solid @GeneralBorderColor; margin-top: 0px; @@ -1894,7 +1913,7 @@ QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover { QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom { min-width: 5px; - background-color: @GeneralDisabledBackgroundColor ; + background-color: @InActiveTabBackgroundColor; border-bottom: 1px solid @GeneralBorderColor; border-top: 1px solid @GeneralBorderColor; border-left: 1px solid @GeneralBorderColor; @@ -1904,9 +1923,9 @@ QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom { } QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected { - background-color: @GeneralBackgroundColor; + background-color: @ActiveTabBackgroundColor; border-bottom: 1px solid @GeneralBorderColor; - border-top: 1px solid @GeneralBackgroundColor; + border-top: 1px solid @ActiveTabBackgroundColor; border-left: 1px solid @GeneralBorderColor; border-right: 1px solid @GeneralBorderColor; margin-bottom: 0px; @@ -1925,7 +1944,7 @@ QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:h QTabBar::tab:left, QDockWidget QTabBar::tab:left { min-height: 5px; - background-color: @GeneralDisabledBackgroundColor ; + background-color: @InActiveTabBackgroundColor; border-bottom: 1px solid @GeneralBorderColor; border-right: 1px solid @GeneralBorderColor; border-left: 1px solid @GeneralBorderColor; @@ -1935,9 +1954,9 @@ QTabBar::tab:left, QDockWidget QTabBar::tab:left { } QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected { - background-color: @GeneralBackgroundColor; + background-color: @ActiveTabBackgroundColor; border-bottom: 1px solid @GeneralBorderColor; - border-right: 1px solid @GeneralBackgroundColor; + border-right: 1px solid @ActiveTabBackgroundColor; border-left: 1px solid @GeneralBorderColor; border-top: 1px solid @GeneralBorderColor; margin-left: 0px; @@ -1955,7 +1974,7 @@ QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover QTabBar::tab:right, QDockWidget QTabBar::tab:right { min-height: 5px; - background-color: @GeneralDisabledBackgroundColor ; + background-color: @InActiveTabBackgroundColor; border-bottom: 1px solid @GeneralBorderColor; border-left: 1px solid @GeneralBorderColor; border-right: 1px solid @GeneralBorderColor; @@ -1965,9 +1984,9 @@ QTabBar::tab:right, QDockWidget QTabBar::tab:right { } QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected { - background-color: @GeneralBackgroundColor; + background-color: @ActiveTabBackgroundColor; border-bottom: 1px solid @GeneralBorderColor; - border-left: 1px solid @GeneralBackgroundColor; + border-left: 1px solid @ActiveTabBackgroundColor; border-left: 1px solid @GeneralBorderColor; border-top: 1px solid @GeneralBorderColor; margin-right: 0px; @@ -2442,7 +2461,7 @@ QDateEdit::drop-down, QDateTimeEdit::drop-down { subcontrol-origin: padding; subcontrol-position: top right; width: 12px; - border-left: 1px solid ; + border-left: 1px solid; } QDateEdit::down-arrow, QDateTimeEdit::down-arrow { @@ -2605,14 +2624,10 @@ QGroupBox[objectName="matOpsGrpBox"] QPushButton { min-width: 235px; } -QToolBar > Gui--WorkbenchComboBox QAbstractItemView { - min-width: 180px; - margin-left: 30px; - border: 1px solid @GeneralBorderColor; - padding-left: -27px; - background-color: transparent; -} +Gui--WorkbenchComboBox { +padding-right: -10px; +} /* Below is a fix for indentation in properties*/ diff --git a/src/Gui/Stylesheets/overlay/Freecad Overlay.qss b/src/Gui/Stylesheets/overlay/Freecad Overlay.qss index 80d974b0a8..adc141567a 100644 --- a/src/Gui/Stylesheets/overlay/Freecad Overlay.qss +++ b/src/Gui/Stylesheets/overlay/Freecad Overlay.qss @@ -133,11 +133,11 @@ Gui--OverlayToolButton::pressed, Gui--OverlayToolButton:checked { border: 0.5px solid @GeneralBorderColor; border-radius: 1px; - background-color: @UserHighlight1Color; + background-color: @ThemeAccentColor1; } Gui--OverlayToolButton:checked:hover { - border: 0.5px solid @UserHighlight1Color; + border: 0.5px solid @ThemeAccentColor1; background-color: @3DViewBackgroundRefColor } diff --git a/src/Gui/Stylesheets/parameters/FreeCAD Dark.yaml b/src/Gui/Stylesheets/parameters/FreeCAD Dark.yaml new file mode 100644 index 0000000000..82ab75dab1 --- /dev/null +++ b/src/Gui/Stylesheets/parameters/FreeCAD Dark.yaml @@ -0,0 +1,59 @@ +3DViewBackgroundRefColor: "@BackgroundColor" +ButtonBackgroundHooverColor: "@ButtonTopBackgroundColor" +ButtonBorderColor: "@GeneralBorderColor" +ButtonBorderHooverColor: "@GeneralBorderColor" +ButtonBottomBackgroundColor: "@PrimaryColorLighten2" +ButtonTopBackgroundColor: "@PrimaryColorLighten3" +CheckBoxBackgroundColor: "@TextEditFieldBackgroundColor" +CheckBoxBorderColor: "@GeneralBorderColor" +DialogBackgroundColor: "@PrimaryColorLighten3" +GeneralAlternateBackgroundColor: "@PrimaryColorLighten2" +GeneralBackgroundColor: "@PrimaryColor" +GeneralBackgroundHoverColor: "@PrimaryColorLighten4" +GeneralBorderColor: "@PrimaryColorDarken5" +GeneralBorderHoverColor: "@PrimaryColorLighten6" +GeneralDisabledBackgroundColor: "@PrimaryColorDarken3" +GeneralGridLinesColor: "@PrimaryColorLighten3" +GeneralHeaderBackgroundColor: "@PrimaryColor" +GroupboxBackgroundColor: "@PrimaryColorLighten4" +GroupboxBorderColor: "lighten(@GroupboxBackgroundColor,20)" +IconsLocationFolderName: "images_classic" +InputFieldBorderRadius: "3px" +MenuBackgroundColor: "@PrimaryColorDarken4" +PrimaryColor: "#191919" +PrimaryColorDarken1: "darken(@PrimaryColor,5)" +PrimaryColorDarken2: "darken(@PrimaryColor,8)" +PrimaryColorDarken3: "darken(@PrimaryColor,15)" +PrimaryColorDarken4: "darken(@PrimaryColor,20)" +PrimaryColorDarken5: "darken(@PrimaryColor,200)" +PrimaryColorDarken6: "darken(@PrimaryColor,5890)" +PrimaryColorLighten1: "lighten(@PrimaryColor,20)" +PrimaryColorLighten2: "lighten(@PrimaryColor,40)" +PrimaryColorLighten3: "lighten(@PrimaryColor,80)" +PrimaryColorLighten4: "lighten(@PrimaryColor,100)" +PrimaryColorLighten5: "lighten(@PrimaryColor,300)" +PrimaryColorLighten6: "lighten(@PrimaryColor,5890)" +RadioButtonBackgroundColor: "@CheckBoxBackgroundColor" +RadioButtonBorderColor: "@GeneralBorderColor" +ScrollbarBackgroundColor: "@GeneralDisabledBackgroundColor" +SketcherConflictingConstraintsColor: "#fc6c6c" +SketcherEmptySketchColor: "#ffffff" +SketcherFullyConstrainedColor: "#8cff5b" +SketcherMalformedConstraintsColor: "#fc6c6c" +SketcherPartiallyRedundantConstraintsColor: "#77cbff" +SketcherRedundantConstraintsColor: "#ffa256" +SketcherSolverFailedColor: "#ff9090" +SketcherUnderConstrainedColor: "#ffffff" +StylesheetIconsColor: "white" +TabbarBackgroundColor: "@PrimaryColorDarken5" +InActiveTabBackgroundColor: "@PrimaryColorDarken2" +ActiveTabBackgroundColor: "@3DViewBackgroundRefColor" +TextDisabledColor: "darken(@TextForegroundColor,40)" +TextEditFieldBackgroundColor: "@PrimaryColor" +TextForegroundColor: "#ffffff" +TextSelectBackgroundColor: "darken(@AccentColor,100)" +TextUrlColor: "#0095ff" +ToolbarButtonsPadding: "2px" +AccentColor: "@ThemeAccentColor1" +AccentBackgroundColor: "blend(@GeneralBackgroundColor,@AccentColor,60)" +AccentHoverColor: "blend(@GeneralBackgroundHoverColor,@AccentColor,30)" diff --git a/src/Gui/Stylesheets/parameters/FreeCAD Light.yaml b/src/Gui/Stylesheets/parameters/FreeCAD Light.yaml new file mode 100644 index 0000000000..31621e39cb --- /dev/null +++ b/src/Gui/Stylesheets/parameters/FreeCAD Light.yaml @@ -0,0 +1,59 @@ +3DViewBackgroundRefColor: "@BackgroundColor" +ButtonBackgroundHooverColor: "@ButtonTopBackgroundColor" +ButtonBorderColor: "@GeneralBorderColor" +ButtonBorderHooverColor: "@GeneralBorderColor" +ButtonBottomBackgroundColor: "@PrimaryColorDarken1" +ButtonTopBackgroundColor: "@PrimaryColorLighten3" +CheckBoxBackgroundColor: "@TextEditFieldBackgroundColor" +CheckBoxBorderColor: "@GeneralBorderColor" +DialogBackgroundColor: "@PrimaryColorLighten4" +GeneralAlternateBackgroundColor: "@PrimaryColor" +GeneralBackgroundColor: "@PrimaryColor" +GeneralBackgroundHoverColor: "@PrimaryColorLighten5" +GeneralBorderColor: "@PrimaryColorDarken4" +GeneralBorderHoverColor: "@PrimaryColorDarken5" +GeneralDisabledBackgroundColor: "@PrimaryColorDarken3" +GeneralGridLinesColor: "@PrimaryColorDarken4" +GeneralHeaderBackgroundColor: "@PrimaryColorDarken2" +GroupboxBackgroundColor: "@PrimaryColorLighten2" +GroupboxBorderColor: "darken(@GroupboxBackgroundColor,20)" +IconsLocationFolderName: "images_classic" +InputFieldBorderRadius: "3px" +MenuBackgroundColor: "@PrimaryColorLighten1" +PrimaryColor: "#F0F0F0" +PrimaryColorDarken1: "darken(@PrimaryColor,4)" +PrimaryColorDarken2: "darken(@PrimaryColor,8)" +PrimaryColorDarken3: "darken(@PrimaryColor,10)" +PrimaryColorDarken4: "darken(@PrimaryColor,20)" +PrimaryColorDarken5: "darken(@PrimaryColor,200)" +PrimaryColorDarken6: "darken(@PrimaryColor,5890)" +PrimaryColorLighten1: "lighten(@PrimaryColor,2)" +PrimaryColorLighten2: "lighten(@PrimaryColor,3)" +PrimaryColorLighten3: "lighten(@PrimaryColor,4)" +PrimaryColorLighten4: "lighten(@PrimaryColor,5)" +PrimaryColorLighten5: "lighten(@PrimaryColor,6)" +PrimaryColorLighten6: "lighten(@PrimaryColor,7)" +RadioButtonBackgroundColor: "@CheckBoxBackgroundColor" +RadioButtonBorderColor: "@GeneralBorderColor" +ScrollbarBackgroundColor: "@GeneralDisabledBackgroundColor" +SketcherConflictingConstraintsColor: "#9d0000" +SketcherEmptySketchColor: "#000000" +SketcherFullyConstrainedColor: "#278100" +SketcherMalformedConstraintsColor: "#9d0000" +SketcherPartiallyRedundantConstraintsColor: "#005991" +SketcherRedundantConstraintsColor: "#ab4d00" +SketcherSolverFailedColor: "#9d0000" +SketcherUnderConstrainedColor: "#000000" +StylesheetIconsColor: "black" +TabbarBackgroundColor: "@PrimaryColorDarken4" +InActiveTabBackgroundColor: "@PrimaryColorDarken2" +ActiveTabBackgroundColor: "@3DViewBackgroundRefColor" +TextDisabledColor: "darken(@TabbarBackgroundColor,80)" +TextEditFieldBackgroundColor: "@PrimaryColorLighten3" +TextForegroundColor: "#000000" +TextSelectBackgroundColor: "@AccentHoverColor" +TextUrlColor: "#0061a7" +AccentColor: "@ThemeAccentColor1" +AccentBackgroundColor: "blend(@GeneralBackgroundColor,@AccentColor,60)" +AccentHoverColor: "blend(@GeneralBackgroundHoverColor,@AccentColor,30)" +ToolbarButtonsPadding: "2px" diff --git a/src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_dark.png b/src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_dark.png index b1b518829e..26370a18ff 100644 Binary files a/src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_dark.png and b/src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_dark.png differ diff --git a/src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_light.png b/src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_light.png index c137cd8869..71c5babfb3 100644 Binary files a/src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_light.png and b/src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_light.png differ diff --git a/src/Mod/Start/Gui/Resources/thumbnails/Thumbnails_themes.svg b/src/Mod/Start/Gui/Resources/thumbnails/Thumbnails_themes.svg index d184f6fac7..c83b0d3e82 100644 --- a/src/Mod/Start/Gui/Resources/thumbnails/Thumbnails_themes.svg +++ b/src/Mod/Start/Gui/Resources/thumbnails/Thumbnails_themes.svg @@ -8,8 +8,13 @@ version="1.1" id="svg1" xml:space="preserve" - inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" + inkscape:version="1.4.2 (f4327f4, 2025-05-13)" sodipodi:docname="Thumbnails_themes.svg" + inkscape:export-batch-path="..\..\github repros\FreeCAD_MisterMaker\src\Mod\Start\Gui\Resources\thumbnails" + inkscape:export-batch-name="Theme_thumbnail_dark.png" + inkscape:export-filename="Theme_thumbnail_light.png" + inkscape:export-xdpi="45" + inkscape:export-ydpi="45" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -24,15 +29,15 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" - inkscape:zoom="0.70377385" - inkscape:cx="358.78003" - inkscape:cy="497.31885" + inkscape:zoom="0.49764326" + inkscape:cx="258.2171" + inkscape:cy="494.33001" inkscape:window-width="1920" inkscape:window-height="1028" inkscape:window-x="1913" inkscape:window-y="-6" inkscape:window-maximized="1" - inkscape:current-layer="g5-6" + inkscape:current-layer="layer1" showgrid="false" />lightlight