]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fix remaining scss lint errors
authorMark Otto <markdotto@gmail.com>
Sun, 23 Aug 2015 08:12:00 +0000 (01:12 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 23 Aug 2015 08:12:00 +0000 (01:12 -0700)
scss/.scsslint.yml
scss/_custom-forms.scss
scss/_dropdown.scss
scss/_navbar.scss

index 7c5573f744a435bd95ca0a4fc4b376053171af0d..35ce8194f8d7724151b1f5b2689ebfe68c745a0b 100644 (file)
@@ -102,6 +102,9 @@ linters:
       "bottom",
       "left",
       "z-index",
+      "-webkit-box-sizing",
+      "-moz-box-sizing",
+      "box-sizing",
       "display",
       "float",
       "width",
@@ -110,10 +113,6 @@ linters:
       "height",
       "min-height",
       "max-height",
-      "-webkit-box-sizing",
-      "-moz-box-sizing",
-      "box-sizing",
-      "-webkit-appearance",
       "flex",
       "flex-direction",
       "flex-flow",
index 50731111fb117479ceca670c1109d03911d42e23..c63c9c18569e1712ed9393fd70830353343f2dd3 100644 (file)
 //
 // Replaces the browser default select with a custom one, mostly pulled from
 // http://primercss.io.
+//
+// Includes IE9-specific hacks (noted by ` \9`).
 
 .c-select {
   display: inline-block;
   max-width: 100%;
   padding: .375rem 1.75rem .375rem .75rem;
+  padding-right: .75rem \9;
   vertical-align: middle;
   background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
+  background-image: none \9;
   background-size: 8px 10px;
   border: 1px solid $input-border;
-
-  // Have to include vendor prefixes as the `appearance` property isn't part of the CSS spec.
-  -webkit-appearance: none;
+  // Use vendor prefixes as `appearance` isn't part of the CSS spec.
   -moz-appearance: none;
-
-  // IE9 hacks to hide the background-image and reduce padding
-  padding-right: .75rem \9;
-  background-image: none \9;
+  -webkit-appearance: none;
 
   &:focus {
     border-color: #51a7e8;
index d3588d270700077ed16effb9943f88e5ec65be73..b1a7f5c440de2419692ea04a1348fb0368aa7fc7 100644 (file)
 }
 
 // Links, buttons, and more within the dropdown menu
+//
+// `<button>`-specific styles are denoted with `// for <button>s`
 .dropdown-item {
   display: block;
+  width: 100%; // For `<button>`s
   padding: 3px 20px;
   clear: both;
   font-weight: normal;
   line-height: $line-height;
   color: $dropdown-link-color;
+  text-align: inherit; // For `<button>`s
   white-space: nowrap; // prevent links from randomly breaking onto new lines
-
-  // For `<button>`s
-  text-align: inherit;
-  width: 100%;
-  background: none;
-  border: 0;
+  background: none; // For `<button>`s
+  border: 0; // For `<button>`s
 
   @include hover-focus {
     color: $dropdown-link-hover-color;
index f196b8c7e838576e3454055a6f876131d75ebfe9..94cf1004b270886e1c1d5e63cf026694f3c3d97e 100644 (file)
@@ -89,8 +89,8 @@
   width: 1px;
   padding-top: .425rem;
   padding-bottom: .425rem;
-  margin-left:  $navbar-padding-horizontal;
   margin-right: $navbar-padding-horizontal;
+  margin-left:  $navbar-padding-horizontal;
   overflow: hidden;
 
   &:before {