From 6db8c147a6ad2cc47dcf1a6c170b94eb128ba15e Mon Sep 17 00:00:00 2001
From: Amit Moryossef <amitmoryossef@gmail.com>
Date: Fri, 9 Jun 2017 22:19:53 +0300
Subject: [PATCH] fix(segment): fix border-radius logic for RTL (#11981)

---
 src/components/segment/segment.ios.scss |  4 ----
 src/themes/ionic.mixins.scss            | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/components/segment/segment.ios.scss b/src/components/segment/segment.ios.scss
index 687bfb7c5b..5cd7359ad7 100644
--- a/src/components/segment/segment.ios.scss
+++ b/src/components/segment/segment.ios.scss
@@ -131,14 +131,10 @@ $segment-button-ios-toolbar-icon-line-height:   2.4rem !default;
 
 [dir="rtl"] .segment-ios .segment-button {
   &:first-of-type {
-    @include margin-horizontal(0, null);
-
     border-left-width: 0;
   }
 
   &:last-of-type {
-    @include margin-horizontal(null, 0);
-
     border-left-width: $segment-button-ios-border-width;
   }
 }
diff --git a/src/themes/ionic.mixins.scss b/src/themes/ionic.mixins.scss
index 1856981354..0e87bc042d 100644
--- a/src/themes/ionic.mixins.scss
+++ b/src/themes/ionic.mixins.scss
@@ -29,7 +29,6 @@
   }
 }
 
-
 // SVG Background Image Mixin
 // --------------------------------------------------
 
@@ -68,7 +67,6 @@
   }
 }
 
-
 // Breakpoint Mixins
 // ---------------------------------------------------------------------------------
 
@@ -91,7 +89,6 @@
   @return if($min != 0, $min, null);
 }
 
-
 // Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront.
 // Useful for making responsive utilities.
 //
@@ -139,7 +136,6 @@
   @return if($next, breakpoint-min($next, $breakpoints) - 1px, null);
 }
 
-
 // Media of at most the maximum breakpoint width. No query for the largest breakpoint.
 // Makes the @content apply to the given breakpoint and narrower.
 @mixin media-breakpoint-down($name, $breakpoints: $grid-breakpoints) {
@@ -236,7 +232,7 @@
 // @param {string} $start
 // @param {boolean} $content include content or use default
 // ----------------------------------------------------------
-@mixin property($prop, $top, $end: $top, $bottom: $top, $start: $end, $content: false) {
+@mixin property($prop, $top, $end: $top, $bottom: $top, $start: $end) {
   @if $top == $end and $top == $bottom and $top == $start {
     @include multi-dir() {
       #{$prop}: $top;
@@ -257,14 +253,10 @@
       #{$prop}: $top $start $bottom $end;
     }
   } @else {
-    @if $content == true { // TODO check if @content exists instead
-      @content;
-    } @else {
-      @include property-horizontal($prop, $start, $end);
-      @include multi-dir() {
-        #{$prop}-top: $top;
-        #{$prop}-bottom: $bottom;
-      }
+    @include property-horizontal($prop, $start, $end);
+    @include multi-dir() {
+      #{$prop}-top: $top;
+      #{$prop}-bottom: $bottom;
     }
   }
 }
@@ -346,7 +338,11 @@
 // @param {string} $bottom-start
 // ----------------------------------------------------------
 @mixin border-radius($top-start, $top-end: $top-start, $bottom-end: $top-start, $bottom-start: $top-end) {
-  @include property(border-radius, $top-start, $top-end, $bottom-end, $bottom-start, true) {
+  @if $top-start == $top-end and $top-start == $bottom-end and $top-start == $bottom-start {
+    @include multi-dir() {
+      border-radius: $top-start;
+    }
+  } @else {
     @include ltr() {
       border-top-left-radius: $top-start;
       border-top-right-radius: $top-end;