Commit graph

718 commits

Author SHA1 Message Date
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
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
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
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
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