Merge branch 'dev'

Author: hawkeye64

demo/src/markdown/scroller.md

@@ -104,12 +104,12 @@ Then, your `v-model` variable should contain a `value` from your list for an ini
 
 | Vue Property | Type | Default | Description |
 | --- | :---: | :---: | --- |
-| border-color | String | #ccc | This is the color of outside border when `no-border` is not `true`. This **has** to be a css color (not a Quasar color) or css color name |
-| bar-color | String | #ccc | This is the color of the middle bars. This **has** to be a css color (not a Quasar color) or css color name |
-| color | String | white | This is the color of the text. Applies to header and footer. It can be a css color or from the Quasar color palette |
-| background-color | String | primary | This is the color of the background. Applies to header and footer. It can be a css color or from the Quasar color palette |
-| inner-color | String | primary | This is the color of the scroller text. It can be a css color or from the Quasar color palette |
-| inner-background-color | String | white | This is the color of the scroller background. It can be a css color or from the Quasar color palette |
+| border-color | String | #ccc | This is the color of outside border when `no-border` property is not `true`. This **has** to be a css color (not a Quasar color) or css color name (see note below) |
+| bar-color | String | #ccc | This is the color of the middle bars. This **has** to be a css color (not a Quasar color) or css color name (see note below) |
+| color | String | white | This is the color of the text. Applies to header and footer. It can be a css color `(#|((rgb|hsl)a)` or from the Quasar color palette |
+| background-color | String | primary | This is the color of the background. Applies to header and footer. It can be a css color `(#|((rgb|hsl)a)` or from the Quasar color palette |
+| inner-color | String | primary | This is the color of the scroller text. It can be a css color `(#|((rgb|hsl)a)` or from the Quasar color palette |
+| inner-background-color | String | white | This is the color of the scroller background. It can be a css color `(#|((rgb|hsl)a)` or from the Quasar color palette |
 | dense | Boolean | | If the component should be in dense mode |
 | disable | Boolean | | If the component should be disabled |
 | rounded-border | Boolean | | If the component should have rounded corners |
@@ -132,17 +132,26 @@ Then, your `v-model` variable should contain a `value` from your list for an ini
 
 | Property | Type | Default | Description |
 | :--- | :---: | :---: | --- |
+| input |  | |  |
+| close |  | | Occurs when the footer button is clicked, usually used to close the component (in dev land) when used in a `QPopupProxy` |
 
 ### QScroller Vue Methods
 
-| Property | Type | Default | Description |
-| :--- | :---: | :---: | --- |
-
+| Property | Arg | Description |
+| :--- | :---: | --- |
+| canMovePrevious |  |Returns true if can move to the previous item, otherwise returns false |
+| canMoveNext |  |Returns true if can move to the next item, otherwise returns false |
+| previous |  |Move to the previous item |
+| next |  |Move to the next item |
+| getItemIndex | value |Returns the index of the passed value, otherwise returns -1 on error or not found|
+| getCurrentIndex | | Returns the index of the current selection, otherwise returns -1 on error or not found
 
 ### QScroller Vue Slots
 
-| Property | Type | Default | Description |
+| Property | Arg | Description |
 | :--- | :---: | :---: | --- |
+| header | value | Header scoped slot |
+| footer | value | Footer scoped slot |
 
 ## QTimeScroller Vue Properties
 
@@ -161,10 +170,10 @@ Then, your `v-model` variable should contain a `value` from your list for an ini
 | disabled-minutes | Array | [ ] | Minutes that should be disabled (always use 0 through to 59) |
 | no-hours | Boolean | | Do not show the Hours scroller |
 | no-minutes | Boolean | | Do not show the Minutes scroller |
-| hours | Array | | Array of hours to be displayed |
-| minutes | Array | | Array of minutes to be displayed |
-| min-time | String | '00:00' | Any time before this time will be disabled |
-| max-time | String | '24:00' | Any time after this time will be disabled |
+| hours | Array | | (TBD) Array of hours to be displayed |
+| minutes | Array | | (TBD) Array of minutes to be displayed |
+| min-time | String | '00:00' | (TBD) Any time before this time will be disabled |
+| max-time | String | '24:00' | (TBD) Any time after this time will be disabled |
 
 ## QTimeRangeScroller Vue Properties
 

demo/src/pages/Index.vue

@@ -125,8 +125,8 @@ a {
 .page-header {
   color: #fff;
   text-align: center;
-  background-color: #592496;
-  background-image: linear-gradient(120deg, #d88e04, #592496); }
+  background-color: #ffffaa;
+  background-image: linear-gradient(120deg, #1780f7, #4df3ff); }
 
 @media screen and (min-width: 64em) {
   .page-header {

docs/css/011ca09e.86ce1ae7.css

@@ -1 +1 @@
-<!DOCTYPE html><html><head><title>QScroller demo app</title><meta charset=utf-8><meta name=description content="A Quasar Framework app"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon href=statics/quasar-logo.png type=image/x-icon><link rel=icon type=image/png sizes=32x32 href=statics/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=statics/icons/favicon-16x16.png><link href=css/011ca09e.86ce1ae7.css rel=prefetch><link href=js/011ca09e.2225e835.js rel=prefetch><link href=js/2d0b37e1.fd6d8c36.js rel=prefetch><link href=js/2d0d5fdf.8f562e6c.js rel=prefetch><link href=js/2d0d6bbf.568c6ac1.js rel=prefetch><link href=js/2d0d8028.d40fadf5.js rel=prefetch><link href=js/4b47640d.d1278a00.js rel=prefetch><link href=css/app.866cf617.css rel=preload as=style><link href=js/app.771e7e22.js rel=preload as=script><link href=js/runtime.86674c39.js rel=preload as=script><link href=js/vendor.61d9d784.js rel=preload as=script><link href=css/app.866cf617.css rel=stylesheet></head><body><div id=q-app></div><script type=text/javascript src=js/app.771e7e22.js></script><script type=text/javascript src=js/runtime.86674c39.js></script><script type=text/javascript src=js/vendor.61d9d784.js></script></body></html>
+<!DOCTYPE html><html><head><title>QScroller demo app</title><meta charset=utf-8><meta name=description content="A Quasar Framework app"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon href=statics/quasar-logo.png type=image/x-icon><link rel=icon type=image/png sizes=32x32 href=statics/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=statics/icons/favicon-16x16.png><link href=css/011ca09e.92605a6a.css rel=prefetch><link href=js/011ca09e.191e0b1a.js rel=prefetch><link href=js/2d0b37e1.fd6d8c36.js rel=prefetch><link href=js/2d0d5fdf.8f562e6c.js rel=prefetch><link href=js/2d0d6bbf.568c6ac1.js rel=prefetch><link href=js/2d0d8028.d40fadf5.js rel=prefetch><link href=js/4b47640d.d1278a00.js rel=prefetch><link href=css/app.866cf617.css rel=preload as=style><link href=js/app.771e7e22.js rel=preload as=script><link href=js/runtime.af8c40ed.js rel=preload as=script><link href=js/vendor.cfba3506.js rel=preload as=script><link href=css/app.866cf617.css rel=stylesheet></head><body><div id=q-app></div><script type=text/javascript src=js/app.771e7e22.js></script><script type=text/javascript src=js/runtime.af8c40ed.js></script><script type=text/javascript src=js/vendor.cfba3506.js></script></body></html>