aboutsummaryrefslogtreecommitdiffstats
path: root/theme-compiler/src/com/vaadin/sass/internal/parser
Commit message (Collapse)AuthorAgeFilesLines
* Remove theme-compiler and replace with external vaadin-sass-compilerJonatan Kronqvist2014-03-3126-19221/+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
* Avoid using toString method to access to SCSS serialized state (#9530).denisanisimov2014-03-139-140/+203
| | | Change-Id: I387ae1bbc960acd5a5a588b38c6791a9c9a90690
* 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
* Function "percentage" is implemented (#12771).denisanisimov2014-02-131-0/+40
| | | Change-Id: I0a2e3d31f60bd085d619b603bd229dba902ff001
* Avoid error in rgb() function if variables are used (#12752).denisanisimov2014-02-132-20/+38
| | | Change-Id: Id51ffef257c193900026a4644eb99dbd3926c668
* Function compilation is refactored (#13253).denisanisimov2014-02-129-25/+379
| | | | Change-Id: Ic3c5d6822d90703d7f02de3d1a3d15fe4366af07
* Merge commit '915c37b569600a8d37db2a0800a30474da49e255' into masterJonatan Kronqvist2014-02-104-246/+293
|\ | | | | | | | | | | | | | | | | 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-067-244/+291
| | | | | | | | 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 commit '37919d14b7509b1c8d8495a3e334d50a913bfe6f' into masterJonatan Kronqvist2014-02-075-733/+836
|\| | | | | | | | | | | | | 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-285-791/+894
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge commit 'a705f8cc3fd5804e828b6647510795dbbb99eaa3' intoMika Murtojarvi2014-02-062-381/+430
|\| | | | | | | | | | | master Change-Id: I163cb7f15a35bc44d9840afa3f35d059e7bf42ee
| * Mixins now accept an empty argument list in parenthesesMika Murtojarvi2013-11-265-358/+407
| | | | | | | | | | | | (#12992). Change-Id: If2484e2f289aa7039984df0d9a73ba595117462c
* | 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
| * Do not generate ParseException as it has been customized (#12937)Artur Signell2013-11-121-168/+169
| | | | | | | | | | | | Reverted ParseException to the previous version Change-Id: Ic89eb4b65d1a78f40c4cb94e9b2a13a3250c1924
| * Regenerated parser files (#12937)Artur Signell2013-11-122-169/+168
| | | | | | | | Change-Id: I03e5f818c932d43be178008a4e857676bfed8f87
* | Use Logger instead of System.out and System.err (#10328,#13300).denisanisimov2014-02-064-14/+31
| | | | | | | | Change-Id: I6a93e763c212eb39d7da9fdbd38f6a8609799c34
* | Revert "Use Logger instead of System.out and System.err (#10328)."Artur Signell2014-02-044-31/+14
| | | | | | | | | | | | This reverts commit a52b0ba902781e5daeffa4f9bc2e48f35eea2c35. Change-Id: I646c6067cd988f7593996642b22db3818f732d25
* | Use Logger instead of System.out and System.err (#10328).denisanisimov2014-02-044-14/+31
| | | | | | Change-Id: Icf53bdb80caf7a6989b90cf5ce83dd328d3e73dd
* | Parser recognizes @content directive inside @media (#13279).denisanisimov2014-02-035-7906/+7076
| | | | | | | | Change-Id: I7fd8868233e9378aaf3725bb202d4b34f3f27713
* | Revert "Theme Parser is deleted, build procedure now generates it (#13161)."Leif Åstrand2014-01-1611-235/+14652
| | | | | | | | | | | | | | | | 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-1511-14652/+235
| | | | | | | | Change-Id: I6e0f797b9eadf9fe796750e2764faf4434494e29
* | clone() method is removed from LexicalUnitImpl (#13182 ).denisanisimov2014-01-141-7/+0
| | | | | | | | Change-Id: I8e32c3ab8b79e31b7fae309a3f475f6fe520bfcc
* | Merge commit 'a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624'Artur Signell2013-11-113-895/+1003
|\| | | | | | | | | | | | | | | 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-085-14252/+12611
| | | | | | | | | | | | | | | | 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-112-215/+297
|\| | | | | | | | | | | | | 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-052-222/+297
| | | | | | | | Change-Id: Ifa844e7bf8add886792b39c016cc2c9aa3d94b0c
* | Merge commit '9d84c091714f01e0088fab2202c10b505e78a607'Artur Signell2013-11-112-12561/+7598
|\| | | | | | | | | | | | | 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-282-72/+79
| | | | | | | | Change-Id: I8964b1732f867cb3c5aa5859d12e94a5978adece
* | A fix for handling nested parentheses in sass (#12833)Mika Murtojarvi2013-11-072-4/+5865
| | | | | | | | | | | | | | | | | | Selectors such as *:not(:lang(fr)) are now allowed. Nested parentheses were identified as the cause of the problem. Now skipping is done to the matching right parenthesis instead of the first right parenthesis. Change-Id: I2e83cac14796b739c6b6550642417b12dab752f2
* | Sass, the handling of selectors containing multiple #-symbols (#12832)Mika Murtojarvi2013-11-064-14185/+12190
| | | | | | | | | | | | | | | | After the first commit, a test case has been downloaded and added to w3ctests. The indentation of a production was also changed in an attempt to more clearly express its meaning. Change-Id: I32356d1fcbafada982a5d3e22f0821e554cc6c8a
* | Merge changes from origin/7.1Leif Åstrand2013-10-223-39/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7ae45c Validate that the connector is enabled before triggering actions for it (#12743) ce89a75 Created constants for tested browser versions (#12786) f9ea9b3 Allow running tests locally by overriding runLocally() (#12786) e70ba25 Added liferay module for building liferay.zip #12748 7c12694 Add sub directory support to sass test scanner (#12790) 39fdf66 Handle numbers in the same way if they do not have a unit (#12732) 6155d61 Disable fallback in a way compatible with Atmosphere JS 2.0.3 (#12241) f401595 Test for pushing large chunks of data (#12567) d41967d Skip compilation of TB2 tests if tests.tb2.skip is set 6c1ba81 Reverted button click() logic check (#12743) 779c8a0 Disable automated testing on Opera until issues are resolved (#12487, #12367, #12800) 962c1c3 Fix compilation error 7ee11a7 Remove unused test super class (#12786) a4211dc Resolve concurrency issue in running TB3 tests 20c28aa Fixed javadoc 0d36896 Add more hax to make test work with new Atmosphere JS (#12241) ed50200 Fix serialization issue (#12703) dd51b7f Added more exception handling to PushHandler (#12578, #11882) 6f76840 Sass variables can now start with underscore (#12716) ab5b20c Ticket #12727 - Panels get unnecessary scroll bars in WebKit when content is 100% wide. 361ad17 Fixed focus issue in TableMoveFocusWithSelectionTest (#12540) ee809e5 Revert broken fix and test (#12446) Change-Id: I71b6e3c2dc6b02845794df0934ba807d7ccac784
| * Sass variables can now start with underscore (#12716)joheriks2013-10-212-31/+11
| | | | | | | | Change-Id: I1c6cb12113f2462f96e8fcfc0749d3f62fd1998c
| * Handle numbers in the same way if they do not have a unit (#12732)Artur Signell2013-10-161-8/+18
| | | | | | | | Change-Id: Ic9dba337ffb209bf73ab427fa3a39e542e645c08
* | Merge changes from origin/7.1Henrik Paul2013-10-182-607/+618
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 377d49e Allow configuring deployment port for TB3 tests 6779857 Updatet servlet tests to follow the same *Test naming convention e1c38bf Avoid obsolete calendar panel renderings to avoid various NPEs. (#12504,#12667) 63f10ec Fixed compilation error in TB3 test 3e593b0 Focus selected row in Table #12540 3c842b7 added small pause to make test pass 1b7e40d Only fetch rows if there are some (#11189) f595d05 Make the various Writers member fields instead of local variables (#12446) 4cb304d Converted broken test to TB3 2aa2fdc Handle ClientMethodInvocation serialization with JSONArray as parameter (#12532) 1449425 Also hide shim iframe of VOverlay on setVisible(false) (#12731) 25fc2f2 Fix whitespace after including a mixin (#12715) c29ca5e Update to atmosphere javascript 2.0.3-vaadin1 (#12241, #12127) f75164f Disable unit cache to avoid compilation issues when switching between branches 6a99730 Allow skipping TB2/TB3 tests using tests.tb2/tb3.skip Change-Id: I5a92798e66575c2cfd1d3f761a5f00af7e83dc64
| * Fix whitespace after including a mixin (#12715)Mika Murtojarvi2013-10-142-607/+618
| | | | | | | | Change-Id: I9b25968cc140a9443820a26eadb6b5a1507ad7ec
* | Merge changes from origin/7.1Leif Åstrand2013-08-303-6073/+6036
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f3e81a Use <code> instead of {@code} for sample containing { and } (#12311) c7a48ae Delay sending DateField popup value to server until popup is closed #6252 dc491a4 Reset waitingForFilteringResponse flag to false inside onBlur (#12325) 4fb775a Fixed a typo in FieldGroup.isModified() JavaDoc. (#12172) aa47197 Add a chapter on installing IvyDE (for #12359) eaec281 GWT requires max 1.6 compiler compliance level currently - #12345 f72be69 Terminate JVM if server.close() has no effect (#12363) 36413cb Make sure that no fileIds are replayed to the client (#12330) 7182665 Fix scrollbar for Window under WebKit browsers (#11994) 61dbe9c Search only remaining message for delimiter (#12404) b5a212a Report min and max times from Profiler (#12409) 7220ca8 Fixed DragAndDropWrapper using wrong drop target in IE8 #12406 c87772b Escape markup in CustomLayout's JavaDoc (#12410) f5b67af Optimize ComputedStyle.getIntProperty() (#12411) 0473036 Add more detailed profiling for some client side hotspots (#12418) 7dfe5ae Fixed test broken by fixes to drag&drop #12406 234ed1c Fixed test broken by PopupDateField communication change #6252 c7a8c3f Fixed failing TabKeyboardNavigation test #12433 fac9ff6 Optimize resetting of state when detaching components (#10899, #11284) af995de Optimize large Vertical/HorizontalLayout client side (#12420, #10899) 39fd5fc Fix bug for spacing on first widget (#12420) bd4442b Fixed broken test due to changes in drop position by #12406 b83240f Optimize CssLayout hierarchy update (#11284) a52b286 Added controlDirective to ifContentStatement. Fixes ticket #12105. 8ce45c7 Disable slow sanity check when not in debug mode (#12463) 232eb42 Enable use of profiler without debug window (#12465) 6dc46c5 Use the add() path of CssLayout only when appending to the end (#11284) bea7fa3 Only consider caption tooltips for own slots (#12469) dce63d1 Allow creating session for Portlet UI init request (#12473) ad669c3 Adds junit to the ide configuration for the theme-compiler module. Change-Id: Icd734d6849cc4f4014e1268f4fabe1ed92f72e38
| * Added controlDirective to ifContentStatement. Fixes ticket #12105.Juho Nurminen2013-08-283-6073/+6036
| | | | | | | | Change-Id: I48988c3f3451ff9fa86148f4bb923a2ebdb6c482
* | Merge changes from origin/7.1Leif Åstrand2013-07-154-10484/+12257
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 419c6c7 Implemented Focusable in MenuBar (#7674) a4f1277 Fixed NPE in ApplicationRunnerServlet (#12145) 08d365a Fixed slider value initialization on HSV and RGB tabs of ColorPicker. (#7863) da480bd Fix VaadinService.findUI to throw Error if UIConstants.UI_ID_PARAMETER is not set (#11943) 6291a50 Ensure that Slider diffstate always contains "value" (#12133) 7e7e698 32x32 favicons added, replacing the old favicons (#12143) 1702059 Replace printStackTrace with getLogger().log() (#12147) b421d6e Updated Javadoc for Table.getColumnAlignment fixing #6810 414e3bf Fixed an error in CustomComponent JavaDoc (#10038), and some improvements. 4583d07 Fix NPE in Like.java (#10167) 6c4da29 Ensure table's cells aren't refreshed if table is detached. (#9138) e37464c #11638: Ending an imported SCSS file with a comment causes an error in the Sass 478eeb5 Test using Jetty 9 (#12124) f7cc72d Close only combobox on escape, not the window (#12163) 9a9b0a5 Automatic test for escape closing window from combobox (#12163) ae565a2 Fix bug in PopupDateField where locale was retained incorrectly if changed while popup was open (#12153) d7a64fd Enable native scrolling in home screen apps on iOS 6+ (#12149) 4a04f00 Add test case for testing ClickEvent after dragging button (#7690) 775c969 Make UploadInterruptedException visible (#12070) 6a4bbe5 Set heartbeat response Content-Type to text/plain (#12182) e4011c6 When InputStream cannot be opened while writing static resource response, display 404 instead of 500 (#10920) 20162db Set current instances when calling UI.push from VaadinSession.unlock (#12168) 94c0f86 Ensure VaadinSession.service is set up by storeInSession (#12204) 23ed487 Attempt to get GAE lock for UIDL requests (#12211) 7f52b2e Improved AbstractClientConnector performance (#12219) a934261 Improving performance of ConnectorTracker (#12218) Change-Id: I810124d60c22d4d0ab837a19eb9c2689951864b5
| * #11638: Ending an imported SCSS file with a comment causes an error inHaijian Wang2013-07-014-10484/+12257
| | | | | | | | | | | | the Sass Change-Id: Ib498f68caa7e87e2d9a21b29c9bfb2f30f35c701
* | Merge changes from origin/7.1Leif Åstrand2013-06-072-7/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2772641 OSGi support for vaadin-push (#11691) 42c4b20 Use "\0" instead of "|" as a push message delimiter (#11692) 778de06 Derive current servlet/portlet from the current service (#11779) f8fb8b7 Upgrade to Atmosphere 1.0.13 (#11861) fea4c5e Don't build and publish sources for package without source files 6a7683b Disable Atmosphere version number check (#11890) ebb92e6 Improve error message if vaadinPush.js failed to load (#11673) 70131cd Extracted common code for number conveters to abstract super class (#11900) 0b63506 Fixed order of parameters in javadoc (#11158) 6bf83a4 Modified the logic in setPropertyDatasource which determines if a new converter is needed (#11863) 53a9c11 Fix TestingPushConnection.init signature (#11673) 05ef43f Updated client-compiler to depend on client-compiler-deps 1.0.2 #11879 9686323 Added isInitialStateChange to StateChangeEvent (#10477) 7cced5e Fixed test which had never passed ada3311 Avoid creating an instance of every view while searching for the correct view (#11722) 5b35dd9 Added text file encoding and line delimiter info (#11907) f8c4f99 Prevent spurious "Could not determine ApplicationConnection" error when using the debug window 8a42394 Fixed locators in test (aria div conflict) 6de01ac Fix text / javascript mismatch issue in Chrome (#11275) f7f1e3e Added Java Date to Sql Date converter to better support sql dates (#11224) 2882cf9 Added Serializable where missing and ignore classes which do not need Serializable 4d7f190 Make access() enqueue the runnable if the session is locked (#11897) 4c2b86d Stop using PlaceHolder widgets in VTabsheet (#11026) 87018cd Add missing license header cb1f63b Send window mode changes to the server immediately (#11737) e52df7c Added ComponentConnector.isAttached (#11928) 2b5ba96 Define how CurrentInstance works with access() (#11897) d345838 Remove ThreadLocal references from CurrentInstance (#11914) bb7b404 Remove outdated testing (#11897) f64d944 Merge "event not reported as target when context clicking in month view" to Vaadin 7.1 (#10217) 51c9fb5 Fix debug window SEVERE style, add styles for FINE, FINER and FINEST (#11891) 3b888fe Support nested SASS imports (#11909) b2137f5 Ensure calendar panel is updated when range changes (#11940) f8319eb Avoid deadlock checking in runPendingAccessTasks() (#11897) 51a98a3 Moved enums to avoid running them as tests 7c613d1 Exclude parsers from checkstyle as they are generated 35f3532 Fixes current text being overwritten in server update on RTA #11741 a744d21 Remove UI.runSafely and VaadinSession.runSafely (#11901) 84edd19 Make test independent of browser language (#11940) a3ad62d Updated to custom build of Smartsprites 0.2.10 which includes a fix for SMARTSPRITES-36 (#9959) a9afca6 Moved Locale data handling to LocaleService (#11378) 5e548ae Fixed javadoc compilation error 91182e2 Extract ProgressBar and deprecate ProgressIndicator (#11925) a5b8209 Add primary style name support for ProgressBar/Indicator (#9913) 86b3689 Make ProgressInidcatorConnector use VProgressIndicator (#11925) 29fcadc Flush the output writer in case of SSE transport as well (#11955) 5e26b0b Fix streaming issue with iOS6 (#11934) 1b274c4 Limit sub window minimum size (#11510) 46cc08b Remove workarounds for broken Timer.cancel in IE (#11872) d850db6 Add XML formatting instructions (#11956) 9a3dc4e Formatted XML files using defined rules (#11956) 57b7335 Fixed spelling mistake in API #11741 587e10b Fix stale info in javadoc for accessSynchronously (#11897) 36fd94a Remove IE6/IE7 permutation (#11954) cccff37 Do not log legacy warnings in JUnit tests (#11963) 0f9b689 Throw exception if VaadinService has not been initialized (#11961) 1ed0980 Move ApplicationConnection.setOverlayContainerLabel to VOverlay (#11965) 0014563 Extracted dialog style to a separate block (#11734) b82e60b Add missing dialog maximize/restore icons for Runo (#11734) 0d046d6 Add a separate debug window section for profiler output (#11950) 03830ae Ignore style resource that has already been added (#11667) 84bf5a7 Enabled drag & drop to Calendar #11048 6c36784 Merge commit '34e6c60a5a746c0306c3a84ae8d6c21dfd84d878' into 7.1 a82d57e Merge changes from origin/7.0 666dbb5 Use window.console instead of just console in vaadinPush to appease IE (#11980) 93751c1 Use correct day names when formatting dates (#6207) 19d0082 Fixed javadoc references e6e752d Correctly decode summaries containing quotes (#11769) 54ed269 Log stack trace using fine when logging toString warnings 8d655f6 Move VaadinSession.runPendingAccessTasks to VaadinService (#11964) b1ab27a Update broadcaster tutorial code e63edcc Update deprecation javadoc for VaadinSession.getBrowser() 132eee5 Add @VaadinServletConfiguration (#11970) aa99259 Send connector debug (highlight) using RPC (#11536) 6d4582e Change analyze layouts to use RPC (#11536) 6f912b1 Rename tests so they are run during build (Abstract* is ignored) ebd4a5c Added missing rpc interface (#11536) edca409 Allow customizing client-side push config on server side (#11867) b0574f7 Add transport parameter to @Push (#11966) Change-Id: I4670c783fec829f81890e2d645d93dd40860b909
| * Support nested SASS imports (#11909)Henri Sara2013-05-282-7/+15
| | | | | | | | Change-Id: I05f88e398e7e28f476d8c0d50b7f9ac54a7cba0b
| * Merge commit 'a52ceb96590333' into 7.1Leif Åstrand2013-05-176-13964/+12610
| |\ | | | | | | | | | | | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: I049a08a5d129b8072bf91554ca0eab0d44e537e3
* | \ Merge commit 'a52ceb9659033'Leif Åstrand2013-05-176-13964/+12610
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: Ibaff127e9717b85461301a82d1e381c40c06b28a
| * Merge commit 'feb9a8c3510afc76c079fafcd9e507205bde139c'Artur Signell2013-04-234-12966/+13014
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: WebContent/release-notes.html theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: Iad9ee95b2f399ff93f0e426a0810b18d923f8ff6
| * | Regenerate SCSS parser classesHenri Sara2013-02-283-14233/+12467
| | | | | | | | | | | | Change-Id: Ifdd08e5fa83f4e7135150517ebdc0e5ac7ffe963
| * | support @content directive for Sass compiler (Ticket #10207)Haijian Wang2013-02-284-1501/+1623
| | | | | | | | | | | | Change-Id: I8037e1d64afd1ce2044d89d3bdcf408f6162727c
| * | support arithmetics in the SCSS compiler (#9354)Haijian Wang2013-02-276-1459/+1755
| | | | | | | | | | | | Change-Id: Ieb7834fb12cdba5c0794a26de20b3c8c2d509642