Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2015-08-23 11:00:22 +0300
committerMark Otto <markdotto@gmail.com>2015-08-23 11:00:22 +0300
commitb2dccb15d79085af2a507b6b9f2c35c0e5770ffa (patch)
tree9b87592406cdae29a1a2b63f5153ec8e7eca57f2 /scss
parent47d5168dc88c3902488c7f5d44f41a394551d0d9 (diff)
fix majority of scss linter errors
Diffstat (limited to 'scss')
-rw-r--r--scss/.scsslint.yml6
-rw-r--r--scss/_custom-forms.scss4
-rw-r--r--scss/_forms.scss2
-rw-r--r--scss/_labels.scss2
-rw-r--r--scss/_list-group.scss2
-rw-r--r--scss/_modal.scss2
-rw-r--r--scss/_navbar.scss6
-rw-r--r--scss/_type.scss2
-rw-r--r--scss/_utilities-spacing.scss2
9 files changed, 17 insertions, 11 deletions
diff --git a/scss/.scsslint.yml b/scss/.scsslint.yml
index 3b24eeb3aa..7c5573f744 100644
--- a/scss/.scsslint.yml
+++ b/scss/.scsslint.yml
@@ -12,6 +12,9 @@ linters:
ColorKeyword:
enabled: true
+ ColorVariable:
+ enabled: false
+
Comment:
enabled: true
exclude: ['_normalize.scss', 'bootstrap.scss']
@@ -55,6 +58,9 @@ linters:
IdSelector:
enabled: true
+ ImportantRule:
+ enabled: false
+
ImportPath:
enabled: true
leading_underscore: false
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index bc36013e9d..5cdf45e204 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -132,7 +132,7 @@
max-width: 100%;
padding: .375rem 1.75rem .375rem .75rem;
vertical-align: middle;
- background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
+ background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
background-size: 8px 10px;
border: 1px solid $input-border;
@@ -146,8 +146,8 @@
background-image: none \9;
&:focus {
- outline: none;
border-color: #51a7e8;
+ outline: none;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5);
}
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 6eafd53ca5..72ec9b03f9 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -266,9 +266,9 @@ input[type="checkbox"] {
.form-control-warning,
.form-control-error {
padding-right: ($input-padding-x * 3);
+ background-repeat: no-repeat;
background-position: center right ($input-height * .25);
background-size: ($input-height * .65) ($input-height * .65);
- background-repeat: no-repeat;
}
// Form validation states
diff --git a/scss/_labels.scss b/scss/_labels.scss
index 599f335582..403504b864 100644
--- a/scss/_labels.scss
+++ b/scss/_labels.scss
@@ -41,8 +41,8 @@ a.label {
// Make them extra rounded with a modifier to replace v3's badges.
.label-pill {
- padding-left: .6em;
padding-right: .6em;
+ padding-left: .6em;
border-radius: 1rem;
}
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index d909022900..4e3d73cc5a 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -48,8 +48,8 @@
a.list-group-item,
button.list-group-item {
width: 100%;
- text-align: inherit;
color: $list-group-link-color;
+ text-align: inherit;
.list-group-item-heading {
color: $list-group-link-heading-color;
diff --git a/scss/_modal.scss b/scss/_modal.scss
index f034c77c83..046810f5f4 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -26,8 +26,8 @@
// When fading in the modal, animate it to slide down
&.fade .modal-dialog {
- transform: translate(0, -25%);
transition: transform .3s ease-out;
+ transform: translate(0, -25%);
}
&.in .modal-dialog { transform: translate(0, 0); }
}
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 36d9abf039..f196b8c7e8 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -69,9 +69,9 @@
.navbar-brand {
float: left;
- margin-right: 1rem;
padding-top: .25rem;
padding-bottom: .25rem;
+ margin-right: 1rem;
font-size: $font-size-lg;
@include hover-focus {
@@ -89,12 +89,12 @@
width: 1px;
padding-top: .425rem;
padding-bottom: .425rem;
- overflow: hidden;
margin-left: $navbar-padding-horizontal;
margin-right: $navbar-padding-horizontal;
+ overflow: hidden;
&:before {
- content: '\00a0';
+ content: "\00a0";
}
}
diff --git a/scss/_type.scss b/scss/_type.scss
index 2f5cdb4f95..3d349e6442 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -176,8 +176,8 @@ mark,
> img {
@extend .img-responsive;
- line-height: 1;
margin-bottom: ($spacer-y / 2);
+ line-height: 1;
}
}
diff --git a/scss/_utilities-spacing.scss b/scss/_utilities-spacing.scss
index 547bea7018..1c2cca468b 100644
--- a/scss/_utilities-spacing.scss
+++ b/scss/_utilities-spacing.scss
@@ -40,7 +40,7 @@
.p-r-0 { padding-right: 0 !important; }
.p-b-0 { padding-bottom: 0 !important; }
.p-l-0 { padding-left: 0 !important; }
-.p-x-0 { padding-left: 0 !important; padding-right: 0 !important; }
+.p-x-0 { padding-right: 0 !important; padding-left: 0 !important; }
.p-y-0 { padding-top: 0 !important; padding-bottom: 0 !important; }
.p-a { padding: $spacer !important; }