mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Sass Number parsing bug fixed.
git-svn-id: svn://hamptoncatlin.com/haml/trunk@365 7063305b-7217-0410-af8c-cdc13e5119b9
This commit is contained in:
parent
ab270247d9
commit
71397ced0c
3 changed files with 3 additions and 2 deletions
|
@ -6,7 +6,7 @@ require 'sass/constant/color'
|
|||
|
||||
class Sass::Constant::Literal
|
||||
# The regular expression matching numbers.
|
||||
NUMBER = /^(-?[0-9]*?\.?)([0-9]+)([^0-9]*)$/
|
||||
NUMBER = /^(-?[0-9]*?\.?)([0-9]+)([^0-9\s]*)$/
|
||||
|
||||
# The regular expression matching colors.
|
||||
COLOR = /^\#(#{"[0-9a-fA-F]" * 3}|#{"[0-9a-fA-F]" * 6})/
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#main { content: Hello!; qstr: Quo"ted"!; hstr: Hyph-en!; width: 30em; background-color: #000; color: #ffffaf; con: foo bar 9 hi there boom; }
|
||||
#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10+12; many: 6; order: 7; complex: #4c9db1hi16; }
|
||||
|
||||
#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #bcbcbc; str-str: hi there; str-str2: hi there; str-num: times: 13; col-num: #ff8aaa; col-col: #5f80ff; }
|
||||
#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #bcbcbc; str-str: hi there; str-str2: hi there; str-col: 14em solid #1f2f3f; str-num: times: 13; col-num: #ff8aaa; col-col: #5f80ff; }
|
||||
|
||||
#minus { num-num: 900; col-num: #f9f9f4; col-col: #000035; }
|
||||
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
:str
|
||||
:str= hi + \ there
|
||||
:str2= hi + " there"
|
||||
:col= "14em solid " + #123
|
||||
:num= times:\ + 13
|
||||
:col
|
||||
:num= #f02 + 123.5
|
||||
|
|
Loading…
Add table
Reference in a new issue