From 2477071a7ab22405d80474e8dfd59bf077a3dd6a Mon Sep 17 00:00:00 2001 From: szydan Date: Thu, 11 Aug 2016 17:56:20 +0100 Subject: [PATCH] renamed less variable Former-commit-id: 1a03bb6eb2520de35beee74b9c667e2416c810d7 --- src/ui/public/styles/base.less | 2 +- src/ui/public/styles/bootstrap/forms.less | 2 +- src/ui/public/styles/bootstrap/input-groups.less | 2 +- src/ui/public/styles/bootstrap/variables.less | 3 +-- src/ui/public/styles/control_group.less | 4 ++-- src/ui/public/styles/variables/bootstrap-mods.less | 3 +-- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less index b64feed387645..8c29ccfa539cb 100644 --- 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 index e8b071a138ea2..d98b45e266fe0 100644 --- 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 s in CSS. + border-radius: @input-border-radius-base; // Note: This has no effect on 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 index 5f73eec40ca95..d450271d421e7 100644 --- 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 index abc3a4fadaada..754f2fb3207c7 100644 --- a/src/ui/public/styles/bootstrap/variables.less +++ b/src/ui/public/styles/bootstrap/variables.less @@ -190,10 +190,9 @@ //** `` 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 ``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 index ddfc55cde6b85..79c8016bf5524 100644 --- 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 index 17bb71b5d3233..1aa6a47192fe9 100644 --- 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