Merge pull request elastic#7982 from szydan/renamed-less-variable

renamed less variable
airow · Aug 17, 2016 · ee80ced · ee80ced
2 parents bd13644 + 1a03bb6
commit ee80ced
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less
@@ -588,7 +588,7 @@ fieldset {
   margin: @form-group-margin-bottom;
   padding: @form-group-margin-bottom;
   border: 1px solid @input-border;
-  border-radius: @input-border-radius;
+  border-radius: @input-border-radius-base;
 }
 
 [fixed-scroll] {

diff --git a/src/ui/public/styles/bootstrap/forms.less b/src/ui/public/styles/bootstrap/forms.less
@@ -122,7 +122,7 @@ output {
   background-color: @input-bg;
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid @input-border;
-  border-radius: @input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
+  border-radius: @input-border-radius-base; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
 

diff --git a/src/ui/public/styles/bootstrap/input-groups.less b/src/ui/public/styles/bootstrap/input-groups.less
@@ -83,7 +83,7 @@
   text-align: center;
   background-color: @input-group-addon-bg;
   border: 1px solid @input-group-addon-border-color;
-  border-radius: @input-border-radius;
+  border-radius: @input-border-radius-base;
 
   // Sizing
   &.input-sm {

diff --git a/src/ui/public/styles/bootstrap/variables.less b/src/ui/public/styles/bootstrap/variables.less
@@ -190,10 +190,9 @@
 //** `<input>` border color
 @input-border:                   #ccc;
 
-// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
 //** Default `.form-control` border radius
 // This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
-@input-border-radius:            @border-radius-base;
+@input-border-radius-base:       @border-radius-base;
 //** Large `.form-control` border radius
 @input-border-radius-large:      @border-radius-large;
 //** Small `.form-control` border radius

diff --git a/src/ui/public/styles/control_group.less b/src/ui/public/styles/control_group.less
@@ -34,11 +34,11 @@
     }
 
     > :first-child {
-      .border-left-radius(@input-border-radius);
+      .border-left-radius(@input-border-radius-base);
     }
 
     > :last-child {
-      .border-right-radius(@input-border-radius);
+      .border-right-radius(@input-border-radius-base);
     }
   }
 

diff --git a/src/ui/public/styles/variables/bootstrap-mods.less b/src/ui/public/styles/variables/bootstrap-mods.less
@@ -148,9 +148,8 @@
 //
 //##
 
-// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
 //** Default `.form-control` border radius
-@input-border-radius:            @border-radius-base;
+@input-border-radius-base:       @border-radius-base;
 //** Large `.form-control` border radius
 @input-border-radius-large:      @border-radius-large;
 //** Small `.form-control` border radius