diff options
author | Jouni Koivuviita <jouni@vaadin.com> | 2012-08-13 08:54:54 +0300 |
---|---|---|
committer | Jouni Koivuviita <jouni@vaadin.com> | 2012-08-13 08:54:54 +0300 |
commit | 6031735017cd2fad28cdf64f4246e6d9914cc3ad (patch) | |
tree | 7ce54cd9b21fd29b425e90833384e1f66f52aa0c /tests/sass/resources/css/parent-import.css | |
parent | 559775efaf0a8f0f9f1ad6246084667732b15a0f (diff) | |
parent | 1fd77ff0d5fc6dee010b5c83acfd5b87b6801264 (diff) | |
download | vaadin-framework-6031735017cd2fad28cdf64f4246e6d9914cc3ad.tar.gz vaadin-framework-6031735017cd2fad28cdf64f4246e6d9914cc3ad.zip |
merge master (sass theme changes)
Diffstat (limited to 'tests/sass/resources/css/parent-import.css')
-rw-r--r-- | tests/sass/resources/css/parent-import.css | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/sass/resources/css/parent-import.css b/tests/sass/resources/css/parent-import.css new file mode 100644 index 0000000000..f67d17f8b4 --- /dev/null +++ b/tests/sass/resources/css/parent-import.css @@ -0,0 +1,25 @@ +.content-navigation { + border-color: #3bbfce; + color: #0000ff; +} + +.border { + padding: 8px; + margin: 8px; + border-color: #3bbfce; +} + +.body { + background-image: url(../folder-test2/bg.png); + background: transparent url(../folder-test2/img/loading-indicator.gif); + background-image: url(http://abc/bg.png); + background-image: url(/abc/bg.png); +} + +.base { + color: red; +} + +.text { + font-weight: bold; +}
\ No newline at end of file |