diff options
| author | Marc Englund <marc@vaadin.com> | 2012-08-29 18:19:21 +0300 |
|---|---|---|
| committer | Marc Englund <marc@vaadin.com> | 2012-08-29 18:19:21 +0300 |
| commit | 269746aa7843e41a7aa4dd3cf9da731dc18a7d43 (patch) | |
| tree | 6542c377886d48c9333ef9d8c7be4fa73f4d503b /tests/sass/resources | |
| parent | cac34cbc8f8ca82c44525985b4b422d89388ca79 (diff) | |
| download | vaadin-framework-269746aa7843e41a7aa4dd3cf9da731dc18a7d43.tar.gz vaadin-framework-269746aa7843e41a7aa4dd3cf9da731dc18a7d43.zip | |
Applied patch fixing #9347 (mixin w/ args + nested blocks), includes test
Diffstat (limited to 'tests/sass/resources')
| -rw-r--r-- | tests/sass/resources/css/mixins.css | 5 | ||||
| -rw-r--r-- | tests/sass/resources/scss/mixins.scss | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/sass/resources/css/mixins.css b/tests/sass/resources/css/mixins.css index cd5c9b85aa..5c727c193b 100644 --- a/tests/sass/resources/css/mixins.css +++ b/tests/sass/resources/css/mixins.css @@ -8,6 +8,11 @@ font-weight: bold; } +.main .details { + font-size: 14px; + font-weight: bold; +} + .footer { border: 2px solid black; -webkit-border-radius: 10px; diff --git a/tests/sass/resources/scss/mixins.scss b/tests/sass/resources/scss/mixins.scss index f16c9a0e06..52e03d62c1 100644 --- a/tests/sass/resources/scss/mixins.scss +++ b/tests/sass/resources/scss/mixins.scss @@ -16,6 +16,7 @@ .main { @include rounded-borders(1px); @include font-settings; + @include main-details(14px); } .footer { @@ -41,4 +42,14 @@ } @include font-settings; } + +@mixin main-details($size){ + .details { + font: { + size : $size; + weight: bold; + } + } +} + @include layout;
\ No newline at end of file |