From 5d7459b5e5df2516494a062425cf015c28155a5f Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Fri, 12 Sep 2014 15:44:40 -0400
Subject: [PATCH] Fix flag collision with ui flag, fix attached label borders

---
 src/definitions/elements/flag.less  | 11 ++++++++++-
 src/definitions/elements/icon.less  |  4 ++++
 src/definitions/elements/label.less |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/definitions/elements/flag.less b/src/definitions/elements/flag.less
index f17065d27..284c8a8ab 100755
--- a/src/definitions/elements/flag.less
+++ b/src/definitions/elements/flag.less
@@ -20,7 +20,6 @@
 
 i.flag {
   display: inline-block;
-  background: url(@spritePath) no-repeat 0px 0px;
 
   width: @width;
   height: @height;
@@ -28,6 +27,16 @@ i.flag {
   line-height: @height;
   vertical-align: @verticalAlign;
   margin: 0em @margin 0em 0em;
+
+  text-decoration: inherit;
+
+  speak: none;
+  font-smoothing: antialiased;
+  backface-visibility: hidden;
+}
+
+i.flag:before {
+  background: url(@spritePath) no-repeat 0px 0px;
 }
 
 .loadUIOverrides();
diff --git a/src/definitions/elements/icon.less b/src/definitions/elements/icon.less
index 833d8fc7a..7856a302e 100755
--- a/src/definitions/elements/icon.less
+++ b/src/definitions/elements/icon.less
@@ -74,6 +74,10 @@ i.icon {
   backface-visibility: hidden;
 }
 
+i.icon:before {
+  background: none !important;
+}
+
 /*******************************
              Types
 *******************************/
diff --git a/src/definitions/elements/label.less b/src/definitions/elements/label.less
index 9eba75b13..0030dbaf9 100755
--- a/src/definitions/elements/label.less
+++ b/src/definitions/elements/label.less
@@ -118,10 +118,10 @@ a.ui.label {
 --------------------*/
 
 /* Padding on next content after a label */
-.ui.segment > .top.attached.label:first-child + * {
+.ui.top.attached.label:first-child + * {
   margin-top: @attachedSegmentPadding;
 }
-.ui.segment > .bottom.attached.label:first-child ~ :last-child {
+.ui.bottom.attached.label:first-child ~ :last-child {
   margin-top: 0em;
   margin-bottom: @attachedSegmentPadding;
 }