GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-04 09:36:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,174 Commits 295 Branches 268 Tags
Commit Graph

93 Commits

Author SHA1 Message Date
j.delarago
ce86e025d9 New style highlighting on borders 
CURA-8688
 2022-02-28 14:56:07 +01:00
j.delarago
83661ebd7f Remove duplicate color for primary button. 
Adjust secondary button colors to account for different colors being used between light and dark themes.

CURA-8688
 2022-02-28 12:02:51 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
 2022-02-28 08:51:42 +01:00
j.delarago
17cab9946d Dark theming 
CURA-8688
 2022-02-25 18:18:43 +01:00
j.delarago
7bbea62558 Add base_colors to theme 
If the value of a color is a string, there will be an attempt to fetch this color from base_colors.

CURA-8688
 2022-02-25 14:56:24 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Jaime van Kessel
1589475dd4 Remove a slew of unusued colors in the theme 2022-02-25 13:54:50 +01:00
Jaime van Kessel
ff0b64a56a Purge bunch of unused sizes from theme 2022-02-25 13:33:32 +01:00
10r3n20
58137e4987 inverted y and z colors 2022-02-18 12:08:11 +01:00
Evangelos Trantos
d7c3495509
Merge pull request #11328 from Ultimaker/CURA-8378_improve_checkbox_visibility 
Cura 8378 improve checkbox visibility
 2022-02-02 19:54:34 +02:00
j.delarago
818ef8e614 add dark theme checkbox square color 2022-01-24 14:13:03 +01:00
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00
Ghostkeeper
a878cfae7a
Merge branch 'master' into marketplace_redesign 2021-12-31 14:07:51 +01:00
casper
02c81234d0 Remove references to the toolbox plugin from the themes.json 
Some other components were (incorrectly) using these theme variables.
Replaced them by another theme variable with the same value.

CURA 8588
 2021-12-30 13:38:16 +01:00
Ghostkeeper
73bb311293
Add dark theme entry for background of detail panels 
Otherwise it uses the very bright light theme which doesn't match with the light text colour in dark mode.

Contributes to issue CURA-8556. Found during issue CURA-8557.
 2021-10-29 15:47:22 +02:00
10r3n20
00120870e1 add dark themed images to the dark theme 2021-10-26 13:01:15 +02:00
Konstantinos Karmas
d24d520db0 Change background of Premium plugins and materials 
Or else the link "Search materials" in the materials tab was very hard to see.

CURA-8380
 2021-08-24 13:32:25 +02:00
Ghostkeeper
14f0c30795
Give secondary buttons a background colour again 
This background colour is the same as the main background, on which these buttons almost always are situated. However in the cases where they are not, such as the post-processing scripts button, this makes the text easier to read than a completely transparent background colour.

Done as a 5 minute fix.
 2021-07-21 14:18:45 +02:00
Konstantinos Karmas
38bec36f6b Revert Tertiary button to its previous style 
The styling of the Tertiary button (to not look like a link anymore) and the introduction of the Quatertiary button (as the link button) will happen in a separate ticket in the future.

CURA-8012
 2021-07-06 13:45:24 +02:00
Remco Burema
acf3f2d02a
Let Tertiary button have its own hover entry. 
Secondary button entries should not be re-used here.

part of CURA-8012
 2021-07-06 09:37:48 +02:00
Remco Burema
a42fee4834
Put the dark-theme bg back the way it was. 
Not really part of this ticket. Also no buttons are directly on the background anyway.

part of CURA-8012
 2021-07-06 09:25:10 +02:00
Remco Burema
1c73077f7e
More dark theme tweaks. 
part of CURA-8012
 2021-07-02 13:54:34 +02:00
Remco Burema
952e02676f
Tweaks for restyling benefitting the dark theme. 
part of CURA-8012
 2021-07-02 13:24:02 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface 
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
 2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons" 
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
 2021-05-27 16:06:20 +02:00
jelle Spijker
845289f708
Removed old theme specific Icons for cloud connect 
This is already taken care of in QML

CURA-8010_new_icons
 2021-04-28 11:17:29 +02:00
Jaime van Kessel
3e67d20890
Remove monitor_text_primary 
It's so close to the text one that it really doesn't make sense to keep it.
Boyscouting the code a bit here

CURA-7745
 2020-10-08 17:31:19 +02:00
Remco Burema
b394be3583
Remove superfluous theme entry. 
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
 2020-08-05 08:16:10 +02:00
Jaime van Kessel
b2ca6a9224
Add removed theme entries again 
Some plugins were using them.
 2020-08-03 10:38:33 +02:00
Jaime van Kessel
8b7b8b0118
Simplify the SettingCategory 2020-07-10 14:50:44 +02:00
Kostas Karmas
78bd5520bd Add theme color for sync state icon 
CURA-7418
 2020-06-16 14:41:23 +02:00
Jaime van Kessel
d01286a340
Remove all duplicate entries from dark theme 2020-03-10 11:57:30 +01:00
Jaime van Kessel
1a24e9a04a
Remove unneeded overrides from dark theme 2020-03-10 11:35:07 +01:00
Nino van Hooff
8ea3004c73 Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog 
CURA-7152
 2020-01-30 12:51:13 +01:00
Jaime van Kessel
785c33abec
Change the action_button_hover color in dark theme 
This makes it actually visible.
 2019-09-26 13:16:52 +02:00
Ghostkeeper
ec22ddcb9a
Give infill and support interface a more distinct colour 
We had complaints that infill had a too similar colour to skin.

Fixes #5827.
 2019-06-07 13:30:15 +02:00
Remco Burema
bcfb2c02e5 Fix dark-theme and arrow for add-printer-dialog. [CURA-6435] 2019-04-17 17:45:11 +02:00
Jaime van Kessel
ffd7a001fb Add notification icon to the installed tab of the toolbox 
CURA-6151
 2019-03-28 13:31:51 +01:00
Ian Paschal
c14aa3686c Add some new colors to theme 
Contributes to CL-1247
 2019-02-19 12:23:03 +01:00
Remco Burema
c6c0ed5f00 Fix sign-in size for cloud icon (and add for dark theme). 
Co-authored-by: Yi-An Lai <y.lai@ultimaker.com>
 2019-02-12 11:57:01 +01:00
Remco Burema
203f699d0a Override message-box bg-color in dark theme. [CURA-6169] 2019-02-01 11:24:50 +01:00
Ian Paschal
ee5c6ed3fb Unconnected empty state (DRAFT) 
Contributes to CL-1154
 2019-01-24 16:54:09 +01:00
Ian Paschal
e204696b61 Add dark theme 
Contributes to CL-1165
 2019-01-23 12:10:06 +01:00
Ian Paschal
bc9831abd1 Add color theming to monitor tab 
Contributes to CL-1212
 2019-01-21 17:10:41 +01:00
Jaime van Kessel
766fc2293e Fix visibility for machine icon in dark theme 2018-12-21 14:35:41 +01:00
Jaime van Kessel
0e294481ff Improve readability of printer_type_label for dark theme 2018-12-17 17:32:11 +01:00
Jaime van Kessel
d379f94775 Make the dark theme a bit more readable 2018-12-14 13:23:28 +01:00
Jaime van Kessel
6a3ac99551 Ensure that all icons use the same color from theme. 
Also added some fixes for the dark theme
 2018-12-14 11:59:22 +01:00
Ghostkeeper
b565b111c8
Adjust disabled extruder colour 
This also introduces a more global 'disabled' colour as defined by the style guide. I hope that we can gradually transition to this one, but we'll have to adjust some colours here and there.

Contributes to issue CURA-5876.
 2018-12-07 15:38:08 +01:00
Ghostkeeper
de78c44461
Fix configuration drop-down for dark theme 
This actually changes the secondary colour to be darker for the dark theme, to be more in line with the general theme then.

Contributes to issue CURA-5876.
 2018-12-04 16:43:13 +01:00