Browse Source

Integrate grunt-scss-lint and fixes some scss for warning by lint check

pull/663/head
Daijiro Wachi 10 years ago
parent
commit
d4901d3ec5
  1. 2
      .travis.yml
  2. 9
      Gruntfile.js
  3. 2
      dist/css/ratchet-theme-android.css
  4. 2
      dist/css/ratchet-theme-android.min.css
  5. 2
      dist/css/ratchet-theme-ios.css
  6. 2
      dist/css/ratchet-theme-ios.min.css
  7. 4
      docs/assets/css/docs.css
  8. 2
      docs/assets/css/docs.min.css
  9. 2
      docs/dist/css/ratchet-theme-android.css
  10. 2
      docs/dist/css/ratchet-theme-android.min.css
  11. 2
      docs/dist/css/ratchet-theme-ios.css
  12. 2
      docs/dist/css/ratchet-theme-ios.min.css
  13. 1
      package.json
  14. 116
      sass/.scss-lint.yml
  15. 4
      sass/docs.scss
  16. 8
      sass/theme-android.scss
  17. 4
      sass/theme-ios.scss

2
.travis.yml

@ -6,7 +6,7 @@ before_install:
install: install:
- travis_retry npm install -g grunt-cli - travis_retry npm install -g grunt-cli
- travis_retry npm install - travis_retry npm install
- travis_retry gem install --no-document "jekyll:~>2.5.3" "rouge:~>1.7.7" "sass:~>3.4.10" - travis_retry gem install --no-document "jekyll:~>2.5.3" "rouge:~>1.7.7" "sass:~>3.4.10" "scss-lint:~>0.27.0"
matrix: matrix:
fast_finish: true fast_finish: true
notifications: notifications:

9
Gruntfile.js

@ -254,6 +254,13 @@ module.exports = function (grunt) {
} }
}, },
scsslint: {
scss: ['<%= meta.srcPath %>*.scss', '!<%= meta.srcPath %>normalize.scss'],
options: {
config: 'sass/.scss-lint.yml'
}
},
csslint: { csslint: {
options: { options: {
csslintrc: 'sass/.csslintrc' csslintrc: 'sass/.csslintrc'
@ -310,7 +317,7 @@ module.exports = function (grunt) {
grunt.registerTask('validate-html', ['jekyll', 'validation']); grunt.registerTask('validate-html', ['jekyll', 'validation']);
grunt.registerTask('build', ['dist']); grunt.registerTask('build', ['dist']);
grunt.registerTask('default', ['dist']); grunt.registerTask('default', ['dist']);
grunt.registerTask('test', ['dist', 'csslint', 'jshint', 'jscs', 'validate-html']); grunt.registerTask('test', ['dist', 'scsslint', 'csslint', 'jshint', 'jscs', 'validate-html']);
grunt.registerTask('build-ratchicons-data', generateRatchiconsData); grunt.registerTask('build-ratchicons-data', generateRatchiconsData);

2
dist/css/ratchet-theme-android.css vendored

@ -143,7 +143,7 @@ a:active {
.btn-link { .btn-link {
color: #33b5e5; color: #33b5e5;
background-color: transparent; background-color: transparent;
border: none; border: 0;
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
} }

2
dist/css/ratchet-theme-android.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/css/ratchet-theme-ios.css vendored

@ -96,7 +96,7 @@ p {
.btn-link { .btn-link {
color: #007aff; color: #007aff;
background-color: transparent; background-color: transparent;
border: none; border: 0;
} }
.btn-link:active, .btn-link.active { .btn-link:active, .btn-link.active {
color: #0062cc; color: #0062cc;

2
dist/css/ratchet-theme-ios.min.css vendored

File diff suppressed because one or more lines are too long

4
docs/assets/css/docs.css

@ -1059,7 +1059,7 @@ hr {
.platform-ios .btn-link { .platform-ios .btn-link {
color: #007aff; color: #007aff;
background-color: transparent; background-color: transparent;
border: none; border: 0;
} }
.platform-ios .btn-link:active, .platform-ios .btn-link.active { .platform-ios .btn-link:active, .platform-ios .btn-link.active {
color: #0062cc; color: #0062cc;
@ -1523,7 +1523,7 @@ hr {
.platform-android .btn-link { .platform-android .btn-link {
color: #33b5e5; color: #33b5e5;
background-color: transparent; background-color: transparent;
border: none; border: 0;
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
} }

2
docs/assets/css/docs.min.css vendored

File diff suppressed because one or more lines are too long

2
docs/dist/css/ratchet-theme-android.css vendored

@ -143,7 +143,7 @@ a:active {
.btn-link { .btn-link {
color: #33b5e5; color: #33b5e5;
background-color: transparent; background-color: transparent;
border: none; border: 0;
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
} }

2
docs/dist/css/ratchet-theme-android.min.css vendored

File diff suppressed because one or more lines are too long

2
docs/dist/css/ratchet-theme-ios.css vendored

@ -96,7 +96,7 @@ p {
.btn-link { .btn-link {
color: #007aff; color: #007aff;
background-color: transparent; background-color: transparent;
border: none; border: 0;
} }
.btn-link:active, .btn-link.active { .btn-link:active, .btn-link.active {
color: #0062cc; color: #0062cc;

2
docs/dist/css/ratchet-theme-ios.min.css vendored

File diff suppressed because one or more lines are too long

1
package.json

@ -41,6 +41,7 @@
"grunt-html-validation": "~0.1.18", "grunt-html-validation": "~0.1.18",
"grunt-jekyll": "~0.4.2", "grunt-jekyll": "~0.4.2",
"grunt-jscs": "~1.2.0", "grunt-jscs": "~1.2.0",
"grunt-scss-lint": "~0.3.4",
"grunt-sed": "~0.1.1", "grunt-sed": "~0.1.1",
"load-grunt-tasks": "~3.1.0", "load-grunt-tasks": "~3.1.0",
"time-grunt": "~1.0.0" "time-grunt": "~1.0.0"

116
sass/.scss-lint.yml

@ -0,0 +1,116 @@
# Default application configuration that all configurations inherit from.
linters:
BorderZero:
enabled: true
CapitalizationInSelector:
enabled: false
ColorKeyword:
enabled: true
Comment:
enabled: false
DebugStatement:
enabled: true
DeclarationOrder:
enabled: true
DuplicateProperty:
enabled: true
EmptyLineBetweenBlocks:
enabled: false
EmptyRule:
enabled: true
FinalNewline:
enabled: true
present: true
HexLength:
enabled: true
style: short # or 'long'
HexNotation:
enabled: true
style: lowercase # or 'uppercase'
HexValidation:
enabled: true
IdWithExtraneousSelector:
enabled: true
Indentation:
enabled: false
LeadingZero:
enabled: true
style: exclude_zero # or 'include_zero'
MergeableSelector:
enabled: false
NameFormat:
enabled: true
convention: hyphenated_lowercase # or 'BEM', or a regex pattern
PlaceholderInExtend:
enabled: true
PropertySortOrder:
enabled: false
PropertySpelling:
enabled: true
extra_properties: []
SelectorDepth:
enabled: true
max_depth: 4
Shorthand:
enabled: true
SingleLinePerSelector:
enabled: false
SpaceAfterComma:
enabled: false
SpaceAfterPropertyColon:
enabled: false
SpaceAfterPropertyName:
enabled: true
SpaceBeforeBrace:
enabled: false
SpaceBetweenParens:
enabled: false
StringQuotes:
enabled: false
TrailingSemicolonAfterPropertyValue:
enabled: false
UnnecessaryMantissa:
enabled: true
UrlFormat:
enabled: true
UrlQuotes:
enabled: true
ZeroUnit:
enabled: true
Compass::*:
enabled: false

4
sass/docs.scss

@ -266,7 +266,7 @@ body {
margin-left: -10px; margin-left: -10px;
border-right: 10px solid transparent; border-right: 10px solid transparent;
border-bottom: 10px solid #fff; border-bottom: 10px solid #fff;
border-left: 10px solid transparent border-left: 10px solid transparent;
} }
.docs-component-item { .docs-component-item {
display: block; display: block;
@ -686,7 +686,7 @@ code {
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 24px; font-size: 24px;
text-shadow: 0 0 10px rgba(0, 0, 0, 0.5); text-shadow: 0 0 10px rgba(0, 0, 0, .5);
color: #fff; color: #fff;
} }
.component-example-fullbleed, .component-example-fullbleed,

8
sass/theme-android.scss

@ -21,13 +21,13 @@ $line-height-default: 22px !global;
// //
// Main theme colors // Main theme colors
$primary-color: #33b5e5 !global; $primary-color: #33b5e5 !global;
$chrome-color: #dddddd !global; $chrome-color: #ddd !global;
$text-color: #222 !global; $text-color: #222 !global;
// Action colors // Action colors
$default-color: #999 !global; $default-color: #999 !global;
$positive-color: #99cc00 !global; $positive-color: #9c0 !global;
$negative-color: #ff4444 !global; $negative-color: #f44 !global;
// Bars // Bars
$bar-base-height: 50px !global; $bar-base-height: 50px !global;
@ -200,7 +200,7 @@ a {
.btn-link { .btn-link {
color: $primary-color; color: $primary-color;
background-color: transparent; background-color: transparent;
border: none; border: 0;
@include box-shadow(none); @include box-shadow(none);
&:active, &:active,

4
sass/theme-ios.scss

@ -149,7 +149,7 @@ p {
.btn-link { .btn-link {
color: $primary-color; color: $primary-color;
background-color: transparent; background-color: transparent;
border: none; border: 0;
&:active, &:active,
&.active { &.active {
@ -480,7 +480,7 @@ textarea,
.popover { .popover {
border-radius: 12px; border-radius: 12px;
@include transition(-webkit-transform 0.2s ease-in-out, opacity 0.2s ease-in-out); @include transition(-webkit-transform .2s ease-in-out, opacity .2s ease-in-out);
&:before { &:before {
border-bottom: 15px solid $chrome-color; border-bottom: 15px solid $chrome-color;

Loading…
Cancel
Save