From ae9460c76596f44e8b829fcc2ce24b9315802aa8 Mon Sep 17 00:00:00 2001 From: srph Date: Wed, 18 Nov 2015 16:11:45 +0800 Subject: [PATCH] Reduce input variants. Resolves https://github.com/dev-onenetworkecommerce/aia/issues/177. --- docs/dist/script.js | 34 ------------------------------ docs/dist/style.css | 6 ------ docs/sections/Docs-Forms/index.jsx | 20 ------------------ styles/base/_form.scss | 24 +++------------------ 4 files changed, 3 insertions(+), 81 deletions(-) diff --git a/docs/dist/script.js b/docs/dist/script.js index f375b42..e6e9c31 100644 --- a/docs/dist/script.js +++ b/docs/dist/script.js @@ -27324,40 +27324,6 @@ ), _react2["default"].createElement("input", { className: "form-control", type: "text", placeholder: "Enter something", disabled: true }) ), - _react2["default"].createElement( - "section", - { className: "doc-bottom-space-large" }, - _react2["default"].createElement( - "h3", - { className: "doc-heading" }, - "Variants" - ), - _react2["default"].createElement( - "p", - null, - "To apply, simply add one of the *modifier* classes to .form-control: .-sky, .-emerald, .-sun, .-crimson." - ), - _react2["default"].createElement( - "section", - { className: "doc-bottom-space" }, - _react2["default"].createElement("input", { className: "form-control -sky", type: "text", placeholder: "Enter something.." }) - ), - _react2["default"].createElement( - "section", - { className: "doc-bottom-space" }, - _react2["default"].createElement("input", { className: "form-control -emerald", type: "text", placeholder: "Enter something.." }) - ), - _react2["default"].createElement( - "section", - { className: "doc-bottom-space" }, - _react2["default"].createElement("input", { className: "form-control -sun", type: "text", placeholder: "Enter something.." }) - ), - _react2["default"].createElement( - "section", - null, - _react2["default"].createElement("input", { className: "form-control -crimson", type: "text", placeholder: "Enter something.." }) - ) - ), _react2["default"].createElement( "section", { className: "doc-bottom-space-large" }, diff --git a/docs/dist/style.css b/docs/dist/style.css index a9c6ff2..3afed7c 100644 --- a/docs/dist/style.css +++ b/docs/dist/style.css @@ -5418,14 +5418,8 @@ a { border-color: #F0F0F0; background: #F0F0F0; cursor: not-allowed; } - .form-control.-sky, .form-control.-sky:focus { - border-color: #52B5E5; } - .form-control.-emerald, .form-control.-emerald:focus { - border-color: #38D4A9; } .form-control.-crimson, .form-control.-crimson:focus { border-color: #F05F50; } - .form-control.-sun, .form-control.-sun:focus { - border-color: #FFC05A; } .form-group { position: relative; } diff --git a/docs/sections/Docs-Forms/index.jsx b/docs/sections/Docs-Forms/index.jsx index ea764a3..933d917 100644 --- a/docs/sections/Docs-Forms/index.jsx +++ b/docs/sections/Docs-Forms/index.jsx @@ -34,26 +34,6 @@ export default class Forms extends React.Component { -
-

Variants

-

To apply, simply add one of the *modifier* classes to .form-control: .-sky, .-emerald, .-sun, .-crimson.

-
- -
- -
- -
- -
- -
- -
- -
-
-

Form Error

You may present form errors with a tooltip-like presentation.

diff --git a/styles/base/_form.scss b/styles/base/_form.scss index 7eff746..fe5bb55 100644 --- a/styles/base/_form.scss +++ b/styles/base/_form.scss @@ -1,10 +1,3 @@ -@mixin form-variant($color) { - &, - &:focus { - border-color: $color; - } -} - .form-control { display: block; width: 100%; @@ -28,20 +21,9 @@ cursor: not-allowed; } - &.-sky { - @include form-variant($brand-sky); - } - - &.-emerald { - @include form-variant($brand-emerald); - } - - &.-crimson { - @include form-variant($brand-crimson); - } - - &.-sun { - @include form-variant($brand-sun); + &.-crimson, + &.-crimson:focus { + border-color: $brand-crimson; } }