Skip to content

Commit a75292e

Browse files
author
Dennis Konrad
authored
Merge pull request #3307 from webermaximilian92/feature_add_scss_to_css_compiler
All change requests were taken care of. Multiple approvement are there Merging this onto master
2 parents 3729511 + 5f5ff7e commit a75292e

18 files changed

Lines changed: 20512 additions & 202 deletions

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,7 @@
968968
<exclude>tools/ngui/static/js/lib/*</exclude>
969969
<exclude>tools/transifex/.tx/config</exclude>
970970
<exclude>ui/css/token-input-facebook.css</exclude>
971+
<exclude>ui/css/src/scss/token-input-facebook.scss</exclude>
971972
<exclude>ui/l10n/*</exclude>
972973
<exclude>ui/lib/flot/jquery.colorhelpers.js</exclude>
973974
<exclude>ui/lib/flot/jquery.flot.crosshair.js</exclude>

ui/css/cloudstack3-ie7.css

Lines changed: 3 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/css/cloudstack3.css

Lines changed: 114 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/css/cloudstack3.hu.css

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/css/cloudstack3.ja_JP.css

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/css/custom.css

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)