merge in and resolve conflicts

2026-06-11 18:02:28 +03:00 · 2014-07-02 22:54:56 -07:00
parent 77c1a528ab
commit b4958aba69
7 changed files with 30 additions and 17 deletions
@@ -10,7 +10,11 @@
  .radio,
  .checkbox,
  .radio-inline,
-  .checkbox-inline  {
+  .checkbox-inline,
+  &.radio label,
+  &.checkbox label,
+  &.radio-inline label,
+  &.checkbox-inline label  {
    color: @text-color;
  }
  // Set the border and box shadow on specific inputs to match