@qooxdoo/framework 7.6.1 → 7.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Manifest.json +1 -1
- package/bin/tools/utils.js +1 -0
- package/lib/compiler/compile-info.json +49 -49
- package/lib/compiler/index.js +186 -186
- package/lib/resource/qx/tool/cli/templates/skeleton/mobile/source/theme/custom/css/custom.css +1 -1
- package/lib/resource/qx/tool/cli/templates/skeleton/mobile/source/theme/custom/css/custom.css.map +1 -1
- package/package.json +2 -2
- package/source/resource/qx/mobile/scss/common/_scroller.scss +6 -6
- package/source/resource/qx/mobile/scss/theme/flat/_styles.scss +55 -55
- package/source/resource/qx/mobile/scss/theme/indigo/_styles.scss +55 -55
- package/source/resource/qx/mobile/scss/ui/_button.scss +8 -8
- package/source/resource/qx/mobile/scss/ui/_carousel.scss +2 -2
- package/source/resource/qx/mobile/scss/ui/_checkbox.scss +2 -2
- package/source/resource/qx/mobile/scss/ui/_collapsible.scss +7 -7
- package/source/resource/qx/mobile/scss/ui/_drawer.scss +6 -6
- package/source/resource/qx/mobile/scss/ui/_form.scss +35 -35
- package/source/resource/qx/mobile/scss/ui/_input.scss +7 -7
- package/source/resource/qx/mobile/scss/ui/_list.scss +8 -8
- package/source/resource/qx/mobile/scss/ui/_main.scss +8 -8
- package/source/resource/qx/mobile/scss/ui/_masterdetail.scss +5 -5
- package/source/resource/qx/mobile/scss/ui/_menu.scss +2 -2
- package/source/resource/qx/mobile/scss/ui/_navigationbar.scss +11 -11
- package/source/resource/qx/mobile/scss/ui/_picker.scss +8 -8
- package/source/resource/qx/mobile/scss/ui/_popup.scss +14 -14
- package/source/resource/qx/mobile/scss/ui/_radiobutton.scss +3 -3
- package/source/resource/qx/mobile/scss/ui/_selectbox.scss +3 -3
- package/source/resource/qx/mobile/scss/ui/_slider.scss +7 -7
- package/source/resource/qx/mobile/scss/ui/_tabbar.scss +4 -4
- package/source/resource/qx/mobile/scss/ui/_togglebutton.scss +9 -9
- package/source/resource/qx/mobile/scss/ui/_toolbar.scss +5 -5
- package/source/resource/qx/scss/_mixins.scss +27 -0
- package/source/resource/qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/_styles.scss +55 -55
- package/source/resource/qx/website/scss/ui/_button.scss +10 -10
- package/source/resource/qx/website/scss/ui/_calendar.scss +5 -5
- package/source/resource/qx/website/scss/ui/_carousel.scss +5 -5
- package/source/resource/qx/website/scss/ui/_datepicker.scss +5 -5
- package/source/resource/qx/website/scss/ui/_menu.scss +4 -4
- package/source/resource/qx/website/scss/ui/_rating.scss +6 -6
- package/source/resource/qx/website/scss/ui/_slider.scss +11 -11
- package/source/resource/qx/website/scss/ui/_tabs.scss +22 -22
- package/source/resource/qx/website/scss/ui/_toolbar.scss +14 -14
|
@@ -11,10 +11,10 @@
|
|
|
11
11
|
overflow: visible;
|
|
12
12
|
|
|
13
13
|
margin-bottom: $slider-knob-height;
|
|
14
|
-
margin-left: ($slider-knob-width*0.5);
|
|
14
|
+
margin-left: ($slider-knob-width*0.5);
|
|
15
15
|
margin-right: ($slider-knob-width*0.5);
|
|
16
16
|
|
|
17
|
-
border: rem(1) solid $slider-border-color;
|
|
17
|
+
border: px-to-rem(1) solid $slider-border-color;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
// Extended touch area
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
// Knob
|
|
44
|
-
.slider > div:after {
|
|
44
|
+
.slider > div:after {
|
|
45
45
|
@include border-radius($slider-knob-border-radius);
|
|
46
|
-
@include box-shadow(0 0 rem(3) $slider-shadow);
|
|
46
|
+
@include box-shadow(0 0 px-to-rem(3) $slider-shadow);
|
|
47
47
|
@include background($slider-knob-background);
|
|
48
48
|
@include pointer-none();
|
|
49
49
|
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
text-align: center;
|
|
53
53
|
content: "";
|
|
54
54
|
|
|
55
|
-
border: rem(1) solid $slider-knob-border-color;
|
|
55
|
+
border: px-to-rem(1) solid $slider-knob-border-color;
|
|
56
56
|
|
|
57
57
|
height: $slider-knob-height;
|
|
58
58
|
width: $slider-knob-width;
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
text-overflow: ellipsis;
|
|
63
63
|
font-weight:normal;
|
|
64
64
|
|
|
65
|
-
top: -($slider-knob-height*0.5) + ($slider-height*0.5) - rem(1);
|
|
65
|
+
top: -($slider-knob-height*0.5) + ($slider-height*0.5) - px-to-rem(1);
|
|
66
66
|
right: -1*$slider-knob-width*0.5;
|
|
67
67
|
}
|
|
68
68
|
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
// Fix for IE [BUG #7814]
|
|
78
|
-
.root.win .slider > div:after {
|
|
78
|
+
.root.win .slider > div:after {
|
|
79
79
|
line-height: calc(unquote("#{$slider-knob-height} - 0px"));
|
|
80
80
|
}
|
|
81
81
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
//
|
|
2
|
-
// TABBAR
|
|
2
|
+
// TABBAR
|
|
3
3
|
//
|
|
4
4
|
.tabBar {
|
|
5
5
|
padding-top: $tabbar-button-distance;
|
|
6
6
|
padding-left: $tabbar-button-distance;
|
|
7
7
|
padding-right: $tabbar-button-distance;
|
|
8
|
-
border-bottom: rem(3) solid $tabbar-divider-color;
|
|
8
|
+
border-bottom: px-to-rem(3) solid $tabbar-divider-color;
|
|
9
9
|
min-height: $tabbar-height;
|
|
10
10
|
}
|
|
11
11
|
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
|
|
28
28
|
text-align: center;
|
|
29
29
|
|
|
30
|
-
$tab-button-border: rem(1) solid $tabbar-inactive-border-color;
|
|
30
|
+
$tab-button-border: px-to-rem(1) solid $tabbar-inactive-border-color;
|
|
31
31
|
border-top: $tab-button-border;
|
|
32
32
|
border-left: $tab-button-border;
|
|
33
33
|
border-right: $tab-button-border;
|
|
@@ -39,6 +39,6 @@
|
|
|
39
39
|
|
|
40
40
|
.tabButton.active, .tabButton.selected {
|
|
41
41
|
@include background($tabbar-active-background);
|
|
42
|
-
border: rem(1) solid $tabbar-active-border-color;
|
|
42
|
+
border: px-to-rem(1) solid $tabbar-active-border-color;
|
|
43
43
|
border-bottom: 0px solid transparent;
|
|
44
44
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
//
|
|
2
|
-
// TOGGLEBUTTON
|
|
2
|
+
// TOGGLEBUTTON
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
$togglebutton-label-padding: rem(3);
|
|
5
|
+
$togglebutton-label-padding: px-to-rem(3);
|
|
6
6
|
|
|
7
7
|
.togglebutton {
|
|
8
|
-
@include box-inset-shadow(0px rem(3) rem(2) $togglebutton-inset-shadow);
|
|
8
|
+
@include box-inset-shadow(0px px-to-rem(3) px-to-rem(2) $togglebutton-inset-shadow);
|
|
9
9
|
@include border-radius($togglebutton-border-radius);
|
|
10
10
|
@include background($togglebutton-background);
|
|
11
11
|
|
|
@@ -21,7 +21,7 @@ $togglebutton-label-padding: rem(3);
|
|
|
21
21
|
height: $togglebutton-height;
|
|
22
22
|
line-height: $togglebutton-height;
|
|
23
23
|
|
|
24
|
-
border: rem(1) solid $togglebutton-border-color;
|
|
24
|
+
border: px-to-rem(1) solid $togglebutton-border-color;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
.togglebutton:before {
|
|
@@ -52,20 +52,20 @@ $togglebutton-label-padding: rem(3);
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
.togglebutton.checked {
|
|
55
|
-
@include box-inset-shadow(0px rem(3) rem(2) $togglebutton-inset-shadow);
|
|
55
|
+
@include box-inset-shadow(0px px-to-rem(3) px-to-rem(2) $togglebutton-inset-shadow);
|
|
56
56
|
@include background($togglebutton-active-background);
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
.togglebutton.checked .togglebutton-switch {
|
|
60
|
-
@include box-shadow(rem(-2) 0px rem(2) $togglebutton-knob-shadow);
|
|
60
|
+
@include box-shadow(px-to-rem(-2) 0px px-to-rem(2) $togglebutton-knob-shadow);
|
|
61
61
|
right: 0px;
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
.togglebutton-switch {
|
|
65
|
-
@include border-radius($togglebutton-border-radius - rem(1));
|
|
66
|
-
@include box-shadow(rem(2) 0 rem(2) $togglebutton-knob-shadow);
|
|
65
|
+
@include border-radius($togglebutton-border-radius - px-to-rem(1));
|
|
66
|
+
@include box-shadow(px-to-rem(2) 0 px-to-rem(2) $togglebutton-knob-shadow);
|
|
67
67
|
@include background($togglebutton-knob-background);
|
|
68
|
-
|
|
68
|
+
|
|
69
69
|
display: block;
|
|
70
70
|
position: absolute;
|
|
71
71
|
z-index: 1;
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
overflow: hidden;
|
|
13
13
|
|
|
14
14
|
color: $toolbar-text-color;
|
|
15
|
-
border: rem(1) solid $toolbar-border-color;
|
|
15
|
+
border: px-to-rem(1) solid $toolbar-border-color;
|
|
16
16
|
|
|
17
17
|
cursor: pointer;
|
|
18
18
|
font-weight: $toolbar-font-weight;
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
.toolbar-separator {
|
|
34
|
-
width: rem(4);
|
|
34
|
+
width: px-to-rem(4);
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
.toolbar {
|
|
@@ -39,9 +39,9 @@
|
|
|
39
39
|
|
|
40
40
|
z-index: 1;
|
|
41
41
|
padding: $toolbar-padding;
|
|
42
|
-
height: rem(50);
|
|
42
|
+
height: px-to-rem(50);
|
|
43
43
|
|
|
44
|
-
height: -moz-calc(rem(50) + $toolbar-padding);
|
|
44
|
+
height: -moz-calc(px-to-rem(50) + $toolbar-padding);
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
.toolbar-button img {
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
|
|
55
55
|
.toolbar-button .label {
|
|
56
56
|
height: auto;
|
|
57
|
-
padding-top:rem(2);
|
|
57
|
+
padding-top:px-to-rem(2);
|
|
58
58
|
text-align:center;
|
|
59
59
|
// For displaying ellipsis correctly.
|
|
60
60
|
max-width:100%;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
@use "sass:math";
|
|
2
2
|
|
|
3
|
+
/// @deprecated Please use `px-to-rem()` instead.
|
|
3
4
|
@function rem($value, $factor: 1.0) {
|
|
4
5
|
@if ($value != 0 and $value != auto) {
|
|
5
6
|
@if (unitless($value)) {
|
|
@@ -16,6 +17,32 @@
|
|
|
16
17
|
@return $value;
|
|
17
18
|
}
|
|
18
19
|
|
|
20
|
+
/// Think in pixels; style with rems.
|
|
21
|
+
///
|
|
22
|
+
/// Converts pixel units & unitless numbers to rems.
|
|
23
|
+
///
|
|
24
|
+
/// @param {number} $value - The value to convert. May be a number or a pixel
|
|
25
|
+
/// unit
|
|
26
|
+
/// @param {number} [$factor=1] - The factor to multiply the value with. Most
|
|
27
|
+
/// use cases will not set this.
|
|
28
|
+
///
|
|
29
|
+
/// @return {length} The converted value in rems
|
|
30
|
+
@function px-to-rem($value, $factor: 1.0) {
|
|
31
|
+
@if ($value != 0 and $value != auto) {
|
|
32
|
+
@if (unitless($value)) {
|
|
33
|
+
$value: $value * 1px;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
@if (unit($factor) == "%") {
|
|
37
|
+
$factor: math.div($factor, $factor * 0 + 1) * 0.01;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
$value: $factor*math.div($value, 16px) * 1rem;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
@return $value;
|
|
44
|
+
}
|
|
45
|
+
|
|
19
46
|
@mixin background-clip($args) {
|
|
20
47
|
-webkit-background-clip: $args;
|
|
21
48
|
-moz-background-clip: $args;
|
package/source/resource/qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/_styles.scss
CHANGED
|
@@ -15,7 +15,7 @@ $color-2: mix($foreground-color, $background-color, 70%);
|
|
|
15
15
|
$color-3: mix($foreground-color, $background-color, 50%);
|
|
16
16
|
$color-4: mix($foreground-color, $background-color, 30%);
|
|
17
17
|
$color-5: mix($foreground-color, $background-color, 10%);
|
|
18
|
-
|
|
18
|
+
|
|
19
19
|
// Application
|
|
20
20
|
|
|
21
21
|
$application-font: "Segoe UI","Slate Pro",sans-serif,Helvetica;
|
|
@@ -24,10 +24,10 @@ $application-text-color: $foreground-color;
|
|
|
24
24
|
// Button
|
|
25
25
|
|
|
26
26
|
$button-text-color: $color-1;
|
|
27
|
-
$button-font-size: rem(15);
|
|
27
|
+
$button-font-size: px-to-rem(15);
|
|
28
28
|
$button-font-weight: bold;
|
|
29
29
|
$button-active-text-color: $background-color;
|
|
30
|
-
$button-border-radius: rem(4);
|
|
30
|
+
$button-border-radius: px-to-rem(4);
|
|
31
31
|
$button-border-color: $color-2;
|
|
32
32
|
$button-active-border-color: $color-2;
|
|
33
33
|
$button-background: $background-color,$color-4;
|
|
@@ -35,40 +35,40 @@ $button-active-background: lighten($highlight-color,20%),$highlight-color;
|
|
|
35
35
|
|
|
36
36
|
// Carousel
|
|
37
37
|
|
|
38
|
-
$carousel-pagination-size: rem(10);
|
|
38
|
+
$carousel-pagination-size: px-to-rem(10);
|
|
39
39
|
$carousel-pagination-background: rgba($background-color,0.6);
|
|
40
40
|
$carousel-pagination-border-color: rgba($background-color,0.6);
|
|
41
41
|
$carousel-pagination-active-background: $highlight-color;
|
|
42
42
|
$carousel-pagination-active-border-color: $background-color;
|
|
43
43
|
$carousel-pagination-border-radius: $carousel-pagination-size;
|
|
44
|
-
$carousel-pagination-font-size: rem(1);
|
|
44
|
+
$carousel-pagination-font-size: px-to-rem(1);
|
|
45
45
|
$carousel-pagination-font-color: rgba(0,0,0,0);
|
|
46
46
|
|
|
47
47
|
// Checkbox
|
|
48
48
|
|
|
49
|
-
$checkbox-size: rem(30);
|
|
49
|
+
$checkbox-size: px-to-rem(30);
|
|
50
50
|
$checkbox-tick-color: $highlight-color;
|
|
51
|
-
$checkbox-tick-size: rem(14);
|
|
52
|
-
$checkbox-tick-width: rem(4);
|
|
51
|
+
$checkbox-tick-size: px-to-rem(14);
|
|
52
|
+
$checkbox-tick-width: px-to-rem(4);
|
|
53
53
|
$checkbox-tick-shadow: rgba(0,0,0,0.3);
|
|
54
|
-
$checkbox-border-radius: rem(4);
|
|
54
|
+
$checkbox-border-radius: px-to-rem(4);
|
|
55
55
|
$checkbox-border-color: $color-2;
|
|
56
56
|
$checkbox-background: $color-4,$background-color;
|
|
57
57
|
|
|
58
58
|
// Collapsible
|
|
59
59
|
|
|
60
|
-
$collapsible-border-radius: rem(4);
|
|
60
|
+
$collapsible-border-radius: px-to-rem(4);
|
|
61
61
|
$collapsible-header-border-color: $color-2;
|
|
62
62
|
$collapsible-header-text-color: $color-1;
|
|
63
63
|
$collapsible-header-active-text-color: $background-color;
|
|
64
64
|
$collapsible-header-background: $background-color, $color-4;
|
|
65
65
|
$collapsible-header-active-background: lighten($highlight-color,20%),$highlight-color;
|
|
66
|
-
$collapsible-header-padding: rem(10);
|
|
67
|
-
$collapsible-header-content-distance: rem(10);
|
|
66
|
+
$collapsible-header-padding: px-to-rem(10);
|
|
67
|
+
$collapsible-header-content-distance: px-to-rem(10);
|
|
68
68
|
$collapsible-content-border-color: $color-4;
|
|
69
|
-
$collapsible-content-padding: rem(10);
|
|
69
|
+
$collapsible-content-padding: px-to-rem(10);
|
|
70
70
|
$collapsible-content-background-color: $background-color;
|
|
71
|
-
$collapsible-arrow-size: rem(8);
|
|
71
|
+
$collapsible-arrow-size: px-to-rem(8);
|
|
72
72
|
$collapsible-arrow-color: $color-1;
|
|
73
73
|
$collapsible-active-arrow-color: $background-color;
|
|
74
74
|
|
|
@@ -84,9 +84,9 @@ $dialog-border-color: $highlight-color;
|
|
|
84
84
|
$dialog-background: $color-2,$color-1 50%,$color-1;
|
|
85
85
|
$dialog-arrow-up-color: $color-2;
|
|
86
86
|
$dialog-arrow-down-color: $color-1;
|
|
87
|
-
$dialog-arrow-size: rem(12);
|
|
88
|
-
$dialog-arrow-position-offset: rem(16);
|
|
89
|
-
$dialog-border-radius: rem(4);
|
|
87
|
+
$dialog-arrow-size: px-to-rem(12);
|
|
88
|
+
$dialog-arrow-position-offset: px-to-rem(16);
|
|
89
|
+
$dialog-border-radius: px-to-rem(4);
|
|
90
90
|
$dialog-title-text-color: $background-color;
|
|
91
91
|
$dialog-font-weight: bold;
|
|
92
92
|
|
|
@@ -96,7 +96,7 @@ $form-background: $background-color;
|
|
|
96
96
|
$form-title-text-color: $highlight-color;
|
|
97
97
|
$form-label-text-color: $color-1;
|
|
98
98
|
$form-border-color: $color-4;
|
|
99
|
-
$form-border-radius: rem(4);
|
|
99
|
+
$form-border-radius: px-to-rem(4);
|
|
100
100
|
$form-font-weight: bold;
|
|
101
101
|
|
|
102
102
|
// Group
|
|
@@ -104,13 +104,13 @@ $form-font-weight: bold;
|
|
|
104
104
|
$group-background: $background-color;
|
|
105
105
|
$group-border-color: $color-4;
|
|
106
106
|
$group-title-text-color: $highlight-color;
|
|
107
|
-
$group-border-radius: rem(4);
|
|
107
|
+
$group-border-radius: px-to-rem(4);
|
|
108
108
|
|
|
109
109
|
// Input
|
|
110
110
|
|
|
111
111
|
$input-text-color: $color-1;
|
|
112
112
|
$input-background: $background-color;
|
|
113
|
-
$input-border-radius: rem(4);
|
|
113
|
+
$input-border-radius: px-to-rem(4);
|
|
114
114
|
$input-border-color: $color-4;
|
|
115
115
|
$input-invalid-border-color: red;
|
|
116
116
|
$input-active-border-color: $highlight-color;
|
|
@@ -119,22 +119,22 @@ $input-active-border-color: $highlight-color;
|
|
|
119
119
|
|
|
120
120
|
$list-background: $background-color;
|
|
121
121
|
$list-title-text-color: $color-1;
|
|
122
|
-
$list-title-font-size: rem(17);
|
|
122
|
+
$list-title-font-size: px-to-rem(17);
|
|
123
123
|
$list-title-font-weight: bold;
|
|
124
124
|
$list-subtitle-text-color: $highlight-color;
|
|
125
|
-
$list-subtitle-font-size: rem(14);
|
|
125
|
+
$list-subtitle-font-size: px-to-rem(14);
|
|
126
126
|
$list-border-color: $color-4;
|
|
127
127
|
$list-active-background: lighten($highlight-color,20%),$highlight-color;
|
|
128
128
|
$list-active-text-color: $background-color;
|
|
129
|
-
$list-border-radius: rem(4);
|
|
130
|
-
$list-arrow-size: rem(3);
|
|
131
|
-
$list-arrow-thickness: rem(2);
|
|
129
|
+
$list-border-radius: px-to-rem(4);
|
|
130
|
+
$list-arrow-size: px-to-rem(3);
|
|
131
|
+
$list-arrow-thickness: px-to-rem(2);
|
|
132
132
|
$list-arrow-color: $color-1;
|
|
133
133
|
$list-active-arrow-color: $background-color;
|
|
134
|
-
$list-group-header-height: rem(30);
|
|
134
|
+
$list-group-header-height: px-to-rem(30);
|
|
135
135
|
$list-group-header-color: $color-3;
|
|
136
136
|
$list-group-header-background: $background-color;
|
|
137
|
-
$list-group-header-font: normal rem(16) sans-serif;
|
|
137
|
+
$list-group-header-font: normal px-to-rem(16) sans-serif;
|
|
138
138
|
|
|
139
139
|
// Menu
|
|
140
140
|
|
|
@@ -143,16 +143,16 @@ $menu-item-selected-background: lighten($highlight-color, 20%), $highlight-colo
|
|
|
143
143
|
|
|
144
144
|
// NavigationBar
|
|
145
145
|
|
|
146
|
-
$navigationbar-height: rem(40);
|
|
146
|
+
$navigationbar-height: px-to-rem(40);
|
|
147
147
|
$navigationbar-background: $color-2,$color-1;
|
|
148
148
|
$navigationbar-text-size: $navigationbar-height*0.5;
|
|
149
149
|
$navigationbar-text-color: $background-color;
|
|
150
|
-
$navigationbar-padding: rem(4);
|
|
150
|
+
$navigationbar-padding: px-to-rem(4);
|
|
151
151
|
$navigationbar-font-weight: bold;
|
|
152
152
|
|
|
153
153
|
// NavigationBar Button
|
|
154
154
|
|
|
155
|
-
$navigationbarbutton-border-radius: rem(4);
|
|
155
|
+
$navigationbarbutton-border-radius: px-to-rem(4);
|
|
156
156
|
$navigationbarbutton-background: $background-color,$color-4;
|
|
157
157
|
$navigationbarbutton-border-color: $color-2;
|
|
158
158
|
$navigationbarbutton-text-color: $color-1;
|
|
@@ -172,20 +172,20 @@ $picker-spinning-wheel-overlay: rgba($background-color,1),rgba($background-colo
|
|
|
172
172
|
$picker-spinning-wheel-text-color: $color-1;
|
|
173
173
|
$picker-spinning-wheel-background: $background-color;
|
|
174
174
|
$picker-highlight-color: rgba($highlight-color,0.5);
|
|
175
|
-
$picker-highlight-border-width: rem(2);
|
|
175
|
+
$picker-highlight-border-width: px-to-rem(2);
|
|
176
176
|
$picker-spinning-wheel-divider-color: $color-2;
|
|
177
|
-
$picker-spinning-wheel-divider-width: rem(2);
|
|
177
|
+
$picker-spinning-wheel-divider-width: px-to-rem(2);
|
|
178
178
|
|
|
179
179
|
// Deprecated in 4.1
|
|
180
|
-
$picker-spinning-wheel-border-radius: rem(2);
|
|
181
|
-
$picker-label-height: rem(25);
|
|
182
|
-
$picker-label-font-size: rem(16);
|
|
183
|
-
$picker-height: rem(160);
|
|
180
|
+
$picker-spinning-wheel-border-radius: px-to-rem(2);
|
|
181
|
+
$picker-label-height: px-to-rem(25);
|
|
182
|
+
$picker-label-font-size: px-to-rem(16);
|
|
183
|
+
$picker-height: px-to-rem(160);
|
|
184
184
|
// -----------------
|
|
185
185
|
|
|
186
186
|
// RadioButton
|
|
187
187
|
|
|
188
|
-
$radiobutton-size: rem(32);
|
|
188
|
+
$radiobutton-size: px-to-rem(32);
|
|
189
189
|
$radiobutton-dot-color: $highlight-color;
|
|
190
190
|
$radiobutton-dot-shadow: rgba(0,0,0,0.3);
|
|
191
191
|
$radiobutton-background: $color-4,$background-color;
|
|
@@ -193,7 +193,7 @@ $radiobutton-border-color: $color-2;
|
|
|
193
193
|
|
|
194
194
|
// SelectBox
|
|
195
195
|
|
|
196
|
-
$selectbox-border-radius: rem(4);
|
|
196
|
+
$selectbox-border-radius: px-to-rem(4);
|
|
197
197
|
$selectbox-border-color: $color-2;
|
|
198
198
|
$selectbox-text-color: $color-1;
|
|
199
199
|
$selectbox-background: $background-color,$color-4;
|
|
@@ -204,14 +204,14 @@ $selectbox-item-selected-background: lighten($highlight-color,20%), $highlight-
|
|
|
204
204
|
|
|
205
205
|
// Slider
|
|
206
206
|
|
|
207
|
-
$slider-height: rem(7);
|
|
207
|
+
$slider-height: px-to-rem(7);
|
|
208
208
|
$slider-background: $color-4,$background-color;
|
|
209
209
|
$slider-active-area: lighten($highlight-color,20%),$highlight-color;
|
|
210
|
-
$slider-border-radius: rem(20);
|
|
210
|
+
$slider-border-radius: px-to-rem(20);
|
|
211
211
|
$slider-border-color: $color-2;
|
|
212
|
-
$slider-knob-border-radius: rem(4);
|
|
213
|
-
$slider-knob-width: rem(30);
|
|
214
|
-
$slider-knob-height: rem(30);
|
|
212
|
+
$slider-knob-border-radius: px-to-rem(4);
|
|
213
|
+
$slider-knob-width: px-to-rem(30);
|
|
214
|
+
$slider-knob-height: px-to-rem(30);
|
|
215
215
|
$slider-knob-background: $background-color,$color-4;
|
|
216
216
|
$slider-knob-border-color: $color-2;
|
|
217
217
|
$slider-shadow: rgba(0,0,0,0.4);
|
|
@@ -219,13 +219,13 @@ $slider-font-color: $color-2;
|
|
|
219
219
|
|
|
220
220
|
// Spinner
|
|
221
221
|
|
|
222
|
-
$spinner-border-thickness: rem(3);
|
|
222
|
+
$spinner-border-thickness: px-to-rem(3);
|
|
223
223
|
$spinner-border-color: white;
|
|
224
|
-
$spinner-size: rem(14);
|
|
224
|
+
$spinner-size: px-to-rem(14);
|
|
225
225
|
|
|
226
226
|
// Tabbar
|
|
227
227
|
|
|
228
|
-
$tabbar-height: rem(45);
|
|
228
|
+
$tabbar-height: px-to-rem(45);
|
|
229
229
|
$tabbar-divider-color: $highlight-color;
|
|
230
230
|
$tabbar-active-background: lighten($highlight-color,20%),$highlight-color;
|
|
231
231
|
$tabbar-active-border-color: $highlight-color;
|
|
@@ -233,24 +233,24 @@ $tabbar-inactive-background: $color-3,$color-2;
|
|
|
233
233
|
$tabbar-inactive-border-color: $color-3;
|
|
234
234
|
$tabbar-active-text-color: $background-color;
|
|
235
235
|
$tabbar-inactive-text-color: $background-color;
|
|
236
|
-
$tabbar-border-radius: rem(4);
|
|
237
|
-
$tabbar-button-distance: rem(4);
|
|
236
|
+
$tabbar-border-radius: px-to-rem(4);
|
|
237
|
+
$tabbar-button-distance: px-to-rem(4);
|
|
238
238
|
|
|
239
239
|
// ToggleButton
|
|
240
240
|
|
|
241
|
-
$togglebutton-width: rem(100);
|
|
242
|
-
$togglebutton-height: rem(30);
|
|
243
|
-
$togglebutton-border-radius: rem(4);
|
|
241
|
+
$togglebutton-width: px-to-rem(100);
|
|
242
|
+
$togglebutton-height: px-to-rem(30);
|
|
243
|
+
$togglebutton-border-radius: px-to-rem(4);
|
|
244
244
|
$togglebutton-border-color: $color-2;
|
|
245
245
|
$togglebutton-text-color: $color-1;
|
|
246
246
|
$togglebutton-background: $color-5,$background-color;
|
|
247
247
|
$togglebutton-active-background: $highlight-color,lighten($highlight-color,20%);
|
|
248
248
|
$togglebutton-knob-background: $background-color,$color-4;
|
|
249
|
-
$togglebutton-knob-width: rem(30);
|
|
249
|
+
$togglebutton-knob-width: px-to-rem(30);
|
|
250
250
|
$togglebutton-active-text-color: $background-color;
|
|
251
251
|
$togglebutton-inset-shadow: rgba(0,0,0,0.1);
|
|
252
252
|
$togglebutton-knob-shadow: rgba(0,0,0,0.4);
|
|
253
|
-
$togglebutton-font-size: rem(13);
|
|
253
|
+
$togglebutton-font-size: px-to-rem(13);
|
|
254
254
|
$togglebutton-font-weight: bold;
|
|
255
255
|
|
|
256
256
|
// Toolbar
|
|
@@ -260,6 +260,6 @@ $toolbar-background: $background-color,$color-4;
|
|
|
260
260
|
$toolbar-active-background: lighten($highlight-color,20%),$highlight-color;
|
|
261
261
|
$toolbar-active-text-color: $background-color;
|
|
262
262
|
$toolbar-border-color: $color-2;
|
|
263
|
-
$toolbar-border-radius: rem(4);
|
|
263
|
+
$toolbar-border-radius: px-to-rem(4);
|
|
264
264
|
$toolbar-font-weight: bold;
|
|
265
|
-
$toolbar-padding: rem(5);
|
|
265
|
+
$toolbar-padding: px-to-rem(5);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
.qx-button[disabled] {
|
|
2
|
-
border: rem(1) solid $border-color;
|
|
2
|
+
border: px-to-rem(1) solid $border-color;
|
|
3
3
|
color: $highlight-color-disabled;
|
|
4
4
|
}
|
|
5
5
|
|
|
@@ -9,26 +9,26 @@
|
|
|
9
9
|
|
|
10
10
|
.qx-button {
|
|
11
11
|
display: inline-block;
|
|
12
|
-
padding: rem(8) rem(12);
|
|
13
|
-
margin: rem(3);
|
|
14
|
-
border: rem(1) solid $border-color;
|
|
12
|
+
padding: px-to-rem(8) px-to-rem(12);
|
|
13
|
+
margin: px-to-rem(3);
|
|
14
|
+
border: px-to-rem(1) solid $border-color;
|
|
15
15
|
@include background-clip(padding-box);
|
|
16
|
-
@include border-radius(rem(2));
|
|
16
|
+
@include border-radius(px-to-rem(2));
|
|
17
17
|
cursor: pointer;
|
|
18
|
-
font-size: rem(14);
|
|
18
|
+
font-size: px-to-rem(14);
|
|
19
19
|
outline: none;
|
|
20
20
|
background: $background-color;
|
|
21
21
|
color: $highlight-color;
|
|
22
22
|
line-height: normal;
|
|
23
|
-
min-height: rem(35);
|
|
23
|
+
min-height: px-to-rem(35);
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
.qx-button:hover {
|
|
27
|
-
border: rem(1) solid $highlight-color;
|
|
27
|
+
border: px-to-rem(1) solid $highlight-color;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
.qx-button:active {
|
|
31
|
-
border: rem(1) solid darken($highlight-color, 20%);
|
|
31
|
+
border: px-to-rem(1) solid darken($highlight-color, 20%);
|
|
32
32
|
background: darken($background-color, 10%);
|
|
33
33
|
}
|
|
34
34
|
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
.qx-button img {
|
|
40
|
-
margin-left: rem(3);
|
|
40
|
+
margin-left: px-to-rem(3);
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
.qx-button img,span {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
.qx-calendar table {
|
|
2
|
-
border-width: rem(1);
|
|
2
|
+
border-width: px-to-rem(1);
|
|
3
3
|
border-color: $border-color;
|
|
4
4
|
border-collapse: collapse;
|
|
5
5
|
text-align: center;
|
|
@@ -11,12 +11,12 @@
|
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
.qx-calendar button:focus {
|
|
14
|
-
-webkit-text-stroke: rem(1) $highlight-color;
|
|
14
|
+
-webkit-text-stroke: px-to-rem(1) $highlight-color;
|
|
15
15
|
color: $highlight-color;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
.qx-calendar thead {
|
|
19
|
-
border-width: rem(1);
|
|
19
|
+
border-width: px-to-rem(1);
|
|
20
20
|
border-style: solid;
|
|
21
21
|
border-color: $border-color;
|
|
22
22
|
font-weight: bold;
|
|
@@ -31,12 +31,12 @@
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
.qx-calendar thead td {
|
|
34
|
-
padding: rem(2) rem(6);
|
|
34
|
+
padding: px-to-rem(2) px-to-rem(6);
|
|
35
35
|
width: 14.3%;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
.qx-calendar td {
|
|
39
|
-
border-width: rem(1);
|
|
39
|
+
border-width: px-to-rem(1);
|
|
40
40
|
border-style: solid;
|
|
41
41
|
border-color: $border-color;
|
|
42
42
|
background-color: $background-color;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
$carousel-pagination-size: rem(17);
|
|
1
|
+
$carousel-pagination-size: px-to-rem(17);
|
|
2
2
|
$carousel-pagination-background: rgba($background-color,0.6);
|
|
3
3
|
$carousel-pagination-background-disabled: desaturate($highlight-color, 100%);
|
|
4
4
|
$carousel-pagination-border-color: rgba($background-color,0.6);
|
|
5
5
|
$carousel-pagination-active-background: $highlight-color;
|
|
6
6
|
$carousel-pagination-active-border-color: $background-color;
|
|
7
7
|
$carousel-pagination-border-radius: $carousel-pagination-size;
|
|
8
|
-
$carousel-pagination-font-size: rem(1);
|
|
8
|
+
$carousel-pagination-font-size: px-to-rem(1);
|
|
9
9
|
|
|
10
10
|
.qx-carousel {
|
|
11
11
|
overflow: hidden;
|
|
@@ -33,7 +33,7 @@ $carousel-pagination-font-size: rem(1);
|
|
|
33
33
|
transition: transform 2s;
|
|
34
34
|
|
|
35
35
|
position: relative;
|
|
36
|
-
margin-top: -$carousel-pagination-size - rem(10);
|
|
36
|
+
margin-top: -$carousel-pagination-size - px-to-rem(10);
|
|
37
37
|
padding-bottom: $carousel-pagination-size*0.5;
|
|
38
38
|
width: 100%;
|
|
39
39
|
white-space: nowrap;
|
|
@@ -50,7 +50,7 @@ $carousel-pagination-font-size: rem(1);
|
|
|
50
50
|
@include box-sizing(border-box);
|
|
51
51
|
@include flex(0 0);
|
|
52
52
|
|
|
53
|
-
border: rem(1) solid $carousel-pagination-border-color;
|
|
53
|
+
border: px-to-rem(1) solid $carousel-pagination-border-color;
|
|
54
54
|
text-align: center;
|
|
55
55
|
|
|
56
56
|
display:inline-block;
|
|
@@ -72,6 +72,6 @@ $carousel-pagination-font-size: rem(1);
|
|
|
72
72
|
|
|
73
73
|
.qx-carousel-pagination-label.active {
|
|
74
74
|
@include background($carousel-pagination-active-background);
|
|
75
|
-
border: rem(1) solid $carousel-pagination-active-border-color;
|
|
75
|
+
border: px-to-rem(1) solid $carousel-pagination-active-border-color;
|
|
76
76
|
color: $carousel-pagination-active-background;
|
|
77
77
|
}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
.qx-datepicker {
|
|
2
|
-
font-size: rem(14);
|
|
3
|
-
height: rem(16);
|
|
2
|
+
font-size: px-to-rem(14);
|
|
3
|
+
height: px-to-rem(16);
|
|
4
4
|
}
|
|
5
5
|
|
|
6
6
|
.qx-datepicker-icon {
|
|
7
7
|
cursor: pointer;
|
|
8
8
|
vertical-align: top;
|
|
9
|
-
margin-left: rem(4);
|
|
10
|
-
width: rem(22);
|
|
11
|
-
height: rem(22);
|
|
9
|
+
margin-left: px-to-rem(4);
|
|
10
|
+
width: px-to-rem(22);
|
|
11
|
+
height: px-to-rem(22);
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
.qx-datepicker[disabled] + .qx-datepicker-icon {
|
|
@@ -4,13 +4,13 @@
|
|
|
4
4
|
z-index: 1000001;
|
|
5
5
|
position: absolute;
|
|
6
6
|
background-color: $background-color;
|
|
7
|
-
border: rem(1) solid $border-color;
|
|
8
|
-
padding: rem(0);
|
|
9
|
-
margin: rem(0);
|
|
7
|
+
border: px-to-rem(1) solid $border-color;
|
|
8
|
+
padding: px-to-rem(0);
|
|
9
|
+
margin: px-to-rem(0);
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
.qx-menu li {
|
|
13
|
-
padding: rem(6) rem(10);
|
|
13
|
+
padding: px-to-rem(6) px-to-rem(10);
|
|
14
14
|
list-style-type: none;
|
|
15
15
|
cursor: pointer;
|
|
16
16
|
}
|
|
@@ -4,13 +4,13 @@ $rating-background-off: 270deg, #eee, #cfcfcf;
|
|
|
4
4
|
$rating-color-off: #cfcfcf;
|
|
5
5
|
|
|
6
6
|
.qx-rating-item {
|
|
7
|
-
font-size: rem(22);
|
|
7
|
+
font-size: px-to-rem(22);
|
|
8
8
|
background-image: -webkit-linear-gradient($rating-background);
|
|
9
9
|
color: #E3B64A;
|
|
10
10
|
@include background-clip(text);
|
|
11
11
|
-webkit-text-fill-color: transparent;
|
|
12
|
-
-webkit-text-stroke: rem(1) #BB6718;
|
|
13
|
-
margin-right: rem(10);
|
|
12
|
+
-webkit-text-stroke: px-to-rem(1) #BB6718;
|
|
13
|
+
margin-right: px-to-rem(10);
|
|
14
14
|
cursor: pointer;
|
|
15
15
|
}
|
|
16
16
|
|
|
@@ -19,17 +19,17 @@ $rating-color-off: #cfcfcf;
|
|
|
19
19
|
color: $rating-color-off;
|
|
20
20
|
@include background-clip(text);
|
|
21
21
|
-webkit-text-fill-color: transparent;
|
|
22
|
-
-webkit-text-stroke: rem(1) $rating-color-off;
|
|
22
|
+
-webkit-text-stroke: px-to-rem(1) $rating-color-off;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
.qx-rating-item[disabled] {
|
|
26
26
|
background-image: -webkit-linear-gradient($rating-background-disabled);
|
|
27
|
-
-webkit-text-stroke: rem(1) desaturate(#BB6718, 100%);
|
|
27
|
+
-webkit-text-stroke: px-to-rem(1) desaturate(#BB6718, 100%);
|
|
28
28
|
color: desaturate(#D5771D, 100%);
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
.qx-rating-item.qx-rating-item-off[disabled] {
|
|
32
32
|
background-image: -webkit-linear-gradient($rating-background-off);
|
|
33
|
-
-webkit-text-stroke: rem(1) desaturate($rating-color-off, 100%);
|
|
33
|
+
-webkit-text-stroke: px-to-rem(1) desaturate($rating-color-off, 100%);
|
|
34
34
|
color: $rating-color-off;
|
|
35
35
|
}
|