diff options
| author | Chris Rebert <code@chrisrebert.com> | 2015-08-21 10:42:21 +0300 |
|---|---|---|
| committer | Chris Rebert <code@chrisrebert.com> | 2015-08-21 10:44:50 +0300 |
| commit | b388fe1820bdc597c98190abb8dea8178023194c (patch) | |
| tree | 60f13c72add98f8ed73b3f6351ee4c1fc9712f3a | |
| parent | f3aa40ebc802c8589b94e49173220bfc89134474 (diff) | |
Fix code and message parts of #27
Closes #27
| -rw-r--r-- | src/main/scala/com/getbootstrap/rorschach/auditing/ModifiedFilesAuditor.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/scala/com/getbootstrap/rorschach/auditing/ModifiedFilesAuditor.scala b/src/main/scala/com/getbootstrap/rorschach/auditing/ModifiedFilesAuditor.scala index 65803c1..4e938cf 100644 --- a/src/main/scala/com/getbootstrap/rorschach/auditing/ModifiedFilesAuditor.scala +++ b/src/main/scala/com/getbootstrap/rorschach/auditing/ModifiedFilesAuditor.scala @@ -5,6 +5,7 @@ object ModifiedFilesAuditor { def isDist: Boolean = filepath.startsWith("dist/") def isNonMinifiedCss: Boolean = filepath.endsWith(".css") && !filepath.endsWith(".min.css") def isSourceLess: Boolean = filepath.startsWith("less/") && filepath.endsWith(".less") + def isSourceScss: Boolean = filepath.startsWith("scss/") && filepath.endsWith(".scss") def isNonMinifiedJs: Boolean = filepath.endsWith(".js") && !filepath.endsWith(".min.js") def isDistCss: Boolean = filepath.isDist && filepath.isNonMinifiedCss def isDistJs: Boolean = filepath.isDist && filepath.isNonMinifiedJs @@ -21,8 +22,9 @@ object ModifiedFilesAuditor { private def auditCss(filepaths: Set[String]): Option[String] = { val cssModified = filepaths.exists{ _.isDistCss } val lessModified = filepaths.exists{ _.isSourceLess } - if (cssModified && !lessModified) { - Some("[Changes must be made to the original Less source code file(s), not just the compiled CSS file(s).](https://github.com/twbs/rorschach/blob/master/docs/css.md)") + val scssModified = filepaths.exists{ _.isSourceScss } + if (cssModified && !lessModified && !scssModified) { + Some("[Changes must be made to the original Sass or Less source code file(s), not just the compiled CSS file(s).](https://github.com/twbs/rorschach/blob/master/docs/css.md)") } else { None |