From 0412152e9ea76387b8e4f474283ed369e88c65c9 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 25 Nov 2014 08:33:08 -0700 Subject: [PATCH] docs(): polish wording Thanks @gkalpak --- docs/app/demo/layout/flex-cell.html | 31 -------- .../layout/full-width-header-menu-footer.html | 32 -------- .../layout/horizontal-vertical-layout.html | 35 --------- docs/app/demo/layout/keylines.html | 56 -------------- docs/app/demo/layout/layout-order.html | 31 -------- .../demo/layout/layout-padding-offsets.html | 75 ------------------- .../demo/layout/layout-padding-percents.html | 59 --------------- docs/app/demo/layout/layout-padding.html | 63 ---------------- docs/app/demo/layout/utility-attributes.html | 27 ------- docs/app/js/demoInclude.js | 8 +- docs/app/js/highlight-angular.js | 6 +- docs/app/partials/layout-container.tmpl.html | 2 +- docs/app/partials/layout-options.tmpl.html | 6 +- 13 files changed, 12 insertions(+), 419 deletions(-) delete mode 100644 docs/app/demo/layout/flex-cell.html delete mode 100644 docs/app/demo/layout/full-width-header-menu-footer.html delete mode 100644 docs/app/demo/layout/horizontal-vertical-layout.html delete mode 100644 docs/app/demo/layout/keylines.html delete mode 100644 docs/app/demo/layout/layout-order.html delete mode 100644 docs/app/demo/layout/layout-padding-offsets.html delete mode 100644 docs/app/demo/layout/layout-padding-percents.html delete mode 100644 docs/app/demo/layout/layout-padding.html delete mode 100644 docs/app/demo/layout/utility-attributes.html diff --git a/docs/app/demo/layout/flex-cell.html b/docs/app/demo/layout/flex-cell.html deleted file mode 100644 index 57a61f2dae3..00000000000 --- a/docs/app/demo/layout/flex-cell.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Flex Cell - - - - -
- -
Uno
- -
Dos [flex]
- -
Tres
- -
- -
- -
Uno
- -
Dos [flex]
- -
Tres
- -
- - - diff --git a/docs/app/demo/layout/full-width-header-menu-footer.html b/docs/app/demo/layout/full-width-header-menu-footer.html deleted file mode 100644 index 05a6a009fbc..00000000000 --- a/docs/app/demo/layout/full-width-header-menu-footer.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Full Width, Header, Menu, Footer - - - - -
- Header -
- -
- - - -
- Main [flex] -
- -
- - - - - diff --git a/docs/app/demo/layout/horizontal-vertical-layout.html b/docs/app/demo/layout/horizontal-vertical-layout.html deleted file mode 100644 index 3e3cafa1c52..00000000000 --- a/docs/app/demo/layout/horizontal-vertical-layout.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Horizontal/Vertical Layouts - - - - -
- -
Uno
- -
Dos
- -
- -
- -
Uno
- -
Dos
- -
- -
- -
Uno
- -
Dos
- -
- - - diff --git a/docs/app/demo/layout/keylines.html b/docs/app/demo/layout/keylines.html deleted file mode 100644 index 38e618d65f8..00000000000 --- a/docs/app/demo/layout/keylines.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - Vertical Keylines - - - - - -
- 12:30 -
- -
- ☰ - ☰ -
- -
-

Keylines and Padding Base

-
- -
- content -
- - - diff --git a/docs/app/demo/layout/layout-order.html b/docs/app/demo/layout/layout-order.html deleted file mode 100644 index 903375894dc..00000000000 --- a/docs/app/demo/layout/layout-order.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Layout Order - - - - -
- -
-
Uno
-
- -
-
Dos
-
- -
-
Tres
-
- -
-
Cuatro
-
- -
- - - diff --git a/docs/app/demo/layout/layout-padding-offsets.html b/docs/app/demo/layout/layout-padding-offsets.html deleted file mode 100644 index 244cfffb422..00000000000 --- a/docs/app/demo/layout/layout-padding-offsets.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - Layout Padding Offsets - - - - -
- -
-
Uno [flex][offset-sm="0"][offset="25"]
-
- -
-
Dos [flex]
-
- -
-
Tres [flex]
-
- -
- -
- -
-
Uno [flex]
-
- -
-
Dos [flex][flex-gt-lg="50"][offset-gt-lg="25"]
-
- -
- -
- -
-
Uno [flex="50"][offset="25"]
-
- -
- -
- -
-
Uno [flex]
-
- -
-
Dos [flex][flex-lg="25"][flex-gt-lg="25"]
-
- -
- -
- -
-
Uno [flex]
-
- -
-
Dos [flex="50"]
-
- -
-
Tres [flex]
-
- -
- - - diff --git a/docs/app/demo/layout/layout-padding-percents.html b/docs/app/demo/layout/layout-padding-percents.html deleted file mode 100644 index a5fe7fe14a8..00000000000 --- a/docs/app/demo/layout/layout-padding-percents.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Layout Padding Percents - - - - -
- -
-
Uno [flex="33"]
-
- -
-
Dos [flex]
-
- -
- -
- -
-
Uno [flex="66"]
-
- -
-
Dos [flex]
-
- -
- -
- -
-
Uno [flex]
-
- -
-
Dos [flex]
-
- -
-
Tres [flex]
-
- -
- -
- -
-
Uno [flex][flex-sm="33"][flex-md="66"]
-
- -
- - - diff --git a/docs/app/demo/layout/layout-padding.html b/docs/app/demo/layout/layout-padding.html deleted file mode 100644 index e5f2679bc3a..00000000000 --- a/docs/app/demo/layout/layout-padding.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - Layout Padding - - - - -
- -
-
Uno [flex]
-
- -
-
Dos [flex]
-
- -
-
Tres [flex]
-
- -
-
Cuatro [flex]
-
- -
- -
- -
-
Uno [flex]
-
- -
-
Dos [flex]
-
- -
-
Tres [flex]
-
- -
-
Cuatro [flex]
-
- -
- -
- -
-
Uno [flex]
-
- -
-
Dos [flex]
-
- -
- - - diff --git a/docs/app/demo/layout/utility-attributes.html b/docs/app/demo/layout/utility-attributes.html deleted file mode 100644 index 4038b450efa..00000000000 --- a/docs/app/demo/layout/utility-attributes.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Layout Padding - - - - - - I'm a <span>, but now a block element ;) - - -
- I'm a <div>, but now an inline-block element :P -
- -

- I'm hidden by default, but shown when the small media query is active! -

- -

- I'm shown by default, but hidden when the large media query is active! -

- - - diff --git a/docs/app/js/demoInclude.js b/docs/app/js/demoInclude.js index 7655e4ff7b1..4478d906933 100644 --- a/docs/app/js/demoInclude.js +++ b/docs/app/js/demoInclude.js @@ -13,16 +13,16 @@ function($q, $http, $compile, $templateCache, $timeout) { function postLink(scope, element, attr) { var demoContainer; - // Interpret the expression given as `demo-include="something"` + // Interpret the expression given as `demo-include files="something"` var files = scope.$eval(attr.files) || {}; var ngModule = scope.$eval(attr.module) || ''; $timeout(handleDemoIndexFile); /** - * Fetch the demo's incdex file, and if it contains its own ng-app ngModule - * then bootstrap a new angular app with that ngModule. Otherwise, compile - * the demo into the current demo ng-app. + * Fetch the index file, and if it contains its own ngModule + * then bootstrap a new angular app with that ngModule. Otherwise, compile + * the demo into the current ng-app. */ function handleDemoIndexFile() { files.index.contentsPromise.then(function(contents) { diff --git a/docs/app/js/highlight-angular.js b/docs/app/js/highlight-angular.js index 0221f5d2b84..a62acbabdb3 100644 --- a/docs/app/js/highlight-angular.js +++ b/docs/app/js/highlight-angular.js @@ -46,10 +46,12 @@ DocsApp }); // Make it so each line starts at 0 whitespace - var firstLineWhitespace = lines[0].match(/^\s*/)[0] || ''; + var match = lines[0].match(/^\s*/); + var firstLineWhitespace = match && match[0] || ''; + var startingWhitespaceRegex = new RegExp('^' + firstLineWhitespace); lines = lines.map(function(line) { return line - .replace(new RegExp('^' + firstLineWhitespace), '') + .replace(startingWhitespaceRegex, '') .replace(/\s+$/, ''); }); diff --git a/docs/app/partials/layout-container.tmpl.html b/docs/app/partials/layout-container.tmpl.html index af13cc8cb78..631ddd490cc 100644 --- a/docs/app/partials/layout-container.tmpl.html +++ b/docs/app/partials/layout-container.tmpl.html @@ -15,7 +15,7 @@

Overview

Layout Attribute

- Use the layout attribute on an element to align its children + Use the layout attribute on an element to arrange its children horizontally in a row (layout="row"), or vertically in a column (layout="column").

diff --git a/docs/app/partials/layout-options.tmpl.html b/docs/app/partials/layout-options.tmpl.html index 2a416b6b5a8..cd10dd6cb6a 100644 --- a/docs/app/partials/layout-options.tmpl.html +++ b/docs/app/partials/layout-options.tmpl.html @@ -2,7 +2,7 @@ -
+
I'm above on mobile, and to the left on larger devices.
@@ -70,10 +70,10 @@
-
+
I flex to one-third of the space on mobile, and two-thirds on other devices.
-
+
I flex to two-thirds of the space on mobile, and one-third on other devices.