@qooxdoo/framework 7.6.1 → 7.6.3

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.
Files changed (52) hide show
  1. package/Manifest.json +1 -1
  2. package/README.md +3 -3
  3. package/bin/tools/utils.js +1 -0
  4. package/lib/compiler/compile-info.json +60 -60
  5. package/lib/compiler/index.js +253 -253
  6. package/lib/resource/qx/tool/bin/build-website +1 -1
  7. package/lib/resource/qx/tool/cli/templates/skeleton/mobile/source/theme/custom/css/custom.css +1 -1
  8. package/lib/resource/qx/tool/cli/templates/skeleton/mobile/source/theme/custom/css/custom.css.map +1 -1
  9. package/package.json +35 -35
  10. package/source/class/qx/ui/basic/Image.js +5 -4
  11. package/source/class/qx/ui/core/scroll/MRoll.js +11 -1
  12. package/source/class/qx/ui/form/AbstractField.js +3 -3
  13. package/source/class/qx/ui/form/Button.js +14 -1
  14. package/source/class/qx/ui/form/SelectBox.js +24 -9
  15. package/source/class/qx/ui/mobile/dialog/Popup.js +5 -5
  16. package/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js +13 -5
  17. package/source/class/qx/ui/window/Manager.js +3 -0
  18. package/source/resource/qx/mobile/scss/common/_scroller.scss +6 -6
  19. package/source/resource/qx/mobile/scss/theme/flat/_styles.scss +55 -55
  20. package/source/resource/qx/mobile/scss/theme/indigo/_styles.scss +55 -55
  21. package/source/resource/qx/mobile/scss/ui/_button.scss +8 -8
  22. package/source/resource/qx/mobile/scss/ui/_carousel.scss +2 -2
  23. package/source/resource/qx/mobile/scss/ui/_checkbox.scss +2 -2
  24. package/source/resource/qx/mobile/scss/ui/_collapsible.scss +7 -7
  25. package/source/resource/qx/mobile/scss/ui/_drawer.scss +6 -6
  26. package/source/resource/qx/mobile/scss/ui/_form.scss +35 -35
  27. package/source/resource/qx/mobile/scss/ui/_input.scss +7 -7
  28. package/source/resource/qx/mobile/scss/ui/_list.scss +8 -8
  29. package/source/resource/qx/mobile/scss/ui/_main.scss +8 -8
  30. package/source/resource/qx/mobile/scss/ui/_masterdetail.scss +5 -5
  31. package/source/resource/qx/mobile/scss/ui/_menu.scss +2 -2
  32. package/source/resource/qx/mobile/scss/ui/_navigationbar.scss +11 -11
  33. package/source/resource/qx/mobile/scss/ui/_picker.scss +8 -8
  34. package/source/resource/qx/mobile/scss/ui/_popup.scss +14 -14
  35. package/source/resource/qx/mobile/scss/ui/_radiobutton.scss +3 -3
  36. package/source/resource/qx/mobile/scss/ui/_selectbox.scss +3 -3
  37. package/source/resource/qx/mobile/scss/ui/_slider.scss +7 -7
  38. package/source/resource/qx/mobile/scss/ui/_tabbar.scss +4 -4
  39. package/source/resource/qx/mobile/scss/ui/_togglebutton.scss +9 -9
  40. package/source/resource/qx/mobile/scss/ui/_toolbar.scss +5 -5
  41. package/source/resource/qx/scss/_mixins.scss +27 -0
  42. package/source/resource/qx/tool/bin/build-website +1 -1
  43. package/source/resource/qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/_styles.scss +55 -55
  44. package/source/resource/qx/website/scss/ui/_button.scss +10 -10
  45. package/source/resource/qx/website/scss/ui/_calendar.scss +5 -5
  46. package/source/resource/qx/website/scss/ui/_carousel.scss +5 -5
  47. package/source/resource/qx/website/scss/ui/_datepicker.scss +5 -5
  48. package/source/resource/qx/website/scss/ui/_menu.scss +4 -4
  49. package/source/resource/qx/website/scss/ui/_rating.scss +6 -6
  50. package/source/resource/qx/website/scss/ui/_slider.scss +11 -11
  51. package/source/resource/qx/website/scss/ui/_tabs.scss +22 -22
  52. package/source/resource/qx/website/scss/ui/_toolbar.scss +14 -14
@@ -81,7 +81,7 @@ qx.Class.define("qx.ui.form.SelectBox", {
81
81
  */
82
82
 
83
83
  properties: {
84
- // overridden
84
+ /**@override*/
85
85
  appearance: {
86
86
  refine: true,
87
87
  init: "selectbox"
@@ -114,7 +114,7 @@ qx.Class.define("qx.ui.form.SelectBox", {
114
114
  this.getChildControl("atom").setRich(value);
115
115
  },
116
116
 
117
- // overridden
117
+ /**@override*/
118
118
  _defaultFormat(item) {
119
119
  if (item) {
120
120
  if (typeof item.isRich == "function" && item.isRich()) {
@@ -125,7 +125,7 @@ qx.Class.define("qx.ui.form.SelectBox", {
125
125
  return null;
126
126
  },
127
127
 
128
- // overridden
128
+ /**@override*/
129
129
  _createChildControlImpl(id, hash) {
130
130
  var control;
131
131
 
@@ -147,14 +147,29 @@ qx.Class.define("qx.ui.form.SelectBox", {
147
147
  control = new qx.ui.basic.Image();
148
148
  control.setAnonymous(true);
149
149
 
150
- this._add(control);
150
+ this.getQxObject("arrowButton")._add(control);
151
+ this._add(this.getQxObject("arrowButton"));
151
152
  break;
152
153
  }
153
154
 
154
155
  return control || super._createChildControlImpl(id);
155
156
  },
156
157
 
157
- // overridden
158
+ /**@overload */
159
+ _createQxObjectImpl(id) {
160
+ switch (id) {
161
+ case "arrowButton":
162
+ var layout = new qx.ui.layout.HBox().set({ alignY: "middle" });
163
+ return new qx.ui.container.Composite(layout).set({
164
+ allowGrowY: true,
165
+ appearance: "selectbox-arrow-button"
166
+ });
167
+ }
168
+
169
+ return super._createQxObjectImpl(id);
170
+ },
171
+
172
+ /**@override*/
158
173
  /**
159
174
  * @lint ignoreReferenceField(_forwardStates)
160
175
  */
@@ -306,7 +321,7 @@ qx.Class.define("qx.ui.form.SelectBox", {
306
321
  this.toggle();
307
322
  },
308
323
 
309
- // overridden
324
+ /**@override*/
310
325
  _onKeyPress(e) {
311
326
  var iden = e.getKeyIdentifier();
312
327
  if ((iden == "Down" || iden == "Up") && e.isAltPressed()) {
@@ -341,7 +356,7 @@ qx.Class.define("qx.ui.form.SelectBox", {
341
356
  this.getChildControl("list").dispatchEvent(clone);
342
357
  },
343
358
 
344
- // overridden
359
+ /**@override*/
345
360
  _onListPointerDown(e) {
346
361
  // Apply pre-selected item (translate quick selection to real selection)
347
362
  if (this.__preSelectedItem) {
@@ -350,7 +365,7 @@ qx.Class.define("qx.ui.form.SelectBox", {
350
365
  }
351
366
  },
352
367
 
353
- // overridden
368
+ /**@override*/
354
369
  _onListChangeSelection(e) {
355
370
  var current = e.getData();
356
371
  var old = e.getOldData();
@@ -399,7 +414,7 @@ qx.Class.define("qx.ui.form.SelectBox", {
399
414
  }
400
415
  },
401
416
 
402
- // overridden
417
+ /**@override*/
403
418
  _onPopupChangeVisibility(e) {
404
419
  super._onPopupChangeVisibility(e);
405
420
 
@@ -133,6 +133,7 @@ qx.Class.define("qx.ui.mobile.dialog.Popup", {
133
133
 
134
134
  members: {
135
135
  __isShown: false,
136
+ __isPlaced: false,
136
137
  __childrenContainer: null,
137
138
  __percentageTop: null,
138
139
  __anchor: null,
@@ -223,8 +224,8 @@ qx.Class.define("qx.ui.mobile.dialog.Popup", {
223
224
 
224
225
  this.placeTo(computedPopupPosition.left, computedPopupPosition.top);
225
226
  }
226
- } else if (this.__childrenContainer) {
227
- // No Anchor
227
+ } else if (this.__childrenContainer && !this.__isPlaced) {
228
+ // No Anchor and not placed to point manually
228
229
  this._positionToCenter();
229
230
  }
230
231
  },
@@ -239,9 +240,6 @@ qx.Class.define("qx.ui.mobile.dialog.Popup", {
239
240
 
240
241
  this.__registerEventListener();
241
242
 
242
- // Move outside of viewport
243
- this.placeTo(-1000, -1000);
244
-
245
243
  // Needs to be added to screen, before rendering position, for calculating
246
244
  // objects height.
247
245
  super.show();
@@ -323,6 +321,7 @@ qx.Class.define("qx.ui.mobile.dialog.Popup", {
323
321
  * @param top {Integer} - the value the will be set to container's top style property
324
322
  */
325
323
  placeTo(left, top) {
324
+ this.__isPlaced = true;
326
325
  this._setStyle("left", left + "px");
327
326
  this._setStyle("top", top + "px");
328
327
  },
@@ -581,6 +580,7 @@ qx.Class.define("qx.ui.mobile.dialog.Popup", {
581
580
  this._disposeObjects("__childrenContainer");
582
581
 
583
582
  this.__isShown =
583
+ this.__isPlaced =
584
584
  this.__percentageTop =
585
585
  this._anchor =
586
586
  this.__widget =
@@ -809,10 +809,13 @@ qx.Class.define("qx.ui.treevirtual.SimpleTreeDataModel", {
809
809
  * has completed building or modifying a tree by issuing a series of
810
810
  * calls to {@link #addBranch} and/or {@link #addLeaf}.
811
811
  *
812
+ * @param bRerender {Boolean?true}
813
+ * Rerender the tree data after setting the data. If set false it becomes the caller's responsibility to
814
+ * call setData() subsequently to cause a redraw.
812
815
  *
813
816
  * @throws {Error} If the parameter has the wrong type.
814
817
  */
815
- setData(nodeArr) {
818
+ setData(nodeArr, bRerender = true) {
816
819
  this._checkEditing();
817
820
  if (nodeArr instanceof Array) {
818
821
  // Save the user-supplied data.
@@ -825,8 +828,10 @@ qx.Class.define("qx.ui.treevirtual.SimpleTreeDataModel", {
825
828
  );
826
829
  }
827
830
 
828
- // Re-render the row array
829
- this.__render();
831
+ // Re-render the row array, if so requested
832
+ if (bRerender) {
833
+ this.__render();
834
+ }
830
835
 
831
836
  // Set selections in the selection model now
832
837
  var selectionModel = this.getTree().getSelectionModel();
@@ -859,11 +864,14 @@ qx.Class.define("qx.ui.treevirtual.SimpleTreeDataModel", {
859
864
  /**
860
865
  * Clears the tree of all nodes
861
866
  *
867
+ * @param bRerender {Boolean?true}
868
+ * Rerender the tree data after clearing. If set false it becomes the caller's responsibility to
869
+ * call setData() subsequently to cause a redraw.
862
870
  */
863
- clearData() {
871
+ clearData(bRerender = true) {
864
872
  this._checkEditing();
865
873
  this._clearSelections();
866
- this.setData([qx.ui.treevirtual.MTreePrimitive._getEmptyTree()]);
874
+ this.setData([qx.ui.treevirtual.MTreePrimitive._getEmptyTree()], bRerender);
867
875
  },
868
876
 
869
877
  /**
@@ -81,6 +81,9 @@ qx.Class.define("qx.ui.window.Manager", {
81
81
  * {@link qx.ui.core.queue.Widget widget queue}.
82
82
  */
83
83
  syncWidget() {
84
+ if (this.isDisposed()){
85
+ return;
86
+ }
84
87
  this.__desktop.forceUnblock();
85
88
 
86
89
  var windows = this.__desktop.getWindows();
@@ -30,7 +30,7 @@
30
30
 
31
31
  overflow-y:scroll;
32
32
  overflow-x:scroll;
33
-
33
+
34
34
  -webkit-overflow-scrolling:touch;
35
35
  -ms-overflow-style: -ms-autohiding-scrollbar;
36
36
  }
@@ -59,7 +59,7 @@
59
59
  .scrollbarV > div {
60
60
  @include background-clip(padding-box);
61
61
  @include box-sizing(border-box);
62
- @include border-radius(rem(4));
62
+ @include border-radius(px-to-rem(4));
63
63
 
64
64
  background-color: #888888;
65
65
  position: absolute;
@@ -70,10 +70,10 @@
70
70
 
71
71
  .scrollbarV {
72
72
  position: absolute;
73
- top: rem(2);
74
- right: rem(2);
75
- bottom: rem(2);
76
- width: rem(6);
73
+ top: px-to-rem(2);
74
+ right: px-to-rem(2);
75
+ bottom: px-to-rem(2);
76
+ width: px-to-rem(6);
77
77
  z-index: 100;
78
78
 
79
79
  margin-top: 0 !important;
@@ -24,10 +24,10 @@ $application-text-color: $color-1;
24
24
  // Button
25
25
 
26
26
  $button-text-color: $highlight-color;
27
- $button-font-size: rem(15);
27
+ $button-font-size: px-to-rem(15);
28
28
  $button-font-weight: normal;
29
29
  $button-active-text-color: $color-5;
30
- $button-border-radius: rem(2);
30
+ $button-border-radius: px-to-rem(2);
31
31
  $button-border-color: $color-3;
32
32
  $button-active-border-color: $highlight-color;
33
33
  $button-background: $color-5;
@@ -35,40 +35,40 @@ $button-active-background: $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: $color-5;
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(5);
51
+ $checkbox-tick-size: px-to-rem(14);
52
+ $checkbox-tick-width: px-to-rem(5);
53
53
  $checkbox-tick-shadow: rgba(0,0,0,0);
54
- $checkbox-border-radius: rem(2);
54
+ $checkbox-border-radius: px-to-rem(2);
55
55
  $checkbox-border-color: $color-3;
56
56
  $checkbox-background: $color-4;
57
57
 
58
58
  // Collapsible
59
59
 
60
- $collapsible-border-radius: rem(3);
60
+ $collapsible-border-radius: px-to-rem(3);
61
61
  $collapsible-header-border-color: $color-4;
62
62
  $collapsible-header-text-color: $highlight-color;
63
63
  $collapsible-header-active-text-color: $color-5;
64
64
  $collapsible-header-background: $color-5;
65
65
  $collapsible-header-active-background: $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: $color-5;
71
- $collapsible-arrow-size: rem(8);
71
+ $collapsible-arrow-size: px-to-rem(8);
72
72
  $collapsible-arrow-color: $color-3;
73
73
  $collapsible-active-arrow-color: $color-5;
74
74
 
@@ -84,9 +84,9 @@ $dialog-border-color: $highlight-color;
84
84
  $dialog-background: $color-2;
85
85
  $dialog-arrow-up-color: $color-2;
86
86
  $dialog-arrow-down-color: $color-2;
87
- $dialog-arrow-size: rem(12);
88
- $dialog-arrow-position-offset: rem(16);
89
- $dialog-border-radius: rem(2);
87
+ $dialog-arrow-size: px-to-rem(12);
88
+ $dialog-arrow-position-offset: px-to-rem(16);
89
+ $dialog-border-radius: px-to-rem(2);
90
90
  $dialog-title-text-color: $color-5;
91
91
  $dialog-font-weight: normal;
92
92
 
@@ -96,7 +96,7 @@ $form-background: $color-5;
96
96
  $form-title-text-color: $color-1;
97
97
  $form-label-text-color: $color-1;
98
98
  $form-border-color: $color-5;
99
- $form-border-radius: rem(2);
99
+ $form-border-radius: px-to-rem(2);
100
100
  $form-font-weight: normal;
101
101
 
102
102
  // Group
@@ -104,13 +104,13 @@ $form-font-weight: normal;
104
104
  $group-background: $color-5;
105
105
  $group-border-color: $color-5;
106
106
  $group-title-text-color: $color-1;
107
- $group-border-radius: rem(2);
107
+ $group-border-radius: px-to-rem(2);
108
108
 
109
109
  // Input
110
110
 
111
111
  $input-text-color: $color-1;
112
112
  $input-background: $color-5;
113
- $input-border-radius: rem(2);
113
+ $input-border-radius: px-to-rem(2);
114
114
  $input-border-color: $color-3;
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: $color-5;
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: normal;
124
124
  $list-subtitle-text-color: $highlight-color;
125
- $list-subtitle-font-size: rem(13);
125
+ $list-subtitle-font-size: px-to-rem(13);
126
126
  $list-border-color: $color-4;
127
127
  $list-active-background: $highlight-color;
128
128
  $list-active-text-color: $color-5;
129
- $list-border-radius: rem(2);
130
- $list-arrow-size: rem(3);
131
- $list-arrow-thickness: rem(2);
129
+ $list-border-radius: px-to-rem(2);
130
+ $list-arrow-size: px-to-rem(3);
131
+ $list-arrow-thickness: px-to-rem(2);
132
132
  $list-arrow-color: $color-2;
133
133
  $list-active-arrow-color: $color-5;
134
- $list-group-header-height: rem(30);
134
+ $list-group-header-height: px-to-rem(30);
135
135
  $list-group-header-color: $color-2;
136
136
  $list-group-header-background: $color-5;
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: $highlight-color;
143
143
 
144
144
  // NavigationBar
145
145
 
146
- $navigationbar-height: rem(35);
146
+ $navigationbar-height: px-to-rem(35);
147
147
  $navigationbar-background: $color-2;
148
- $navigationbar-text-size: rem(18);
148
+ $navigationbar-text-size: px-to-rem(18);
149
149
  $navigationbar-text-color: $color-5;
150
- $navigationbar-padding: rem(4);
150
+ $navigationbar-padding: px-to-rem(4);
151
151
  $navigationbar-font-weight: normal;
152
152
 
153
153
  // NavigationBar Button
154
154
 
155
- $navigationbarbutton-border-radius: rem(3);
155
+ $navigationbarbutton-border-radius: px-to-rem(3);
156
156
  $navigationbarbutton-background: $color-5;
157
157
  $navigationbarbutton-border-color: rgba(0,0,0,0);
158
158
  $navigationbarbutton-text-color: $highlight-color;
@@ -172,20 +172,20 @@ $picker-spinning-wheel-overlay: rgba($background-color,1),rgba($background-color
172
172
  $picker-spinning-wheel-text-color: $color-1;
173
173
  $picker-spinning-wheel-background: $color-5;
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-3;
177
- $picker-spinning-wheel-divider-width: rem(1);
177
+ $picker-spinning-wheel-divider-width: px-to-rem(1);
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);
191
191
  $radiobutton-background: $color-4;
@@ -193,7 +193,7 @@ $radiobutton-border-color: $color-3;
193
193
 
194
194
  // SelectBox
195
195
 
196
- $selectbox-border-radius: rem(2);
196
+ $selectbox-border-radius: px-to-rem(2);
197
197
  $selectbox-border-color: $color-3;
198
198
  $selectbox-text-color: $highlight-color;
199
199
  $selectbox-background: $color-4;
@@ -204,14 +204,14 @@ $selectbox-item-selected-background: $highlight-color;
204
204
 
205
205
  // Slider
206
206
 
207
- $slider-height: rem(6);
207
+ $slider-height: px-to-rem(6);
208
208
  $slider-background: $color-4;
209
209
  $slider-active-area: $highlight-color;
210
- $slider-border-radius: rem(2);
210
+ $slider-border-radius: px-to-rem(2);
211
211
  $slider-border-color: $color-5;
212
- $slider-knob-border-radius: rem(15);
213
- $slider-knob-width: rem(40);
214
- $slider-knob-height: rem(30);
212
+ $slider-knob-border-radius: px-to-rem(15);
213
+ $slider-knob-width: px-to-rem(40);
214
+ $slider-knob-height: px-to-rem(30);
215
215
  $slider-knob-background: $color-5;
216
216
  $slider-knob-border-color: $color-3;
217
217
  $slider-shadow: rgba(0,0,0,0);
@@ -219,13 +219,13 @@ $slider-font-color: $highlight-color;
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: $highlight-color,$highlight-color;
231
231
  $tabbar-active-border-color: $highlight-color;
@@ -233,24 +233,24 @@ $tabbar-inactive-background: $color-3;
233
233
  $tabbar-inactive-border-color: $color-3;
234
234
  $tabbar-active-text-color: $color-5;
235
235
  $tabbar-inactive-text-color: $color-5;
236
- $tabbar-border-radius: rem(2);
237
- $tabbar-button-distance: rem(4);
236
+ $tabbar-border-radius: px-to-rem(2);
237
+ $tabbar-button-distance: px-to-rem(4);
238
238
 
239
239
  // ToggleButton
240
240
 
241
- $togglebutton-width: rem(90);
242
- $togglebutton-height: rem(35);
243
- $togglebutton-border-radius: rem(30);
241
+ $togglebutton-width: px-to-rem(90);
242
+ $togglebutton-height: px-to-rem(35);
243
+ $togglebutton-border-radius: px-to-rem(30);
244
244
  $togglebutton-border-color: $color-3;
245
245
  $togglebutton-text-color: $highlight-color;
246
246
  $togglebutton-background: $color-4;
247
247
  $togglebutton-active-background: $highlight-color;
248
248
  $togglebutton-knob-background: $color-5;
249
- $togglebutton-knob-width: rem(35);
249
+ $togglebutton-knob-width: px-to-rem(35);
250
250
  $togglebutton-active-text-color: $color-5;
251
251
  $togglebutton-inset-shadow: rgba(0,0,0,0);
252
252
  $togglebutton-knob-shadow: rgba(0,0,0,0.4);
253
- $togglebutton-font-size: rem(12);
253
+ $togglebutton-font-size: px-to-rem(12);
254
254
  $togglebutton-font-weight: normal;
255
255
 
256
256
  // Toolbar
@@ -260,6 +260,6 @@ $toolbar-background: $color-5;
260
260
  $toolbar-active-background: $highlight-color;
261
261
  $toolbar-active-text-color: $color-5;
262
262
  $toolbar-border-color: $color-3;
263
- $toolbar-border-radius: rem(2);
263
+ $toolbar-border-radius: px-to-rem(2);
264
264
  $toolbar-font-weight: normal;
265
- $toolbar-padding: rem(5);
265
+ $toolbar-padding: px-to-rem(5);