From 353a1a1c3073975ddc6d0f25d8d2b21b9df94343 Mon Sep 17 00:00:00 2001 From: Jonatan Kronqvist Date: Fri, 28 Mar 2014 12:55:33 +0200 Subject: Remove theme-compiler and replace with external vaadin-sass-compiler * 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 --- theme-compiler/tests/resources/css/comments.css | 15 ------ .../tests/resources/css/compass-import.css | 49 ----------------- .../tests/resources/css/control-directives.css | 51 ------------------ theme-compiler/tests/resources/css/extends.css | 13 ----- theme-compiler/tests/resources/css/functions.css | 19 ------- theme-compiler/tests/resources/css/imports.css | 11 ---- theme-compiler/tests/resources/css/mixins.css | 63 ---------------------- .../tests/resources/css/nested-properties.css | 5 -- theme-compiler/tests/resources/css/nesting.css | 55 ------------------- .../tests/resources/css/parent-import.css | 25 --------- .../tests/resources/css/parent-selector.css | 48 ----------------- theme-compiler/tests/resources/css/var-guarded.css | 4 -- theme-compiler/tests/resources/css/variables.css | 13 ----- 13 files changed, 371 deletions(-) delete mode 100644 theme-compiler/tests/resources/css/comments.css delete mode 100644 theme-compiler/tests/resources/css/compass-import.css delete mode 100644 theme-compiler/tests/resources/css/control-directives.css delete mode 100644 theme-compiler/tests/resources/css/extends.css delete mode 100644 theme-compiler/tests/resources/css/functions.css delete mode 100644 theme-compiler/tests/resources/css/imports.css delete mode 100644 theme-compiler/tests/resources/css/mixins.css delete mode 100644 theme-compiler/tests/resources/css/nested-properties.css delete mode 100644 theme-compiler/tests/resources/css/nesting.css delete mode 100644 theme-compiler/tests/resources/css/parent-import.css delete mode 100644 theme-compiler/tests/resources/css/parent-selector.css delete mode 100644 theme-compiler/tests/resources/css/var-guarded.css delete mode 100644 theme-compiler/tests/resources/css/variables.css (limited to 'theme-compiler/tests/resources/css') diff --git a/theme-compiler/tests/resources/css/comments.css b/theme-compiler/tests/resources/css/comments.css deleted file mode 100644 index 1c773f7974..0000000000 --- a/theme-compiler/tests/resources/css/comments.css +++ /dev/null @@ -1,15 +0,0 @@ -/** 0sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ - -/** 1sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ - -/** 2sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ - -.v-button:focus { - background-image: url(img/left-focus.png);/** sprite-ref: buttons */ - outline: none; -} - -.v-button:focus .v-button-wrap { - background-image: url(img/right-focus.png);/** sprite-ref: buttons; sprite-alignment: right */ - outline: none; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/compass-import.css b/theme-compiler/tests/resources/css/compass-import.css deleted file mode 100644 index e3d4b5fcca..0000000000 --- a/theme-compiler/tests/resources/css/compass-import.css +++ /dev/null @@ -1,49 +0,0 @@ -.content-navigation { - border-color: #3bbfce; - color: #0000ff; -} - -.border { - padding: 8px; - margin: 8px; - border-color: #3bbfce; -} - -.body { - background-image: url(compass/folder-test2/bg.png); - background: transparent url(compass/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; -} - -.footer { - border: 2px solid black; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; -} - -.banner { - border: 1px solid black; - font-color: red; -} - -.interpolation-test { - font-size: 14px; -} - -.header { - width: 100%; -} - -.badError { - border-width: 3px; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/control-directives.css b/theme-compiler/tests/resources/css/control-directives.css deleted file mode 100644 index 83acab53c0..0000000000 --- a/theme-compiler/tests/resources/css/control-directives.css +++ /dev/null @@ -1,51 +0,0 @@ -.puma-icon #animal, .menu { - background-image: url('/images/puma.png'); - font-size: 10px; - font-color: blue; - border: 1px solid; -} - -.sea-slug-icon #animal, .menu { - background-image: url('/images/sea-slug.png'); - font-size: 10px; - font-color: blue; - border: 1px solid; -} - -.egret-icon #animal, .menu { - background-image: url('/images/egret.png'); - font-size: 10px; - font-color: blue; - border: 1px solid; -} - -.salamander-icon #animal, .menu { - background-image: url('/images/salamander.png'); - font-size: 10px; - font-color: blue; - border: 1px solid; -} - -.trueIf { - border: 1px solid; -} - -.falseIf { - border: 1px solid; -} - -.falseIfTrueElse { - border: 1px solid; -} - -.cube-icon { - background-image: url('/images/cube.png'); -} - -.triangle-icon { - background-image: url('/images/triangle.png'); -} - -.circle-icon { - background-image: url('/images/circle.png'); -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/extends.css b/theme-compiler/tests/resources/css/extends.css deleted file mode 100644 index d1c903f166..0000000000 --- a/theme-compiler/tests/resources/css/extends.css +++ /dev/null @@ -1,13 +0,0 @@ -.error, .badError { - border: 1px #f00; - background: #fdd; -} - -.error.intrusion, .badError.intrusion { - font-size: 1.3em; - font-weight: bold; -} - -.badError { - border-width: 3px; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/functions.css b/theme-compiler/tests/resources/css/functions.css deleted file mode 100644 index 4486599450..0000000000 --- a/theme-compiler/tests/resources/css/functions.css +++ /dev/null @@ -1,19 +0,0 @@ -.main { - margin: 2px; - border: 11px; - border: 10px; - border: 10px; - color: hsl(0, 0%, 30%); - color: hsl(25, 100%, 50%); - color: rgb(36, 0, 0); - color: rgb(240, 0, 0); - color: #240000; - color: #200; - color: #f00000; - color: #f00; - color: hsl(33, 7%, 89%); - color: hsl(33, 7%, 95%); - color: rgb(1, 2, 3); - percents: -20%; - percents: 33.33%; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/imports.css b/theme-compiler/tests/resources/css/imports.css deleted file mode 100644 index 5b1001802a..0000000000 --- a/theme-compiler/tests/resources/css/imports.css +++ /dev/null @@ -1,11 +0,0 @@ -.caption { - border: 1px solid black; - background: #ff0000; - padding: 10px; - margin: 10px; -} - -.text { - font-weight: bold; - color: red; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/mixins.css b/theme-compiler/tests/resources/css/mixins.css deleted file mode 100644 index d0cf0b3d1d..0000000000 --- a/theme-compiler/tests/resources/css/mixins.css +++ /dev/null @@ -1,63 +0,0 @@ -.main { - border: 1px solid black; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - font-family: arial; - font-size: 16px; - font-weight: bold; -} - -.main .details { - font-size: 14px; - font-weight: bold; -} - -.footer { - border: 2px solid black; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; -} - -.banner { - border: 1px solid black; - font-color: red; -} - -.interpolation-test { - font-size: 14px; -} - -.header { - width: 100%; -} - -.main { - width: 100%; - height: 100%; -} - -.footer { - width: 100%; -} - -@media print { - .v-view { - overflow: visible; - } -} - -font-family: arial; - -font-size: 16px; - -font-weight: bold; - -.default .default-inner { - color: green; -} - -.custom .custom-inner { - color: green; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/nested-properties.css b/theme-compiler/tests/resources/css/nested-properties.css deleted file mode 100644 index 79b21e632b..0000000000 --- a/theme-compiler/tests/resources/css/nested-properties.css +++ /dev/null @@ -1,5 +0,0 @@ -li { - font-family: serif; - font-weight: bold; - font-size: 1.2em; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/nesting.css b/theme-compiler/tests/resources/css/nesting.css deleted file mode 100644 index e1cdf3a579..0000000000 --- a/theme-compiler/tests/resources/css/nesting.css +++ /dev/null @@ -1,55 +0,0 @@ -.top-bar { - color: red; -} - -.top-bar .alt { - color: blue; -} - -.menu { - background-color: red; -} - -.menu a { - color: blue; -} - -.caption { - padding: 10px; -} - -.caption .text, .caption .header { - color: green; -} - -.footer { - padding: 10px; -} - -.footer .left, .footer .right { - color: purple; -} - -.footer .left a, .footer .right a { - color: orange; -} - -.main { - color: red; -} - -.main .second.third { - color: blue; -} - -.main .second.third .fourth { - color: black; -} - -.root .first-block .nested { - order: first; -} - -.root .last-block { - order: last; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/parent-import.css b/theme-compiler/tests/resources/css/parent-import.css deleted file mode 100644 index f67d17f8b4..0000000000 --- a/theme-compiler/tests/resources/css/parent-import.css +++ /dev/null @@ -1,25 +0,0 @@ -.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 diff --git a/theme-compiler/tests/resources/css/parent-selector.css b/theme-compiler/tests/resources/css/parent-selector.css deleted file mode 100644 index 2a73313f0c..0000000000 --- a/theme-compiler/tests/resources/css/parent-selector.css +++ /dev/null @@ -1,48 +0,0 @@ -a { - font-weight: bold; - text-decoration: none; -} - -a .sub { - color: blue; -} - -a:hover { - text-decoration: underline; -} - -body.firefox a { - font-weight: normal; -} - -#main { - color: black; -} - -#main a { - font-weight: bold; -} - -#main a:hover { - color: red; -} - -.mixin-parent:hover { - color: blue; -} - -.part.one, .part.two, .part .non-parent { - color: blue; -} - -.root .part.one, .root .part .non-parent, .root .part2.one, .root .part2 .non-parent { - color: blue; -} - -.root2 .part .one, .root2 .part .non-parent, .root2 .part2 .one, .root2 .part2 .non-parent { - color: blue; -} - -.drop-parent-reference { - color: green; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/var-guarded.css b/theme-compiler/tests/resources/css/var-guarded.css deleted file mode 100644 index c4a8c49d12..0000000000 --- a/theme-compiler/tests/resources/css/var-guarded.css +++ /dev/null @@ -1,4 +0,0 @@ -#main { - content: "First content"; - new-content: "First time reference"; -} \ No newline at end of file diff --git a/theme-compiler/tests/resources/css/variables.css b/theme-compiler/tests/resources/css/variables.css deleted file mode 100644 index ae5ac5e01c..0000000000 --- a/theme-compiler/tests/resources/css/variables.css +++ /dev/null @@ -1,13 +0,0 @@ -.content-navigation { - border-color: #3bbfce; - color: #0000ff; - color1: #0000d1; - font-family: Arial, Helvetica, "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - font-size: 12px; -} - -.border { - padding: 8px; - margin: 8px; - border-color: #3bbfce; -} \ No newline at end of file -- cgit v1.2.3