Skip to content

Commit 5bf5a1b

Browse files
committed
feat: Update colors for inputs
1 parent 2d3360d commit 5bf5a1b

File tree

5 files changed

+45
-41
lines changed

5 files changed

+45
-41
lines changed

src/components/color/QColorPicker.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ export default {
254254
h(QBtn, {
255255
props: {
256256
flat: true,
257-
color: 'grey-7',
258257
disable: this.disable
259258
},
260259
on: {

src/components/color/color.ios.styl

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
border 1px solid $grey-4
44
display inline-block
55
width 240px
6-
&.q-color-dark
7-
background $dark
8-
border 1px solid $grey-9
9-
input
10-
background $dark
11-
color $light
6+
background white
127

138
.q-color-saturation
149
width 100%
@@ -81,11 +76,21 @@
8176

8277
.q-color-inputs
8378
font-size 11px
79+
color $grey-7
8480
input
8581
border 1px solid $grey-4
8682
outline 0
8783
.q-color-padding
8884
padding 0 2px
8985
.q-color-label
90-
color $grey-7
9186
padding-top 4px
87+
88+
.q-color-dark
89+
background $dark
90+
border 1px solid $grey-9
91+
input
92+
background $dark
93+
color $light
94+
border 1px solid $light
95+
.q-color-inputs
96+
color $light

src/components/color/color.mat.styl

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
border 1px solid $grey-4
44
display inline-block
55
width 240px
6-
&.q-color-dark
7-
background $dark
8-
border 1px solid $grey-9
9-
input
10-
background $dark
11-
color $light
6+
background white
127

138
.q-color-saturation
149
width 100%
@@ -81,11 +76,21 @@
8176

8277
.q-color-inputs
8378
font-size 11px
79+
color $grey-7
8480
input
8581
border 1px solid $grey-4
8682
outline 0
8783
.q-color-padding
8884
padding 0 2px
8985
.q-color-label
90-
color $grey-7
9186
padding-top 4px
87+
88+
.q-color-dark
89+
background $dark
90+
border 1px solid $grey-9
91+
input
92+
background $dark
93+
color $light
94+
border 1px solid $light
95+
.q-color-inputs
96+
color $light

src/components/datetime/datetime.mat.styl

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@
99
text-align center
1010
user-select none
1111
line-height initial
12-
&.q-datetime-dark
13-
background $dark
1412

1513
.q-datetime-header
1614
background currentColor
1715
> div
1816
color white
19-
.q-datetime-dark &
20-
background $grey-8
2117

2218
.q-datetime-weekdaystring
2319
font-size .8rem
@@ -55,15 +51,10 @@ div + .q-datetime-time
5551
width 250px
5652
height 300px
5753
color black
58-
.q-datetime-dark &
59-
color white
54+
6055
.q-datetime-view-year, .q-datetime-view-month
61-
& > .q-btn:not(.active)
62-
color black
63-
.q-datetime-dark
64-
.q-datetime-view-year, .q-datetime-view-month
65-
& > .q-btn:not(.active)
66-
color white
56+
> .q-btn:not(.active)
57+
color black
6758

6859
.q-datetime-weekdays
6960
font-size .75rem
@@ -97,10 +88,6 @@ div + .q-datetime-time
9788
font-size 105%
9889
&:not(.q-datetime-fillerday):not(.disabled):not(.q-datetime-day-active):hover
9990
background $grey-4
100-
.q-datetime-dark &
101-
color black
102-
.q-datetime-dark .q-datetime-days div.q-datetime-day-active > span
103-
color black
10491

10592
.q-datetime-btn
10693
font-weight normal
@@ -115,8 +102,6 @@ div + .q-datetime-time
115102
border-radius 50%
116103
background $grey-4
117104
padding 24px
118-
.q-datetime-dark &
119-
background $grey-8
120105

121106
.q-datetime-clock-circle
122107
position relative
@@ -158,6 +143,19 @@ div + .q-datetime-time
158143
transform translate(-50%, -50%)
159144
background currentColor
160145

146+
.q-datetime-dark
147+
background $dark
148+
.q-datetime-header, .q-datetime-clock
149+
background $grey-8
150+
.q-datetime-view-day
151+
color white
152+
.q-datetime-view-year, .q-datetime-view-month
153+
> .q-btn:not(.active)
154+
color white
155+
.q-datetime-days div
156+
&:not(.q-datetime-fillerday):not(.disabled):not(.q-datetime-day-active):hover
157+
color black
158+
161159
body.desktop .q-datetime-clock-position:not(.active):hover
162160
background $grey-2 !important
163161
body.desktop .q-datetime-dark .q-datetime-clock-position:not(.active):hover

src/components/input-frame/input-frame.mat.styl

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@
8080
margin-left 0
8181
margin-right 4px
8282

83-
.q-if-dark
84-
&:before, .q-if-label, .q-if-control
85-
color rgba(255, 255, 255, .7)
86-
&:hover:before, .q-if-addon
87-
color rgba(255, 255, 255, .9)
88-
8983
.q-if-focused
9084
&:after
9185
width 100%
@@ -99,9 +93,12 @@
9993
padding-left 8px
10094
padding-right 8px
10195
box-shadow $shadow-1
96+
10297
.q-if-dark
103-
.q-if-control
104-
color white
98+
&:before, .q-if-label, .q-if-control
99+
color rgba(255, 255, 255, .7)
100+
&:hover:before, .q-if-addon
101+
color rgba(255, 255, 255, .9)
105102

106103
.q-if-error
107104
&:before, &:after, &:not(.q-if-inverted) .q-if-label, .q-if-addon

0 commit comments

Comments
 (0)