mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Merge branch 'stable'
Conflicts: lib/haml.rb lib/sass/engine.rb
This commit is contained in:
commit
b4372003e7
1 changed files with 12 additions and 12 deletions
24
lib/haml.rb
24
lib/haml.rb
|
@ -136,7 +136,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
|
|||
#
|
||||
# is compiled to:
|
||||
#
|
||||
# <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"></html>
|
||||
# <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'></html>
|
||||
#
|
||||
# Attribute hashes can also be stretched out over multiple lines
|
||||
# to accomidate many attributes.
|
||||
|
@ -166,7 +166,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
|
|||
#
|
||||
# This is compiled to:
|
||||
#
|
||||
# <html lang='fr-fr' xml:lang='fr=fr' xmlns='http://www.w3.org/1999/xhtml'>
|
||||
# <html lang='fr-fr' xml:lang='fr-fr' xmlns='http://www.w3.org/1999/xhtml'>
|
||||
# </html>
|
||||
#
|
||||
# You can use as many such attribute methods as you want
|
||||
|
@ -207,7 +207,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
|
|||
# In XHTML, the only valid value for these attributes is the name of the attribute.
|
||||
# Thus this will render in XHTML as
|
||||
#
|
||||
# <input selected="selected">
|
||||
# <input selected='selected'>
|
||||
#
|
||||
# To set these attributes to false, simply assign them to a Ruby false value.
|
||||
# In both XHTML and HTML
|
||||
|
@ -245,8 +245,8 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
|
|||
#
|
||||
# is compiled to:
|
||||
#
|
||||
# <div class="greeting_crazy_user" id="greeting_crazy_user_15">
|
||||
# <bar class="fixnum" id="fixnum_581" />
|
||||
# <div class='greeting_crazy_user' id='greeting_crazy_user_15'>
|
||||
# <bar class='fixnum' id='fixnum_581' />
|
||||
# Hello!
|
||||
# </div>
|
||||
#
|
||||
|
@ -313,11 +313,11 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
|
|||
#
|
||||
# is compiled to:
|
||||
#
|
||||
# <div id="content">
|
||||
# <div class="articles">
|
||||
# <div class="article title">Doogie Howser Comes Out</div>
|
||||
# <div class="article date">2006-11-05</div>
|
||||
# <div class="article entry">
|
||||
# <div id='content'>
|
||||
# <div class='articles'>
|
||||
# <div class='article title'>Doogie Howser Comes Out</div>
|
||||
# <div class='article date'>2006-11-05</div>
|
||||
# <div class='article entry'>
|
||||
# Neil Patrick Harris would like to dispel any rumors that he is straight
|
||||
# </div>
|
||||
# </div>
|
||||
|
@ -481,7 +481,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
|
|||
#
|
||||
# is compiled to:
|
||||
#
|
||||
# <?xml version="1.0" encoding="utf-8" ?>
|
||||
# <?xml version='1.0' encoding='utf-8' ?>
|
||||
# <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
# <html>
|
||||
# <head>
|
||||
|
@ -521,7 +521,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
|
|||
#
|
||||
# is compiled to:
|
||||
#
|
||||
# <?xml version="1.0" encoding="iso-8859-1" ?>
|
||||
# <?xml version='1.0' encoding='iso-8859-1' ?>
|
||||
#
|
||||
# ==== /
|
||||
#
|
||||
|
|
Loading…
Add table
Reference in a new issue