From a83988ed4257ffd83f5734868efb6cf9b1ca3296 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 18 Oct 2015 10:58:40 -0700
Subject: rake update[v4-dev]

---
 assets/stylesheets/bootstrap/_mixins.scss       | 1 +
 assets/stylesheets/bootstrap/_reboot.scss       | 2 ++
 assets/stylesheets/bootstrap/_type.scss         | 7 ++-----
 assets/stylesheets/bootstrap/_variables.scss    | 2 +-
 assets/stylesheets/bootstrap/mixins/_lists.scss | 7 +++++++
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 assets/stylesheets/bootstrap/mixins/_lists.scss

(limited to 'assets/stylesheets')

diff --git a/assets/stylesheets/bootstrap/_mixins.scss b/assets/stylesheets/bootstrap/_mixins.scss
index 726beda..9378ff7 100644
--- a/assets/stylesheets/bootstrap/_mixins.scss
+++ b/assets/stylesheets/bootstrap/_mixins.scss
@@ -33,6 +33,7 @@
 @import "mixins/alert";
 @import "mixins/buttons";
 @import "mixins/pagination";
+@import "mixins/lists";
 @import "mixins/list-group";
 @import "mixins/nav-divider";
 @import "mixins/forms";
diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss
index a4dc039..42917e8 100644
--- a/assets/stylesheets/bootstrap/_reboot.scss
+++ b/assets/stylesheets/bootstrap/_reboot.scss
@@ -249,6 +249,8 @@ textarea {
   // properly inherited. However, `line-height` isn't addressed there. Using this
   // ensures we don't need to unnecessarily redeclare the global font stack.
   line-height: inherit;
+  // iOS adds rounded borders by default
+  border-radius: 0;
 }
 
 textarea {
diff --git a/assets/stylesheets/bootstrap/_type.scss b/assets/stylesheets/bootstrap/_type.scss
index 597886d..6fc9b86 100644
--- a/assets/stylesheets/bootstrap/_type.scss
+++ b/assets/stylesheets/bootstrap/_type.scss
@@ -85,17 +85,14 @@ mark,
 // Lists
 //
 
-// Unstyled keeps list items block level, just removes default browser padding and list-style
 .list-unstyled {
-  padding-left: 0;
-  list-style: none;
+  @include list-unstyled;
 }
 
 // Inline turns list items into inline-block
 .list-inline {
-  padding-left: 0;
+  @include list-unstyled;
   margin-left: -5px;
-  list-style: none;
 
   > li {
     display: inline-block;
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index 3d95879..dd331d9 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -450,7 +450,7 @@ $state-danger-border:            darken($state-danger-bg, 5%) !default;
 $card-spacer-x:            1.25rem !default;
 $card-spacer-y:            .75rem !default;
 $card-border-width:        .0625rem !default;
-$card-border-radius:       .25rem !default;
+$card-border-radius:       $border-radius !default;
 $card-border-color:        #e5e5e5 !default;
 $card-border-radius-inner: ($card-border-radius - $card-border-width) !default;
 $card-cap-bg:              #f5f5f5 !default;
diff --git a/assets/stylesheets/bootstrap/mixins/_lists.scss b/assets/stylesheets/bootstrap/mixins/_lists.scss
new file mode 100644
index 0000000..2518562
--- /dev/null
+++ b/assets/stylesheets/bootstrap/mixins/_lists.scss
@@ -0,0 +1,7 @@
+// Lists
+
+// Unstyled keeps list items block level, just removes default browser padding and list-style
+@mixin list-unstyled {
+  padding-left: 0;
+  list-style: none;
+}
-- 
cgit v1.2.3