kindred/create
1
1
Fork 0
Code Issues 47 Pull Requests Actions 4 Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #22923 from MisterMakerNL/Stylesheet_fixes2

Browse Source 
Stylesheet fixes
This commit is contained in:
Kacper Donat
2025-08-27 21:58:50 +02:00
committed by GitHub
parent 5fe310a3c2 5f2f22f588
commit c01f5e9aae
10 changed files with 600 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg
View File

@@ -104,66 +104,6 @@
<FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
<FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
<FCUInt Name="ThemeAccentColor3" Value="1434171135"/>
<FCParamGroup Name="UserTokens">
<FCText Name="3DViewBackgroundRefColor">@BackgroundColor</FCText>
<FCText Name="ButtonBackgroundHooverColor">@ButtonTopBackgroundColor</FCText>
<FCText Name="ButtonBorderColor">@GeneralBorderColor</FCText>
<FCText Name="ButtonBorderHooverColor">@GeneralBorderColor</FCText>
<FCText Name="ButtonBottomBackgroundColor">@PrimaryColorLighten2</FCText>
<FCText Name="ButtonTopBackgroundColor">@PrimaryColorLighten3</FCText>
<FCText Name="CheckBoxBackgroundColor">@TextEditFieldBackgroundColor</FCText>
<FCText Name="CheckBoxBorderColor">@GeneralBorderColor</FCText>
<FCText Name="DialogBackgroundColor">@PrimaryColorLighten3</FCText>
<FCText Name="GeneralAlternateBackgroundColor">@PrimaryColorLighten2</FCText>
<FCText Name="GeneralBackgroundColor">@PrimaryColor</FCText>
<FCText Name="GeneralBackgroundHoverColor">@PrimaryColorLighten4</FCText>
<FCText Name="GeneralBorderColor">@PrimaryColorDarken5</FCText>
<FCText Name="GeneralBorderHoverColor">@PrimaryColorLighten6</FCText>
<FCText Name="GeneralDisabledBackgroundColor">@PrimaryColorDarken3</FCText>
<FCText Name="GeneralGridLinesColor">@PrimaryColorLighten3</FCText>
<FCText Name="GeneralHeaderBackgroundColor">@PrimaryColor</FCText>
<FCText Name="GroupboxBackgroundColor">@PrimaryColorLighten4</FCText>
<FCText Name="GroupboxBorderColor">lighten(@GroupboxBackgroundColor,20)</FCText>
<FCText Name="IconsLocationFolderName">images_classic</FCText>
<FCText Name="InputFieldBorderRadius">3px</FCText>
<FCText Name="MenuBackgroundColor">@PrimaryColorDarken4</FCText>
<FCText Name="PrimaryColor">#191919</FCText>
<FCText Name="PrimaryColorDarken1">darken(@PrimaryColor,5)</FCText>
<FCText Name="PrimaryColorDarken2">darken(@PrimaryColor,8)</FCText>
<FCText Name="PrimaryColorDarken3">darken(@PrimaryColor,15)</FCText>
<FCText Name="PrimaryColorDarken4">darken(@PrimaryColor,20)</FCText>
<FCText Name="PrimaryColorDarken5">darken(@PrimaryColor,200)</FCText>
<FCText Name="PrimaryColorDarken6">darken(@PrimaryColor,5890)</FCText>
<FCText Name="PrimaryColorLighten1">lighten(@PrimaryColor,20)</FCText>
<FCText Name="PrimaryColorLighten2">lighten(@PrimaryColor,40)</FCText>
<FCText Name="PrimaryColorLighten3">lighten(@PrimaryColor,80)</FCText>
<FCText Name="PrimaryColorLighten4">lighten(@PrimaryColor,100)</FCText>
<FCText Name="PrimaryColorLighten5">lighten(@PrimaryColor,300)</FCText>
<FCText Name="PrimaryColorLighten6">lighten(@PrimaryColor,5890)</FCText>
<FCText Name="RadioButtonBackgroundColor">@CheckBoxBackgroundColor</FCText>
<FCText Name="RadioButtonBorderColor">@GeneralBorderColor</FCText>
<FCText Name="ScrollbarBackgroundColor">@GeneralDisabledBackgroundColor</FCText>
<FCText Name="SketcherConflictingConstraintsColor">#fc6c6c</FCText>
<FCText Name="SketcherEmptySketchColor">#ffffff</FCText>
<FCText Name="SketcherFullyConstrainedColor">#8cff5b</FCText>
<FCText Name="SketcherMalformedConstraintsColor">#fc6c6c</FCText>
<FCText Name="SketcherPartiallyRedundantConstraintsColor">#77cbff</FCText>
<FCText Name="SketcherRedundantConstraintsColor">#ffa256</FCText>
<FCText Name="SketcherSolverFailedColor">#ff9090</FCText>
<FCText Name="SketcherUnderConstrainedColor">#ffffff</FCText>
<FCText Name="StylesheetIconsColor">white</FCText>
<FCText Name="TabbarBackgroundColor">@PrimaryColorDarken5</FCText>
<FCText Name="TextDisabledColor">darken(@TextForegroundColor,40)</FCText>
<FCText Name="TextEditFieldBackgroundColor">@PrimaryColor</FCText>
<FCText Name="TextForegroundColor">#ffffff</FCText>
<FCText Name="TextSelectBackgroundColor">darken(@AccentColor,100)</FCText>
<FCText Name="TextUrlColor">#0095ff</FCText>
<FCText Name="ToolbarButtonsPadding">2px</FCText>
<FCText Name="AccentColor">@ThemeAccentColor1</FCText>
<FCText Name="AccentBackgroundColor">blend(@GeneralBackgroundColor,@AccentColor,60)</FCText>
<FCText Name="AccentHoverColor">blend(@GeneralBackgroundHoverColor,@AccentColor,30)</FCText>
</FCParamGroup>
<FCParamGroup Name="Tokens"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCInt Name="FontSize" Value="11"/>

61
src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg
View File

@@ -119,65 +119,6 @@
<FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
<FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
<FCUInt Name="ThemeAccentColor3" Value="1434171135"/>
<FCParamGroup Name="UserTokens">
<FCText Name="3DViewBackgroundRefColor">@BackgroundColor</FCText>
<FCText Name="ButtonBackgroundHooverColor">@ButtonTopBackgroundColor</FCText>
<FCText Name="ButtonBorderColor">@GeneralBorderColor</FCText>
<FCText Name="ButtonBorderHooverColor">@GeneralBorderColor</FCText>
<FCText Name="ButtonBottomBackgroundColor">@PrimaryColorDarken1</FCText>
<FCText Name="ButtonTopBackgroundColor">@PrimaryColorLighten3</FCText>
<FCText Name="CheckBoxBackgroundColor">@TextEditFieldBackgroundColor</FCText>
<FCText Name="CheckBoxBorderColor">@GeneralBorderColor</FCText>
<FCText Name="DialogBackgroundColor">@PrimaryColorLighten4</FCText>
<FCText Name="GeneralAlternateBackgroundColor">@PrimaryColor</FCText>
<FCText Name="GeneralBackgroundColor">@PrimaryColor</FCText>
<FCText Name="GeneralBackgroundHoverColor">@PrimaryColorLighten5</FCText>
<FCText Name="GeneralBorderColor">@PrimaryColorDarken4</FCText>
<FCText Name="GeneralBorderHoverColor">@PrimaryColorDarken5</FCText>
<FCText Name="GeneralDisabledBackgroundColor">@PrimaryColorDarken3</FCText>
<FCText Name="GeneralGridLinesColor">@PrimaryColorDarken4</FCText>
<FCText Name="GeneralHeaderBackgroundColor">@PrimaryColorDarken2</FCText>
<FCText Name="GroupboxBackgroundColor">@PrimaryColorLighten2</FCText>
<FCText Name="GroupboxBorderColor">darken(@GroupboxBackgroundColor,20)</FCText>
<FCText Name="IconsLocationFolderName">images_classic</FCText>
<FCText Name="InputFieldBorderRadius">3px</FCText>
<FCText Name="MenuBackgroundColor">@PrimaryColorLighten1</FCText>
<FCText Name="PrimaryColor">#F0F0F0</FCText>
<FCText Name="PrimaryColorDarken1">darken(@PrimaryColor,4)</FCText>
<FCText Name="PrimaryColorDarken2">darken(@PrimaryColor,8)</FCText>
<FCText Name="PrimaryColorDarken3">darken(@PrimaryColor,10)</FCText>
<FCText Name="PrimaryColorDarken4">darken(@PrimaryColor,20)</FCText>
<FCText Name="PrimaryColorDarken5">darken(@PrimaryColor,200)</FCText>
<FCText Name="PrimaryColorDarken6">darken(@PrimaryColor,5890)</FCText>
<FCText Name="PrimaryColorLighten1">lighten(@PrimaryColor,2)</FCText>
<FCText Name="PrimaryColorLighten2">lighten(@PrimaryColor,3)</FCText>
<FCText Name="PrimaryColorLighten3">lighten(@PrimaryColor,4)</FCText>
<FCText Name="PrimaryColorLighten4">lighten(@PrimaryColor,5)</FCText>
<FCText Name="PrimaryColorLighten5">lighten(@PrimaryColor,6)</FCText>
<FCText Name="PrimaryColorLighten6">lighten(@PrimaryColor,7)</FCText>
<FCText Name="RadioButtonBackgroundColor">@CheckBoxBackgroundColor</FCText>
<FCText Name="RadioButtonBorderColor">@GeneralBorderColor</FCText>
<FCText Name="ScrollbarBackgroundColor">@GeneralDisabledBackgroundColor</FCText>
<FCText Name="SketcherConflictingConstraintsColor">#9d0000</FCText>
<FCText Name="SketcherEmptySketchColor">#000000</FCText>
<FCText Name="SketcherFullyConstrainedColor">#278100</FCText>
<FCText Name="SketcherMalformedConstraintsColor">#9d0000</FCText>
<FCText Name="SketcherPartiallyRedundantConstraintsColor">#005991</FCText>
<FCText Name="SketcherRedundantConstraintsColor">#ab4d00</FCText>
<FCText Name="SketcherSolverFailedColor">#9d0000</FCText>
<FCText Name="SketcherUnderConstrainedColor">#000000</FCText>
<FCText Name="StylesheetIconsColor">black</FCText>
<FCText Name="TabbarBackgroundColor">@PrimaryColorDarken4</FCText>
<FCText Name="TextDisabledColor">lighten(@TextForegroundColor,40)</FCText>
<FCText Name="TextEditFieldBackgroundColor">@PrimaryColorLighten3</FCText>
<FCText Name="TextForegroundColor">#000000</FCText>
<FCText Name="TextSelectBackgroundColor">@AccentHoverColor</FCText>
<FCText Name="TextUrlColor">#0061a7</FCText>
<FCText Name="AccentColor">@ThemeAccentColor1</FCText>
<FCText Name="AccentBackgroundColor">blend(@GeneralBackgroundColor,@AccentColor,60)</FCText>
<FCText Name="AccentHoverColor">blend(@GeneralBackgroundHoverColor,@AccentColor,30)</FCText>
</FCParamGroup>
<FCParamGroup Name="Tokens"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeActiveColor" Value="1538528255"/>
@@ -214,7 +155,7 @@
<FCUInt Name="HeadlightColor" Value="4059297279"/>
<FCUInt Name="HiddenLineBackground" Value="4294967040"/>
<FCUInt Name="HiddenLineFaceColor" Value="4294967040"/>
<FCUInt Name="HighlightColor" Value="2025779455"/>
<FCUInt Name="HighlightColor" Value="7995647"/>
<FCUInt Name="InternalAlignedGeoColor" Value="995875839"/>
<FCUInt Name="InvalidSketchColor" Value="4252898559"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="2257491711"/>

14
src/Gui/Stylesheets/CMakeLists.txt
View File

@@ -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}

79
src/Gui/Stylesheets/FreeCAD.qss
View File

@@ -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*/

4
src/Gui/Stylesheets/overlay/Freecad Overlay.qss
View File

@@ -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
}

59
src/Gui/Stylesheets/parameters/FreeCAD Dark.yaml Normal file
View File

@@ -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)"

59
src/Gui/Stylesheets/parameters/FreeCAD Light.yaml Normal file
View File

@@ -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"

BIN
src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_dark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 30 KiB

829
src/Mod/Start/Gui/Resources/thumbnails/Thumbnails_themes.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 580 KiB

After

Width:  |  Height:  |  Size: 582 KiB