Fix linter errors

scss-linterで怒られたエラーを修正
windyakin · Nov 10, 2015 · bdc4ee3 · bdc4ee3
1 parent 1add380
commit bdc4ee3
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 97 deletions.
diff --git a/scss/.scss-lint.yml → .scss-lint.yml b/scss/.scss-lint.yml → .scss-lint.yml
@@ -80,9 +80,9 @@ linters:
     force_nesting: true
 
   NameFormat:
-    enabled: true
-    allow_leading_underscore: true
-    convention: hyphenated_lowercase # or 'BEM', or a regex pattern
+    enabled: false
+    # allow_leading_underscore: true
+    # convention: hyphenated_lowercase # or 'BEM', or a regex pattern
 
   NestingDepth:
     enabled: false

diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
@@ -10,4 +10,4 @@
  * Based on Bootstrap v#{$bootstrap-version}
  */
 
-@import "honoka/honoka";
+@import "honoka/honoka";
diff --git a/scss/honoka/_mixins.scss b/scss/honoka/_mixins.scss
@@ -1,60 +1,60 @@
 //== buttons
 @mixin button-variant($color, $background, $border) {
-  color: $color;
-  background-color: $background;
-  border-color: $border;
+	color: $color;
+	background-color: $background;
+	border-color: $border;
 
-  transition-property: all;
-  transition-duration: 0.3s;
-  transition-timing-function: ease;
+	transition-property: all;
+	transition-duration: 0.3s;
+	transition-timing-function: ease;
 
-  &:focus,
-  &.focus {
-    color: $color;
-    background-color: darken($background, 10%);
-        border-color: darken($border, 25%);
-  }
-  &:hover {
-    color: $color;
-    background-color: darken($background, 10%);
-        border-color: darken($border, 12%);
-  }
-  &.active,
-  &.active,
-  .open > &.dropdown-toggle {
-    color: $color;
-    background-color: darken($background, 5%);
-        border-color: darken($border, 6%);
+	&:focus,
+	&.focus {
+		color: $color;
+		background-color: darken($background, 10%);
+		border-color: darken($border, 25%);
+	}
+	&:hover {
+		color: $color;
+		background-color: darken($background, 10%);
+		border-color: darken($border, 12%);
+	}
+	&.active,
+	&.active,
+	.open > &.dropdown-toggle {
+		color: $color;
+		background-color: darken($background, 5%);
+		border-color: darken($border, 6%);
 
-    &:hover,
-    &:focus,
-    &.focus {
-      color: $color;
-      background-color: darken($background, 17%);
-          border-color: darken($border, 25%);
-    }
-  }
-  &:active,
-  &.active,
-  .open > &.dropdown-toggle {
-    background-image: none;
-  }
-  &.disabled,
-  &[disabled],
-  fieldset[disabled] & {
-    &,
-    &:hover,
-    &:focus,
-    &.focus,
-    &:active,
-    &.active {
-      background-color: $background;
-          border-color: $border;
-    }
-  }
+		&:hover,
+		&:focus,
+		&.focus {
+			color: $color;
+			background-color: darken($background, 17%);
+			border-color: darken($border, 25%);
+		}
+	}
+	&:active,
+	&.active,
+	.open > &.dropdown-toggle {
+		background-image: none;
+	}
+	&.disabled,
+	&[disabled],
+	fieldset[disabled] & {
+		&,
+		&:hover,
+		&:focus,
+		&.focus,
+		&:active,
+		&.active {
+			background-color: $background;
+			border-color: $border;
+		}
+	}
 
-  .badge {
-    color: $background;
-    background-color: $color;
-  }
+	.badge {
+		color: $background;
+		background-color: $color;
+	}
 }
diff --git a/scss/honoka/_override.scss b/scss/honoka/_override.scss
@@ -1,11 +1,13 @@
+@charset "UTF-8";
+
 // font
 @import url(https://fonts.googleapis.com/css?family=Open+Sans);
 
 // animation
 a {
-	transition-property: all;
-	transition-duration: 0.3s;
 	transition-timing-function: ease;
+	transition-duration: 0.3s;
+	transition-property: all;
 }
 
 // buttons
@@ -21,27 +23,25 @@ a {
 	@media (min-width: $grid-float-breakpoint) {
 		> li {
 			> a {
-				padding-top:    0;
-				padding-bottom: 0;
-				margin-top:     $navbar-padding-vertical/4*3;
-				margin-bottom:  $navbar-padding-vertical/4*3;
-				padding-top:    $navbar-padding-vertical/4;
-				padding-bottom: $navbar-padding-vertical/4;
+				padding-top:    ($navbar-padding-vertical / 4);
+				padding-bottom: ($navbar-padding-vertical / 4);
+				margin-top:     ($navbar-padding-vertical / 4 * 3);
+				margin-bottom:  ($navbar-padding-vertical / 4 * 3);
 				border-radius:  $border-radius-large;
 			}
 			> .dropdown-menu {
-				margin-top: -$navbar-padding-vertical/4*3;
+				margin-top: (-$navbar-padding-vertical / 4 * 3);
 			}
 		}
 		> li:not(:last-child) {
-			margin-right: $navbar-padding-horizontal/3;
+			margin-right: ($navbar-padding-horizontal / 3);
 		}
 	}
 }
 
 .navbar-brand {
+	margin-right: ($navbar-padding-horizontal / 3);
 	font-size: $font-size-large;
-	margin-right: $navbar-padding-horizontal/3;
 }
 
 // label
@@ -68,7 +68,6 @@ a {
 .panel-heading,
 .lead,
 .tooltip,
-.popover
-{
+.popover {
 	font-family: $font-family-sans-serif;
 }
diff --git a/scss/honoka/_variables.scss b/scss/honoka/_variables.scss
@@ -33,7 +33,7 @@ $brand-danger:          #f44336 !default;
 //## Settings for some of the most global styles.
 
 //** Background color for `<body>`.
-$body-bg:               #F9F9F9 !default;
+$body-bg:               #f9f9f9 !default;
 //** Global text color on `<body>`.
 $text-color:            $gray-dark !default;
 

diff --git a/src/scss/example.scss b/src/scss/example.scss
@@ -5,31 +5,31 @@
 @import "honoka/variables";
 @import "honoka/mixins";
 
-$brand-honoka: #FDCEA0;
-$brand-twitter: #55ACEE;
-$brand-facebook: #3B5998;
+$brand-honoka: #fdcea0;
+$brand-twitter: #55acee;
+$brand-facebook: #3b5998;
 $brand-hatena: #178fde;
 
 .btn-twitter,.btn-facebook {
 	.fa.fa-lg {
-		vertical-align: -1px;
 		margin-right: 2px;
+		vertical-align: -1px;
 	}
 }
 .btn-twitter {
-	@include button-variant(#FFF, $brand-twitter, darken($brand-twitter, 2%));
+	@include button-variant(#fff, $brand-twitter, darken($brand-twitter, 2%));
 }
 .btn-facebook {
-	@include button-variant(#FFF, $brand-facebook, darken($brand-facebook, 2%));
+	@include button-variant(#fff, $brand-facebook, darken($brand-facebook, 2%));
 }
 .btn-hatebu {
-	@include button-variant(#FFF, $brand-hatena, darken($brand-hatena, 2%));
+	@include button-variant(#fff, $brand-hatena, darken($brand-hatena, 2%));
 }
 
 .fa.fa-hatebu:before {
-	content: "B!";
 	font-family: Verdana;
 	font-weight: bold;
+	content: "B!";
 }
 
 body {
@@ -38,22 +38,22 @@ body {
 
 .jumbotron.special {
 	position: relative;
-	overflow: hidden;
 	min-height: 530px;
 	margin-bottom: 0;
+	overflow: hidden;
 	text-align: center;
 	background-color: $brand-honoka;
-	background-image: url(../img/circle.png);
+	background-image: url("../img/circle.png");
 	background-repeat: no-repeat;
 	background-position: -35% center;
 	background-size: 70%;
 	.honoka {
 		position: absolute;
 		bottom: -20px;
 		left: 0;
-		height: 530px;
 		width: 400px;
-		background-image: url(../img/honoka.png);
+		height: 530px;
+		background-image: url("../img/honoka.png");
 		background-repeat: no-repeat;
 	}
 	.outline {
@@ -64,23 +64,25 @@ body {
 		font-family: Montserrat, sans-serif;
 	}
 	.download {
-		margin: $padding-large-vertical*4 auto $padding-large-vertical*2;
+		margin: $padding-large-vertical * 4 auto $padding-large-vertical * 2;
 	}
 	.basedon {
 		color: $gray-light;
-		text-shadow: #FFF 0 1px 2px;
+		text-shadow: #fff 0 1px 2px;
 	}
 }
 
 section.section {
 	padding: ($padding-large-vertical * 15) 0;
-	&.section-default {}
+	&.section-default {
+		background-color: $body-bg;
+	}
 	&.section-inverse {
 		background-color: lighten($brand-honoka, 15%);
 	}
 	.subtitle {
-		text-align: center;
 		margin-bottom: $padding-large-vertical * 2;
+		text-align: center;
 		h2 {
 			margin-top: 0;
 		}
@@ -92,9 +94,9 @@ section.section {
 		text-align: center;
 		.point-circle {
 			$point-circle-size: 100px;
-			margin: 0 auto;
 			width: $point-circle-size;
 			height: $point-circle-size;
+			margin: 0 auto;
 			font-size: $point-circle-size * 0.6;
 			line-height: $point-circle-size;
 			color: #fff;
@@ -111,8 +113,8 @@ section.section {
 			&.japanese {
 				background-color: $brand-danger;
 				span.icon-jp:before {
-					content: "あ";
 					font-weight: bold;
+					content: "あ";
 				}
 			}
 		}
@@ -161,7 +163,7 @@ section.section {
 }
 
 .thumbnail {
-	background: #FFF;
+	background: #fff;
 	> a {
 		&:hover, &:active, &:focus {
 			opacity: 0.7;
@@ -170,27 +172,27 @@ section.section {
 }
 
 footer {
-	padding: $padding-large-vertical*4 0px;
+	padding: $padding-large-vertical * 4 0;
 	color: $gray-lighter;
 	background-color: $gray-dark;
 	.social-button {
 		position: relative;
-		overflow: hidden;
-		margin: 0px auto !important;
 		padding: $padding-large-vertical 0;
+		margin: 0 auto !important;
+		overflow: hidden;
 		> ul {
 			position: relative;
 			left: 50%;
 			float: left;
-			margin: 0px;
-			padding: 0px;
+			padding: 0;
+			margin: 0;
 			list-style: outside none none;
 			> li {
 				position: relative;
 				left: -50%;
 				float: left;
-				margin: 0px 10px;
-				padding: 0px;
+				padding: 0;
+				margin: 0 10px;
 
 				.fb-like {
 					> span {