Skip to content

Commit aa2fe5c

Browse files
committed
Merge branch 'flexdoc'
2 parents 22bfe79 + aafcaa5 commit aa2fe5c

File tree

287 files changed

+234929
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+234929
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.DS_Store
2+
__pycache__/

content/css/fixed-width.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
ol ol, ol ul { margin-left: 1em; }
1414
ul ul li, ul ol li,
1515
ol ol li, ol ul li { margin-left: 2em; }
16-
li { line-height: 18px; list-style-position: inside; padding-left: 20px }
16+
li { line-height: 18px; margin-left: 20px; padding-left: 6px }
1717
ul.large li { line-height: 21px; }
1818
li p { line-height: 21px; }
1919
ul {list-style: circle; }

content/css/style.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,3 +1428,9 @@ a,a:visited {color: #33F; text-decoration: none; outline: 0; -webkit-transition:
14281428
------------------------- */
14291429
#wrapper .row-fluid .span3 { margin-bottom: 2.564102564102564%; }
14301430
a.btn.btn-inverse:visited { color: #2da4d2; }
1431+
1432+
/* found in "using flex" documentation */
1433+
div.note {
1434+
padding: 0;
1435+
margin: 0 0 10px;
1436+
}

content/doc-getstarted.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ The complete code listing is (there may be some variations, depending on your ID
9797

9898
<div class="headline"><h4>Additional Resources</h4></div>
9999

100+
* Read through the [Using Flex][15] documentation for a comprehensive guide that teaches you how to use Flex.
100101
* Make sure to check out our video and screencast library on the [videos page][5].
101102
* There are a large variety of books available online. One of our favorites is from Michael Labriola and Jeff Tapper (both Apache Flex Committers). [Amazon Link to book][6]
102103
* There are quite a few people that blog about Flex. Check out the [official blog of Apache Flex][14], [FlashDaily.net][7] and [Adobe Feeds for Apache Flex][9]
@@ -114,4 +115,5 @@ The complete code listing is (there may be some variations, depending on your ID
114115
[11]: https://www.flashdevelop.org/
115116
[12]: https://vimeo.com/46898669
116117
[13]: https://fdt.powerflasher.com/
117-
[14]: https://blogs.apache.org/flex/
118+
[14]: https://blogs.apache.org/flex/
119+
[15]: doc/flex/using/index.html

content/doc/flex/using/NOTICE

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Apache Flex “Using Flex” Documentation
2+
Copyright 2015 The Apache Software Foundation
3+
4+
The initial creators of the documentation is Adobe
5+
Systems Incorporated (http://www.adobe.com/).
6+
Copyright 2003 - 2012 Adobe Systems Incorporated. All Rights Reserved.

content/doc/flex/using/flx_about_dataproviders_ab.html

Lines changed: 3939 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)