Commit graph

773 commits

Author SHA1 Message Date
Lipu Fei
96678b11ca Update LayerView slider according to new style
CURA-4212
2017-09-11 11:10:56 +02:00
Lipu Fei
09bb090cd9 Change setting_control_text to almost black colour
CURA-4148
2017-09-11 10:53:17 +02:00
Lipu Fei
327c84d9ef Change tool panel and checkbox text colours
CURA-4148

- Change tool panel background colour to white
- Change checkbox text colour to almost black
2017-09-11 10:48:31 +02:00
Lipu Fei
b2eead7736 Resolve merge conflicts from master
CURA-4212
2017-09-11 10:32:34 +02:00
Lipu Fei
546dc9ff4d Better positioning for the material circle in the ExtruderButton 2017-09-11 08:49:07 +02:00
Mark
3b12e39ba8 Selected state font is not bold anymore for custom and recommended
CURA-4148
2017-09-08 16:35:08 +02:00
Mark
a485781900 Add new unknown icon
CURA-4148
2017-09-08 13:06:08 +02:00
Mark
8264b6fe67 Fix default action_button color and checkbox onHover color
CURA-4148
2017-09-08 11:58:24 +02:00
Lipu Fei
c8a92f2c59 Move LayerView slider down
CURA-4212
2017-09-07 17:04:14 +02:00
Lipu Fei
d89fc220fc Make LayerView panel vertically longer
CURA-4212
2017-09-07 16:24:47 +02:00
Lipu Fei
40b60a2d95 Fix colour for LayView panel and per object settings panel
CURA-4148
2017-09-06 16:23:29 +02:00
Lipu Fei
8010fa9c85 White background for checkboxes
CURA-4148
2017-09-06 16:09:25 +02:00
Lipu Fei
24e5c72e47 Update colour for light theme
CURA-4148
2017-09-06 16:04:31 +02:00
Lipu Fei
1dd5f7b0ee Update machine state icons
CURA-4148
2017-09-06 16:04:31 +02:00
Lipu Fei
e18528d2ca Fix position of the material compatibility warning
CURA-4148
2017-09-06 15:49:54 +02:00
Lipu Fei
d561af63e0 Merge branch 'master' into feature_move_logo_icons 2017-09-06 15:36:22 +02:00
Lipu Fei
e15a96263d Update extruder button styles
CURA-4211
2017-09-06 12:00:53 +02:00
Lipu Fei
60c7d2f22e Update topbar
CURA-4213
2017-09-05 18:05:30 +02:00
Lipu Fei
63e75ec6b7 Merge branch 'master'
CURA-4213
2017-09-05 12:42:23 +02:00
Lipu Fei
4b08a5611a Make topbar transparent and update text style
CURA-4213
2017-09-05 11:37:05 +02:00
Lipu Fei
afb8850155 Update topbar button style
CURA-4213
2017-09-05 11:12:22 +02:00
Lipu Fei
e44aedc4b9 Make logo smaller
CURA-4213
2017-09-05 10:56:55 +02:00
Jaime van Kessel
bcd8e2ca67 Merge branch 'feature_extruder_buttons' of github.com:Ultimaker/Cura 2017-09-05 09:57:14 +02:00
Lipu Fei
77adfe345d Fix merge conflicts from master
CURA-4213
2017-09-05 08:41:44 +02:00
Lipu Fei
4249274af0 Move license window size to light theme
CURA-4279

The light theme is now the default and it's a base theme, so the window
size needs to be there.
2017-09-04 17:25:58 +02:00
Lipu Fei
1b66eaea22 Move extruder button sizes to cura-light theme
CURA-4211
2017-09-04 12:14:18 +02:00
Lipu Fei
8e774dede4 Change extruder combobox style for simple mode
CURA-4211
2017-09-04 08:42:55 +02:00
Lipu Fei
0025369762 Remove old extruder material icons
CURA-4211
2017-09-04 08:30:59 +02:00
Lipu Fei
d0740158b1 Merge branch 'master' into feature_extruder_buttons
CURA-4211

Resolve merge conflicts.
2017-09-04 08:29:26 +02:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons'
CURA-4148
2017-09-01 19:25:29 +02:00
alekseisasin
a288668bae Adjusted color for the extruder counter number in left toolbox and added
extra margin-right in sidebar_category
CURA-4148
2017-09-01 17:45:50 +02:00
Jaime van Kessel
a6e90270cf Updated margins so low resolution screens can actually have some settings visible 2017-09-01 12:05:20 +02:00
Lipu Fei
ceccca8244 Reduce the width of the license window
CURA-4222
2017-09-01 10:18:27 +02:00
Lipu Fei
7de9ccefaa Change extruder button on the toolbar side
CURA-4211

Change the extruder button on the toolbar side according to the new
design.
2017-08-31 17:49:23 +02:00
Lipu Fei
b174d04a9b Add SVG image for extruder button
CURA-4211
2017-08-31 17:49:22 +02:00
Ghostkeeper
31af4b7dde
Remove unused icon
Contributes to issue CURA-4213.
2017-08-31 17:34:23 +02:00
Ghostkeeper
28d18d88e5
Make top bar buttons smaller
Contributes to issue CURA-4213.
2017-08-31 17:30:44 +02:00
Ghostkeeper
d13b693da0
Hide icons if top bar buttons have no icon
Otherwise there's some empty space there and the RecolourImage will colour that space white.

Contributes to issue CURA-4213.
2017-08-31 17:24:12 +02:00
Ghostkeeper
5b36869b32
Update background colour of status icons
This outline needs to be the same colour as the background of the top bar.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
99cae1469e
Copy status icons to dark theme
We want the dark theme to use these icons, but we want to update these icons for the light theme so I'm back-upping the icons for the dark theme.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
a60cf07844
Use black logo for light theme
It's black on white instead of white on black.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
c0f7d6aa19
Copy Cura logo from Light theme
We're going to keep this dark theme with the white Cura logo but modify the Light themed one to have a black logo.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
d4e5e10825
Restore vertical margins
We weren't allowed to change that yet.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
f301464987
Update missing colours
And colours that have to change because the behaviour was changed (such as opacities now being themeable.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
e619c11e01
New base theme: Cura-light
There is a new theme now, Cura Light, based on the original colours of Cura 15.6 through 2.7. It is now also the base of the themes. It will soon be made the temporary default until the UX team can come up with something better for the dark theme.

Contributes to issue CURA-4148.
2017-08-30 16:08:42 +02:00
Lipu Fei
0781848af5 Reduce margin size for settings in recommended and custom mode
CURA-4148
2017-08-28 17:35:03 +02:00
Lipu Fei
68a89db863 Move star icon in profile dropdown a little to the left
CURA-4148

The star icon in the profile dropdown box is too much to the right,
which overlaps a little with the dropdown arrow button.
2017-08-28 11:18:26 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons
CURA-4148

Resolve merge conflicts.
2017-08-28 11:13:38 +02:00
Ghostkeeper
0aa1f04b1d
Correct width of monitor icon
Because the overlay is wider this one needs to be just as wide.

Contributes to issue CURA-4148.
2017-08-25 14:56:39 +02:00
Ghostkeeper
3db799c661
Remove unnecessary crap from monitor icon
All the metadata and empty tags and no-op groups and such.

Contributes to issue CURA-4148.
2017-08-25 14:55:13 +02:00