From 9f6a977ad0b72407b88adc93cb52332ede49d819 Mon Sep 17 00:00:00 2001 From: rigor789 Date: Sat, 23 Jun 2018 17:24:39 +0200 Subject: [PATCH 01/19] Disable versions until DNS is figured out --- build/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/index.js b/build/index.js index 40f0dec4..624e87d0 100644 --- a/build/index.js +++ b/build/index.js @@ -120,7 +120,7 @@ Metalsmith(cwd) .use(versions({ versions: [ { name: 'latest', url: '//nativescript-vue.org' }, - { name: 'v1.3.1', url: '//v1.3.1.nativescript-vue.org' }, + // { name: 'v1.3.1', url: '//v1.3.1.nativescript-vue.org' }, ], currentVersion: { name: 'latest', From 0c3bb7f5d884e91da32e85d1c3c981356aea3d80 Mon Sep 17 00:00:00 2001 From: rigor789 Date: Sat, 23 Jun 2018 17:45:25 +0200 Subject: [PATCH 02/19] Add version selector --- build/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/index.js b/build/index.js index 624e87d0..b2388989 100644 --- a/build/index.js +++ b/build/index.js @@ -120,7 +120,7 @@ Metalsmith(cwd) .use(versions({ versions: [ { name: 'latest', url: '//nativescript-vue.org' }, - // { name: 'v1.3.1', url: '//v1.3.1.nativescript-vue.org' }, + { name: 'v1.3.1', url: '//v1-3-1.nativescript-vue.org' }, ], currentVersion: { name: 'latest', From c56b1a0a56696f9de11997b678c816ba90739a46 Mon Sep 17 00:00:00 2001 From: rigor789 Date: Tue, 3 Jul 2018 16:11:41 +0200 Subject: [PATCH 03/19] Add facet filters --- src/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 23d42a97..5cc89f0f 100644 --- a/src/main.js +++ b/src/main.js @@ -18,12 +18,13 @@ document.addEventListener('DOMContentLoaded', () => { mounted() { const selector = document.querySelector('.docSearch-input') const lang = document.documentElement.lang || 'en' + const [version] = window.location.hostname.match(/v\d-\d-\d/) || ['master'] docsearch({ apiKey: '31f842779e5b33726ec73f8f973b2202', indexName: 'nativescript-vue', inputSelector: selector, - algoliaOptions: {facetFilters: [`lang:${lang}`]}, + algoliaOptions: {facetFilters: [`lang:${lang}`, `version:${version}`]}, debug: false }) }, From ada2fc7c3491a2a3d9f307f8ef1f373c84e6f691 Mon Sep 17 00:00:00 2001 From: rigor789 Date: Wed, 4 Jul 2018 10:42:06 +0200 Subject: [PATCH 04/19] add sponsors to homepage --- content/index.ejs | 24 +++++++- static/styles.css | 140 +++++++--------------------------------------- tailwind.js | 1 + 3 files changed, 44 insertions(+), 121 deletions(-) diff --git a/content/index.ejs b/content/index.ejs index 11c24078..5773e976 100644 --- a/content/index.ejs +++ b/content/index.ejs @@ -36,7 +36,8 @@ dest: index.html

Easy to get started with.

- NativeScript-Vue is easy to get started with, it is a single dependency that you can install through npm. + NativeScript-Vue is easy to get started with, it is a single dependency that you can install through + npm.

@@ -56,4 +57,25 @@ dest: index.html

+ + +
+

Sponsors

+ +
+ + PrivateInternetAccess + + + KiwiIRC + +
\ No newline at end of file diff --git a/static/styles.css b/static/styles.css index 04b871e9..8c9b5606 100644 --- a/static/styles.css +++ b/static/styles.css @@ -680,10 +680,6 @@ button, background-color: #fff5eb; } -.bg-orange-light { - background-color: #faad63; -} - .bg-orange-dark { background-color: #de751f; } @@ -752,10 +748,6 @@ button, background-color: #fff5eb; } -.hover\:bg-orange-light:hover { - background-color: #faad63; -} - .hover\:bg-orange-dark:hover { background-color: #de751f; } @@ -884,10 +876,6 @@ button, border-color: #fff5eb; } -.border-orange-light { - border-color: #faad63; -} - .border-orange-dark { border-color: #de751f; } @@ -956,10 +944,6 @@ button, border-color: #fff5eb; } -.hover\:border-orange-light:hover { - border-color: #faad63; -} - .hover\:border-orange-dark:hover { border-color: #de751f; } @@ -2004,6 +1988,10 @@ button, margin-left: 1px; } +.max-h-16 { + max-height: 4rem; +} + .max-h-full { max-height: 100%; } @@ -2822,10 +2810,6 @@ button, color: #fff5eb; } -.text-orange-light { - color: #faad63; -} - .text-orange-dark { color: #de751f; } @@ -2894,10 +2878,6 @@ button, color: #fff5eb; } -.hover\:text-orange-light:hover { - color: #faad63; -} - .hover\:text-orange-dark:hover { color: #de751f; } @@ -3388,10 +3368,6 @@ button, background-color: #fff5eb; } - .sm\:bg-orange-light { - background-color: #faad63; - } - .sm\:bg-orange-dark { background-color: #de751f; } @@ -3460,10 +3436,6 @@ button, background-color: #fff5eb; } - .sm\:hover\:bg-orange-light:hover { - background-color: #faad63; - } - .sm\:hover\:bg-orange-dark:hover { background-color: #de751f; } @@ -3592,10 +3564,6 @@ button, border-color: #fff5eb; } - .sm\:border-orange-light { - border-color: #faad63; - } - .sm\:border-orange-dark { border-color: #de751f; } @@ -3664,10 +3632,6 @@ button, border-color: #fff5eb; } - .sm\:hover\:border-orange-light:hover { - border-color: #faad63; - } - .sm\:hover\:border-orange-dark:hover { border-color: #de751f; } @@ -4712,6 +4676,10 @@ button, margin-left: 1px; } + .sm\:max-h-16 { + max-height: 4rem; + } + .sm\:max-h-full { max-height: 100%; } @@ -5522,10 +5490,6 @@ button, color: #fff5eb; } - .sm\:text-orange-light { - color: #faad63; - } - .sm\:text-orange-dark { color: #de751f; } @@ -5594,10 +5558,6 @@ button, color: #fff5eb; } - .sm\:hover\:text-orange-light:hover { - color: #faad63; - } - .sm\:hover\:text-orange-dark:hover { color: #de751f; } @@ -6047,10 +6007,6 @@ button, background-color: #fff5eb; } - .md\:bg-orange-light { - background-color: #faad63; - } - .md\:bg-orange-dark { background-color: #de751f; } @@ -6119,10 +6075,6 @@ button, background-color: #fff5eb; } - .md\:hover\:bg-orange-light:hover { - background-color: #faad63; - } - .md\:hover\:bg-orange-dark:hover { background-color: #de751f; } @@ -6251,10 +6203,6 @@ button, border-color: #fff5eb; } - .md\:border-orange-light { - border-color: #faad63; - } - .md\:border-orange-dark { border-color: #de751f; } @@ -6323,10 +6271,6 @@ button, border-color: #fff5eb; } - .md\:hover\:border-orange-light:hover { - border-color: #faad63; - } - .md\:hover\:border-orange-dark:hover { border-color: #de751f; } @@ -7371,6 +7315,10 @@ button, margin-left: 1px; } + .md\:max-h-16 { + max-height: 4rem; + } + .md\:max-h-full { max-height: 100%; } @@ -8181,10 +8129,6 @@ button, color: #fff5eb; } - .md\:text-orange-light { - color: #faad63; - } - .md\:text-orange-dark { color: #de751f; } @@ -8253,10 +8197,6 @@ button, color: #fff5eb; } - .md\:hover\:text-orange-light:hover { - color: #faad63; - } - .md\:hover\:text-orange-dark:hover { color: #de751f; } @@ -8706,10 +8646,6 @@ button, background-color: #fff5eb; } - .lg\:bg-orange-light { - background-color: #faad63; - } - .lg\:bg-orange-dark { background-color: #de751f; } @@ -8778,10 +8714,6 @@ button, background-color: #fff5eb; } - .lg\:hover\:bg-orange-light:hover { - background-color: #faad63; - } - .lg\:hover\:bg-orange-dark:hover { background-color: #de751f; } @@ -8910,10 +8842,6 @@ button, border-color: #fff5eb; } - .lg\:border-orange-light { - border-color: #faad63; - } - .lg\:border-orange-dark { border-color: #de751f; } @@ -8982,10 +8910,6 @@ button, border-color: #fff5eb; } - .lg\:hover\:border-orange-light:hover { - border-color: #faad63; - } - .lg\:hover\:border-orange-dark:hover { border-color: #de751f; } @@ -10030,6 +9954,10 @@ button, margin-left: 1px; } + .lg\:max-h-16 { + max-height: 4rem; + } + .lg\:max-h-full { max-height: 100%; } @@ -10840,10 +10768,6 @@ button, color: #fff5eb; } - .lg\:text-orange-light { - color: #faad63; - } - .lg\:text-orange-dark { color: #de751f; } @@ -10912,10 +10836,6 @@ button, color: #fff5eb; } - .lg\:hover\:text-orange-light:hover { - color: #faad63; - } - .lg\:hover\:text-orange-dark:hover { color: #de751f; } @@ -11365,10 +11285,6 @@ button, background-color: #fff5eb; } - .xl\:bg-orange-light { - background-color: #faad63; - } - .xl\:bg-orange-dark { background-color: #de751f; } @@ -11437,10 +11353,6 @@ button, background-color: #fff5eb; } - .xl\:hover\:bg-orange-light:hover { - background-color: #faad63; - } - .xl\:hover\:bg-orange-dark:hover { background-color: #de751f; } @@ -11569,10 +11481,6 @@ button, border-color: #fff5eb; } - .xl\:border-orange-light { - border-color: #faad63; - } - .xl\:border-orange-dark { border-color: #de751f; } @@ -11641,10 +11549,6 @@ button, border-color: #fff5eb; } - .xl\:hover\:border-orange-light:hover { - border-color: #faad63; - } - .xl\:hover\:border-orange-dark:hover { border-color: #de751f; } @@ -12689,6 +12593,10 @@ button, margin-left: 1px; } + .xl\:max-h-16 { + max-height: 4rem; + } + .xl\:max-h-full { max-height: 100%; } @@ -13499,10 +13407,6 @@ button, color: #fff5eb; } - .xl\:text-orange-light { - color: #faad63; - } - .xl\:text-orange-dark { color: #de751f; } @@ -13571,10 +13475,6 @@ button, color: #fff5eb; } - .xl\:hover\:text-orange-light:hover { - color: #faad63; - } - .xl\:hover\:text-orange-dark:hover { color: #de751f; } diff --git a/tailwind.js b/tailwind.js index 84d75c5b..0a3f3142 100644 --- a/tailwind.js +++ b/tailwind.js @@ -540,6 +540,7 @@ module.exports = { maxHeight: { 'full': '100%', + '16': '4rem', 'screen': '100vh', }, From 31cdd03b0fc60c5cd9df685387541a706dc8f748 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Wed, 4 Jul 2018 15:54:11 +0200 Subject: [PATCH 05/19] Update Crowdin configuration file --- crowdin.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 crowdin.yml diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 00000000..3f93cf21 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,3 @@ +files: + - source: /content/docs/en/**/*.md + translation: /content/docs/%two_letters_code%/**/%original_file_name% From c389d872f3b65234988110bcf4409056cf10e3f3 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Wed, 4 Jul 2018 16:19:26 +0200 Subject: [PATCH 06/19] Update Crowdin configuration file --- crowdin.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 3f93cf21..f447f232 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,7 @@ files: - source: /content/docs/en/**/*.md - translation: /content/docs/%two_letters_code%/**/%original_file_name% + translation: /content/docs/%locale%/**/%original_file_name% + languages_mapping: + locale: + ko: ko + ru: ru From 90597bf51427618a71062da54e1688ae93da41a9 Mon Sep 17 00:00:00 2001 From: Richard Keep Date: Wed, 18 Jul 2018 17:45:28 +0300 Subject: [PATCH 07/19] Fix typo (#170) --- content/docs/en/elements/components/list-view.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/en/elements/components/list-view.md b/content/docs/en/elements/components/list-view.md index 0ad5d3b2..7931ad6f 100644 --- a/content/docs/en/elements/components/list-view.md +++ b/content/docs/en/elements/components/list-view.md @@ -9,7 +9,7 @@ contributors: [MisterBrownRSA, rigor789, eddyverbruggen, ikoevska] ```html - + From e930ecc14b3cb8914eec71d4fd07fdfa64fce23f Mon Sep 17 00:00:00 2001 From: rigor789 Date: Tue, 24 Jul 2018 15:41:58 +0200 Subject: [PATCH 08/19] add sponsors to all languages, and add Progress as a sponsor --- content/index.ejs | 7 +++++++ content/index_ko.ejs | 28 ++++++++++++++++++++++++++++ content/index_pt-BR.ejs | 28 ++++++++++++++++++++++++++++ content/index_ru.ejs | 28 ++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+) diff --git a/content/index.ejs b/content/index.ejs index 5773e976..e07f0b9a 100644 --- a/content/index.ejs +++ b/content/index.ejs @@ -77,5 +77,12 @@ dest: index.html KiwiIRC + + Progress + \ No newline at end of file diff --git a/content/index_ko.ejs b/content/index_ko.ejs index 8d2ad21f..434e1928 100644 --- a/content/index_ko.ejs +++ b/content/index_ko.ejs @@ -57,3 +57,31 @@ locale: ko + +
+

Sponsors

+ +
+ + PrivateInternetAccess + + + KiwiIRC + + + Progress + +
+
\ No newline at end of file diff --git a/content/index_pt-BR.ejs b/content/index_pt-BR.ejs index e8feb1e8..876b7464 100644 --- a/content/index_pt-BR.ejs +++ b/content/index_pt-BR.ejs @@ -57,4 +57,32 @@ locale: pt-BR

+ + +
+

Sponsors

+ +
+ + PrivateInternetAccess + + + KiwiIRC + + + Progress + +
\ No newline at end of file diff --git a/content/index_ru.ejs b/content/index_ru.ejs index 207d5a9e..b2f29795 100644 --- a/content/index_ru.ejs +++ b/content/index_ru.ejs @@ -57,4 +57,32 @@ locale: ru

+ + +
+

Sponsors

+ +
+ + PrivateInternetAccess + + + KiwiIRC + + + Progress + +
\ No newline at end of file From fecc8e65c4c9b55ce009cbf6d0a73dbaab3e825f Mon Sep 17 00:00:00 2001 From: Iva Koevska Date: Mon, 30 Jul 2018 14:39:35 +0300 Subject: [PATCH 09/19] Rework layout docs (#164) * Updated absolute layout * Updated dock layout * Added screenshot for dock layout * WIP * Updated flexbox * Added note that alignitems and alignself are android-only * Updated wrap layout * Aligned phrasing * Polishing PR * Updated wording for template link to API Right now, it's not applicable to layouts. Changed "and" to "or" in attempt to make it more correct. * Fixed wording * Fixed image issue, updated wording * Fixing flexbox (wip) * Updated wording and formatting for flexbox * Added descriptions to examples * Polished StackLayout * Polished wording for WrapLayout * fix typo --- .../en/elements/layouts/absolute-layout.md | 34 +++++++---- .../docs/en/elements/layouts/dock-layout.md | 52 ++++++++++++---- .../en/elements/layouts/flexbox-layout.md | 59 ++++++++++++------- .../docs/en/elements/layouts/grid-layout.md | 22 +++---- .../docs/en/elements/layouts/stack-layout.md | 29 +++++---- .../docs/en/elements/layouts/wrap-layout.md | 27 +++++---- layouts/docs.ejs | 2 +- 7 files changed, 144 insertions(+), 81 deletions(-) diff --git a/content/docs/en/elements/layouts/absolute-layout.md b/content/docs/en/elements/layouts/absolute-layout.md index 941998f2..237a1f9d 100644 --- a/content/docs/en/elements/layouts/absolute-layout.md +++ b/content/docs/en/elements/layouts/absolute-layout.md @@ -1,14 +1,22 @@ --- title: AbsoluteLayout apiRef: https://docs.nativescript.org/api-reference/modules/_ui_layouts_absolute_layout_ -contributors: [rigor789] +contributors: [rigor789, ikoevska] --- -The AbsoluteLayout container is the simplest layout container in NativeScript. It uses absolute top-left coordinates to position its children. The AbsoluteLayout will not enforce any layout constraints on its children and will not resize them at runtime when its size changes. +The `` container is the simplest layout container in NativeScript. -### Samples +`` has the following behavior: -#### A grid-like layout +* Uses a pair of absolute left/top coordinates to position its children. +* Doesn't enforce any layout constraints on its children. +* Doesn't resize its children at runtime when its size changes. + +## Examples + +### A grid-like layout + +The following example creates a simple grid. For more information about creating grid layouts, see [GridLayout](/en/docs/elements/layouts/grid-layout). ```html @@ -20,7 +28,9 @@ The AbsoluteLayout container is the simplest layout container in NativeScript. I ``` -#### Overlapping elements +### Overlapping elements + +The following example creates a group of overlapping items. ```html @@ -30,17 +40,15 @@ The AbsoluteLayout container is the simplest layout container in NativeScript. I ``` - ## Props -AbsoluteLayout has no props. +None. -## Additional Children Props +## Additional children props -When an element is a direct child of the AbsoluteLayout, the following -props get a meaning: +When an element is a direct child of ``, you can work with the following additional properties. -| name | type | description | +| Name | Type | Description | |------|------|-------------| -| `top` | `Number` | A value representing the distance from the top of the parent AbsoluteLayout -| `left` | `Number` | A value representing the distance from the left of the parent AbsoluteLayout +| `top` | `Number` | Gets or sets the distance, in pixels, between the top edge of the child and the top edge of its parent. +| `left` | `Number` | Gets or sets the distance, in pixels, between the left edge of the child and the left edge of its parent. diff --git a/content/docs/en/elements/layouts/dock-layout.md b/content/docs/en/elements/layouts/dock-layout.md index 07f6c943..178b2fc5 100644 --- a/content/docs/en/elements/layouts/dock-layout.md +++ b/content/docs/en/elements/layouts/dock-layout.md @@ -1,14 +1,22 @@ --- title: DockLayout apiRef: https://docs.nativescript.org/api-reference/modules/_ui_layouts_dock_layout_ -contributors: [rigor789] +contributors: [rigor789, ikoevska] --- -DockLayout is a layout that provides a docking mechanism for child elements to the `left`, `right`, `top`, `bottom` or center of the layout. To define the docking side of a child element, use its `dock` property. To dock a child element to the center of the DockLayout, it must be the **last child** of the DockLayout and the `stretchLastChild` property of the DockLayout must be set to `true`. +`` is a layout container that lets you dock child elements to the sides or the center of the layoyt. -### Samples +`` has the following behavior: -#### Dock to every side without stretching last child +* Uses the `dock` property to dock its children to the `left`, `right`, `top`, `bottom` or center of the layout.
To dock a child element to the center, it must be the **last child** of the container and you must set the `stretchLastChild` property of the parent to `true`. +* Enforces layout constraints to its children. +* Resizes its children at runtime when its size changes. + +## Examples + +### Dock to every side without stretching the last child + +The following example creates a frame-like layout consisting of 4 elements, position at the 4 edges of the screen. ```html @@ -20,7 +28,9 @@ DockLayout is a layout that provides a docking mechanism for child elements to t ``` -#### Dock to every side with stretching last child +### Dock to every side and stretch the last child + +The following example shows how `stretchLastChild` affects the positioning of child elements in a `DockLayout` container. The last child (`bottom`) is stretched to take up all the remaining space after positioning the first three elements. ```html @@ -32,8 +42,25 @@ DockLayout is a layout that provides a docking mechanism for child elements to t ``` -#### Multiple children on the same side +### Dock to every side and the center + +The following example creates a `` of 5 elements. The first four wrap the center element in a frame. + +```html + + +``` + + +### Dock multiple children to the same side +The following example creates a single line of 4 elements that stretch across the entire height and width of the screen. + ```html