Skip to content

Commit e42e9cc

Browse files
committed
fix(ui): Sass fixes quasarframework#5049
1 parent 84292ec commit e42e9cc

File tree

37 files changed

+108
-98
lines changed

37 files changed

+108
-98
lines changed

ui/dev/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import Quasar from 'quasar'
1010
/************************************************
1111
* Enable either Sass or Stylus -- but NEVER BOTH
1212
************************************************/
13-
// import '../src/css/index.sass'
13+
import '../src/css/index.sass'
1414
// import '../src/css/flex-addon.sass'
1515

16-
import '../src/css/index.styl'
16+
// import '../src/css/index.styl'
1717
// import '../src/css/flex-addon.styl'
1818
/************************************************/
1919

ui/src/components/badge/QBadge.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.q-badge
22
background-color: $primary
33
background-color: var(--q-color-primary)
4-
color: white
4+
color: #fff
55
padding: 2px 6px
66
border-radius: $generic-border-radius
77
font-size: 12px

ui/src/components/banner/QBanner.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.q-banner
22
min-height: 54px
33
padding: 8px 16px
4-
background: white
4+
background: #fff
55

66
&--top-padding
77
padding-top: 14px

ui/src/components/btn/QBtnGroup.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
align-self: stretch
5353
&--glossy
5454
> .q-btn-item
55-
background-image: linear-gradient(to bottom, rgba(white, .3), rgba(white, 0) 50%, rgba(black, .12) 51%, rgba(black, .04)) !important
55+
background-image: linear-gradient(to bottom, rgba(#fff, .3), rgba(#fff, 0) 50%, rgba(#000, .12) 51%, rgba(#000, .04)) !important
5656

5757
&--spread
5858
> .q-btn-group

ui/src/components/card/QCard.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
box-shadow: $shadow-2
33
border-radius: $generic-border-radius
44
vertical-align: top
5-
background: white
5+
background: #fff
66
position: relative
77

88
> div, > img
@@ -32,7 +32,7 @@
3232
border: 1px solid $separator-color
3333

3434
&--dark
35-
color: white
35+
color: #fff
3636
border-color: $separator-dark-color
3737

3838
&__section

ui/src/components/carousel/QCarousel.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
height: 100%
1111

1212
&__control
13-
color: white
13+
color: #fff
1414

1515
&__prev-arrow,
1616
&__next-arrow
@@ -53,7 +53,7 @@
5353
&:hover, &.q-carousel__thumbnail--active
5454
opacity: 1
5555
&.q-carousel__thumbnail--active
56-
border-color: white
56+
border-color: #fff
5757
cursor: default
5858

5959
&.q-carousel--navigation .q-carousel__slide

ui/src/components/checkbox/QCheckbox.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ $checkbox-transition: .22s cubic-bezier(0,0,.2,1) 0ms
2727
padding-right: 4px
2828

2929
&__check
30-
color: white
30+
color: #fff
3131

3232
path
3333
stroke: currentColor
@@ -40,7 +40,7 @@ $checkbox-transition: .22s cubic-bezier(0,0,.2,1) 0ms
4040
height: 0
4141
left: 0
4242
top: 50%
43-
border-color: white
43+
border-color: #fff
4444
border-width: 1px
4545
border-style: solid
4646
transform: translate3d(0, -50%, 0) rotate3d(0, 0, 1, -280deg) scale3d(0, 0, 0)

ui/src/components/color/QColor.sass

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.q-color-picker
22
overflow: hidden
3-
background: white
3+
background: #fff
44
max-width: 350px
55
vertical-align: top
66

@@ -27,13 +27,13 @@
2727

2828
&__header-content
2929
position: relative
30-
background: white
30+
background: #fff
3131

3232
&--light
33-
color: black
33+
color: #000
3434

3535
&--dark
36-
color: white
36+
color: #fff
3737
.q-tab--inactive
3838
&:before
3939
content: ''
@@ -47,7 +47,7 @@
4747
&__header-banner
4848
height: 52px
4949
&__header-bg
50-
background: white
50+
background: #fff
5151
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAH0lEQVQoU2NkYGAwZkAFZ5G5jPRRgOYEVDeB3EBjBQBOZwTVugIGyAAAAABJRU5ErkJggg==') !important
5252

5353
&__footer
@@ -64,15 +64,15 @@
6464
padding: 10px
6565

6666
&__spectrum-white
67-
background: linear-gradient(to right, white, rgba(255, 255, 255, 0))
67+
background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0))
6868

6969
&__spectrum-black
70-
background: linear-gradient(to top, black, rgba(0, 0, 0, 0))
70+
background: linear-gradient(to top, #000, rgba(0, 0, 0, 0))
7171

7272
&__spectrum-circle
7373
width: 10px
7474
height: 10px
75-
box-shadow: 0 0 0 1.5px white, inset 0 0 1px 1px rgba(0, 0, 0, .3), 0 0 1px 2px rgba(0, 0, 0, .4)
75+
box-shadow: 0 0 0 1.5px #fff, inset 0 0 1px 1px rgba(0, 0, 0, .3), 0 0 1px 2px rgba(0, 0, 0, .4)
7676
border-radius: 50%
7777
transform: translate(-5px, -5px)
7878

@@ -81,10 +81,10 @@
8181
opacity: 1
8282

8383
&__alpha .q-slider__track-container
84-
color: white
84+
color: #fff
8585
opacity: 1
8686
height: 8px
87-
background-color: white
87+
background-color: #fff
8888
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAH0lEQVQoU2NkYGAwZkAFZ5G5jPRRgOYEVDeB3EBjBQBOZwTVugIGyAAAAABJRU5ErkJggg==') !important
8989
&:after
9090
content: ''
@@ -161,7 +161,7 @@
161161
&--dark
162162

163163
background: $grey-9
164-
color: white
164+
color: #fff
165165

166166
.q-color-picker__tune-tab input
167167
border: 1px solid rgba(#fff, .3)

ui/src/components/datetime/QDate.sass

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
display: inline-flex
33
box-shadow: $shadow-2
44
border-radius: $generic-border-radius
5-
background: white
5+
background: #fff
66
max-width: 100%
77

88
.q-btn
99
font-weight: normal
1010

1111
&__header
1212
border-top-left-radius: inherit
13-
color: white
13+
color: #fff
1414
background-color: $primary
1515
background-color: var(--q-color-primary)
1616
padding: 16px
@@ -174,5 +174,5 @@
174174
width: 310px
175175

176176
&--dark
177-
color: white
177+
color: #fff
178178
background: $grey-9

ui/src/components/datetime/QTime.sass

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
max-width: 100%
55
box-shadow: $shadow-2
66
border-radius: $generic-border-radius
7-
background: white
7+
background: #fff
88
outline: none
99

1010
&__header
1111
border-top-left-radius: inherit
12-
color: white
12+
color: #fff
1313
background-color: $primary
1414
background-color: var(--q-color-primary)
1515
padding: 16px
@@ -116,7 +116,7 @@
116116
&--active
117117
background-color: $primary
118118
background-color: var(--q-color-primary)
119-
color: white
119+
color: #fff
120120

121121
@for $pos from 0 through 11
122122
$angle: (270 + 30 * $pos)
@@ -139,7 +139,7 @@
139139
&__now-button
140140
background-color: $primary
141141
background-color: var(--q-color-primary)
142-
color: white
142+
color: #fff
143143
top: 12px
144144
right: 12px
145145

@@ -191,5 +191,5 @@
191191
margin-top: 12px
192192

193193
&--dark
194-
color: white
194+
color: #fff
195195
background: $grey-9

0 commit comments

Comments
 (0)