aboutsummaryrefslogtreecommitdiffstats
path: root/documentation/layout/chapter-layout.asciidoc
diff options
context:
space:
mode:
authorMarko Gronroos <magi@vaadin.com>2016-02-11 19:48:45 +0200
committerMarko Grönroos <magi@vaadin.com>2016-02-22 14:44:58 +0000
commit0dee5602cacb46e1120bc2339464c89bea34ddaa (patch)
treeb05c8b300048054f00cfb4faf318e3e1e05abe53 /documentation/layout/chapter-layout.asciidoc
parent4a4d1532cd2a844051301cc0d8b23a80fa011fd7 (diff)
downloadvaadin-framework-0dee5602cacb46e1120bc2339464c89bea34ddaa.tar.gz
vaadin-framework-0dee5602cacb46e1120bc2339464c89bea34ddaa.zip
Fixed critically broken comment blocks, broken emphasis and escaping, and some other formatting, and moved book preface, chapter structure, and index to the docs repository.
Change-Id: If9299da4415f3181d59b8384e5ac96f940bd5229
Diffstat (limited to 'documentation/layout/chapter-layout.asciidoc')
-rw-r--r--documentation/layout/chapter-layout.asciidoc16
1 files changed, 11 insertions, 5 deletions
diff --git a/documentation/layout/chapter-layout.asciidoc b/documentation/layout/chapter-layout.asciidoc
index 176a29a4fa..4c49bba944 100644
--- a/documentation/layout/chapter-layout.asciidoc
+++ b/documentation/layout/chapter-layout.asciidoc
@@ -1,6 +1,11 @@
[[layout]]
== Managing Layout
+////
+TODO The intro text below is now completely hidden, as this text is
+not visible in web edition and all the text is web-conditional.
+////
+
ifdef::web[]
Ever since the ancient xeroxians invented graphical user interfaces, programmers
have wanted to make GUI programming ever easier for themselves. Solutions
@@ -43,16 +48,17 @@ presentations, such as books and most web pages. Real applications, however,
need to have more control. They need to be able to change the state of user
interface components and even their layout on the run. This creates a need to
separate the presentation from content on exactly the right
-level.////
+level.
+
+////
Vaadin provides a solution for this, using themes and CSS, but let us first look
-at what Java did for UI
-programming.
+at what Java did for UI programming.
////
+
////
Changing the layout steps right on the feet of the graphics designers, so we
have a conflict. We will discuss this conflict later, but let us first look at
-what Java did for UI
-programming.
+what Java did for UI programming.
////
endif::web[]