summaryrefslogtreecommitdiffstats
path: root/theme-compiler
Commit message (Collapse)AuthorAgeFilesLines
* Remove theme-compiler and replace with external vaadin-sass-compilerJonatan Kronqvist2014-03-311834-49886/+0
| | | | | | | | | | | | | * Moves CompileTheme from the theme-compiler to buildhelpers * Refactors CompileTheme to get the Vaadin version on the command line instead of using the Version class found in vaadin-shared * Refactors build scripts to pass the version number on the command line when running CompileTheme * Removes the theme-compiler module/project/whatchamacallit * Replaces the theme-compiler dependency with vaadin-sass-compiler 0.9.0 from maven Change-Id: I4f98d15b60e18a826bf264eb55d12b3e736e8e54
* Fixed pom fails in unit tests.Sauli Tähkäpää2014-03-251-1/+3
| | | | Change-Id: I0acbde16576dc26c36031038fe905695581c682d
* Revert "Use Guava 16 which does not have compatibility issues"Artur Signell2014-03-131-1/+0
| | | | | | | | Turns out Smartsprites uses Closeables.closeQuietly which is deprecated in 15 and removed in Guava 16 This reverts commit 1159db580f350493ffcf6628c05924458881ebb2. Change-Id: Ica9b4e175041b00a15a320b7c3fcea5b6d42b349
* Avoid using toString method to access to SCSS serialized state (#9530).denisanisimov2014-03-1337-286/+532
| | | Change-Id: I387ae1bbc960acd5a5a588b38c6791a9c9a90690
* Use Guava 16 which does not have compatibility issuesArtur Signell2014-03-121-0/+1
| | | | Change-Id: I721aad96dfec12c0b053c75707870207ccf049be
* Resolves a case where a missing semicolon was not inferred (#12792)Mika Murtojarvi2014-03-106-903/+874
| | | | | | | A rule used in includeDirective has been rewritten so that it is called when it may be needed. Change-Id: I6705f478a40727984b644cd2da96a7aae03b7a99
* Remove an empty line from a Sass test case.Mika Murtojarvi2014-03-061-1/+1
| | | | | | | The blank line caused a test failure, because some Sass tests are currently very strict about the expected output. Change-Id: Id01818eca1da3310557c86a4aeb09f7dc23bcf70
* Merge changes from origin/7.1Build Agent2014-02-271-0/+1
|\ | | | | | | | | | | | | | | | | | | | | badf9f2 Do not prevent deployment if Atmosphere init fails (#13199) be827f8 Enable on-the-fly SASS compilation in OSGi (#10307) 61a1899 Fix SQLContainer paging and caching issue (#11199) 19dde49 Remove applet test which does not work reliably a73c9ef Fix broken TableScrollingWithSQLContainer test UI fbce127 Use Chrome 33 for testing Change-Id: I4a09cdfcc8187604a24391a73ea6c04c6d50bb5f
| * Enable on-the-fly SASS compilation in OSGi (#10307)Johannes Dahlström2014-02-241-0/+1
| | | | | | | | | | | | | | * Add proper Import-Package directives to theme-compiler * Require-Bundle theme-compiler in server bundle Change-Id: I7dec20c04eac92271b8adf0b1e23c573f1b06a29
| * Implement parenthesis-handling fixes for Sass in Vaadin 7.1 (#12834)Mika Murtojarvi2014-02-133-8/+63
| | | | | | | | | | | | | | | | These are the same changes that were done for the master-branch in (#12833). Change-Id: I397028c7b0ba06567adaad9f0f0095157f7ae8f9 Merge: no
* | Function "percentage" is implemented (#12771).denisanisimov2014-02-134-3/+47
| | | | | | Change-Id: I0a2e3d31f60bd085d619b603bd229dba902ff001
* | Avoid error in rgb() function if variables are used (#12752).denisanisimov2014-02-135-23/+46
| | | | | | Change-Id: Id51ffef257c193900026a4644eb99dbd3926c668
* | Move passing Sass tests from sasslangbroken to sasslang.Mika Murtojarvi2014-02-1212-0/+0
| | | | | | | | Change-Id: Iac66afbcc2e0e1bdeb417bfe8292f57e4d2287df
* | Function compilation is refactored (#13253).denisanisimov2014-02-129-25/+379
| | | | | | | | Change-Id: Ic3c5d6822d90703d7f02de3d1a3d15fe4366af07
* | Merge commit '915c37b569600a8d37db2a0800a30474da49e255' into masterJonatan Kronqvist2014-02-108-254/+334
|\| | | | | | | | | | | | | | | | | 915c37b Sass compiler now treats null-valued variables as unassigned (#12430). Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: If9789f8d0638377d27e77ec4be0fdf0f96e4b1af
| * Sass compiler now treats null-valued variables as unassigned (#12430).Mika Murtojarvi2014-02-0611-252/+332
| | | | | | | | Change-Id: I13a11b4c7d148646ad3eb5492d9dd8d736e63f39
* | Merge commit '3bfd0046eaead75e6b8cac7dc7b2d1ecceb25dc9' into masterJonatan Kronqvist2014-02-102-428/+406
|\| | | | | | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: I6516a1f73cd2fb363407d9301f497b2e63bb92f9
| * Resolved ambiguous parsing of ";" within @media block (#12923)joheriks2014-01-302-476/+454
| | | | | | | | | | | | Also infer missing semicolon before EOF (required for @debug and @warn at end of file) Change-Id: Ib4449a3b8d79ce1b35732d4a33a1a30530bfc91a
* | Merge changes from origin/7.1Jonatan Kronqvist2014-02-073-5/+34
|\| | | | | | | | | | | | | | | | | | | 5b56eeb Changed the rendering order of TabSheet tabs to prevent an NPE in isClipped (#12343) 9026cef Make VTreeTableScrollBody extendable (#13054) b5a080c Provides error location for ArithmeticException. (#11877) a494133 Fixed TabSheet tab bar sizing by removing an obsolete Safari hack (#12343) 1dd2ed3 Changes padding for Textfields with Chameleon theme. (#12974) Change-Id: I44e168176753ed4228002ac11fbd214ee369131a
| * Provides error location for ArithmeticException. (#11877)Felype Santiago Ferreira2013-12-103-5/+34
| | | | | | | | Change-Id: Ieb63ad556c3dc01196f0b9898aed9670923c9138
* | Merge commit '37919d14b7509b1c8d8495a3e334d50a913bfe6f' into masterJonatan Kronqvist2014-02-0765-745/+840
|\| | | | | | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: I9e169d9c04998f9e7dc05953d51cd76348dd810c
| * For @-directives, infer missing semicolon before closing brace (#12792)joheriks2013-11-2869-803/+898
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Parser now accepts the following (note missing semicolon after last @extend-directive): xyzzy { @extend foo ; @extend bar } As a consequence, moved 31 sasslang-cases from broken to fixed. Moved two tests from fixed to broken (34, 95, previously passed accidentally) Change-Id: I8968074abd79dec71be762ed926cc6f37fbcaa99
| * Move a sass test that no longer fails.Mika Murtojarvi2013-11-272-0/+0
| | | | | | | | Change-Id: Ic83330cbea688be1c30aa89cad9524016617be8d
| * Move working sass tests from sasslangbroken to sasslang.Mika Murtojarvi2013-11-274-0/+0
| | | | | | | | Change-Id: Ic503021884fd52b650f29df221cef3e69e8ef570
* | Merge commit 'a705f8cc3fd5804e828b6647510795dbbb99eaa3' intoMika Murtojarvi2014-02-064-381/+430
|\| | | | | | | | | | | master Change-Id: I163cb7f15a35bc44d9840afa3f35d059e7bf42ee
| * Mixins now accept an empty argument list in parenthesesMika Murtojarvi2013-11-267-358/+450
| | | | | | | | | | | | (#12992). Change-Id: If2484e2f289aa7039984df0d9a73ba595117462c
* | Move Sass test files to the correct locations.Mika Murtojarvi2014-02-062-0/+0
| | | | | | | | Change-Id: Ie2c8b77420ea1f20471093479d57fcc2f484685c
* | Merge changes from origin/7.1Jonatan Kronqvist2014-02-061-30/+76
|\| | | | | | | | | | | f4fa4e8 Normalize line endings Change-Id: I48ccf40262eb600b4cbc45e49abb5d5a6258b2db
| * Normalize line endingsMika Murtojarvi2013-11-261-30/+76
| | | | | | | | Change-Id: I328a1d3505471c65681dccdaa1a342dbb9c9ab37
* | Use Logger instead of System.out and System.err (#10328,#13300).denisanisimov2014-02-0617-57/+186
| | | | | | | | Change-Id: I6a93e763c212eb39d7da9fdbd38f6a8609799c34
* | Revert "Use Logger instead of System.out and System.err (#10328)."Artur Signell2014-02-0417-185/+57
| | | | | | | | | | | | This reverts commit a52b0ba902781e5daeffa4f9bc2e48f35eea2c35. Change-Id: I646c6067cd988f7593996642b22db3818f732d25
* | Use Logger instead of System.out and System.err (#10328).denisanisimov2014-02-0417-57/+185
| | | | | | Change-Id: Icf53bdb80caf7a6989b90cf5ce83dd328d3e73dd
* | Parser recognizes @content directive inside @media (#13279).denisanisimov2014-02-038-7906/+7109
| | | | | | | | Change-Id: I7fd8868233e9378aaf3725bb202d4b34f3f27713
* | Fix false-negative sasslangbroken tests (#13275).denisanisimov2014-01-304-0/+0
| | | | | | | | Change-Id: I184418667c1de63cbdbc26d75f2268415a8f06f9
* | Some tests are fixed on Win (CRLF issue).denisanisimov2014-01-282-0/+8
| | | | | | | | Change-Id: I057bae0fd4068c6b877abdb9546ebf1490339d86
* | Revert "Theme Parser is deleted, build procedure now generates it (#13161)."Leif Åstrand2014-01-1628-270/+14673
| | | | | | | | | | | | | | | | Causes a multitude of compile errors on the build server. This reverts commit d2874fde4b8c6afa24f0f6535e0d6fcabc489f51. Change-Id: I49787b347944b614b9e98778b3219b7045cf2bfe
* | Theme Parser is deleted, build procedure now generates it (#13161).denisanisimov2014-01-1528-14673/+270
| | | | | | | | Change-Id: I6e0f797b9eadf9fe796750e2764faf4434494e29
* | clone() method is removed from LexicalUnitImpl (#13182 ).denisanisimov2014-01-141-7/+0
| | | | | | | | Change-Id: I8e32c3ab8b79e31b7fae309a3f475f6fe520bfcc
* | Merge changes from origin/7.1Johannes Dahlström2013-11-292-3/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84521fa Use correct type for UIDL value to avoid development mode problems (#12545) 3680505 Ensure generated parser is re-generated during build (#12937) f3fa6af Regenerated parser files (#12937) 011a2a0 Do not generate ParseException as it has been customized (#12937) 9be3b40 Workaround for missing value change event in chrome (#10109) 48034f6 Ensure alternate text is still visible (#11780) cbc9949 Added test case for #12726 07b1a9d Prevents accidental selection of window caption or content. (#12726) e05e10e Added extra asserts to make test more safer to blind refactorings 33e5897 Use localhost when running locally to avoid potential network issues 642818f Allow using @RunLocally to run on a local Firefox/Chrome/Safari 81a1c29 Revert "Fixed lost scrollLeft when row count changed in Table (#12652)." dde6a48 Output test results in XML reports instead of to standard output 012e649 Fix TB3 local testing and occasionally failing SliderDisableTest. Change-Id: I4f4e44e887e7e90dd04e6d7381280a997e9527cc
| * Do not generate ParseException as it has been customized (#12937)Artur Signell2013-11-122-169/+170
| | | | | | | | | | | | Reverted ParseException to the previous version Change-Id: Ic89eb4b65d1a78f40c4cb94e9b2a13a3250c1924
| * Regenerated parser files (#12937)Artur Signell2013-11-122-169/+168
| | | | | | | | Change-Id: I03e5f818c932d43be178008a4e857676bfed8f87
| * Ensure generated parser is re-generated during build (#12937)Artur Signell2013-11-122-3/+40
| | | | | | | | | | | | | | | | Ultimately we should remove Parser.java and other generated files from the project but this still needs tweaking ide.xml somehow so the parser is built. Change-Id: Iac491c6a50c87e1e8e0bb2f612e82186319a6de3
* | Merge changes from origin/7.1Artur Signell2013-11-112-0/+26
|\| | | | | | | | | | | | | | | | | | | 30e9b7c Add a test for @mixin { @font-face {...} } (#11649) 0a2cf2c Prevent showing "Session Expired" notification if navigating away (#12298) 8efc385 Fixes NPE in TreeTable.setContainerDS(null) (#12928) 23815e6 Remove broken JSch check c308d8a Fixes double scrollbar issue in browserframes (#11780) Fixed by adding font-size 0 to the base theme. Change-Id: I64ae167e8e6b61205718998b80d534fb2cf0cb3d
| * Add a test for @mixin { @font-face {...} } (#11649)joheriks2013-11-082-0/+26
| | | | | | | | Change-Id: I7d089ea14b169481f943a1f44058ad47f9b8179a
* | Merge commit 'a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624'Artur Signell2013-11-1112-904/+1049
|\| | | | | | | | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj Change-Id: I3421c2d5c114765e924d7847cee46ebd370dfca6
| * Fixes for sass compiler, handling mixins (#11288).Mika Murtojarvi2013-11-0814-14261/+12657
| | | | | | | | | | | | | | | | Keyframe selectors can now be comma-separated lists, interpolation unquotes a quoted string and the parameters of an @include are no longer lost. Change-Id: I2622aca7471adc8004371affbb803d850e801307
* | Merge commit 'a2f255448e6a755892a97b7df9fc2b65efc5dccc'Artur Signell2013-11-114-215/+306
|\| | | | | | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: I6b295f9225785eb6bf07bf2cd2d5c1c3bc181afc
| * Allow @font-face and general @-directives inside @if-blocks (#11649)joheriks2013-11-054-222/+306
| | | | | | | | Change-Id: Ifa844e7bf8add886792b39c016cc2c9aa3d94b0c
* | Merge commit '9d84c091714f01e0088fab2202c10b505e78a607'Artur Signell2013-11-114-12561/+7604
|\| | | | | | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: Ie23f14975f693c666d932d7ca1c07c980a5ba08a
| * Parser stripped minus of negative numbers with unknown units (#12811)joheriks2013-10-284-72/+85
| | | | | | | | Change-Id: I8964b1732f867cb3c5aa5859d12e94a5978adece