From 40bce1da129f6d910074cd2060cd647bf4ccb905 Mon Sep 17 00:00:00 2001 From: Hypnosphi Date: Wed, 21 Mar 2018 18:58:54 +0300 Subject: [PATCH 1/7] RG-1154 Ring UI language: Loader-inline --- components/button/button.examples.html | 53 ++++++-------- components/button/button.gemini.js | 2 +- components/loader-inline/loader-inline.css | 68 ++++++++++++++++++ .../loader-inline/loader-inline.examples.html | 60 ++++++++++++++++ .../loader-inline/loader-inline.gemini.js | 17 +++++ components/loader-inline/loader-inline.js | 42 ++--------- package-lock.json | 18 +++++ package.json | 5 +- packages/docs/components/example-common.css | 7 ++ packages/docs/components/example-common.js | 7 +- .../gemini/screens/Button/button/chrome.png | Bin 17169 -> 21579 bytes .../gemini/screens/Button/button/edge.png | Bin 17539 -> 21194 bytes .../gemini/screens/Button/button/firefox.png | Bin 14637 -> 17880 bytes .../gemini/screens/Button/button/ie.png | Bin 17627 -> 21259 bytes 14 files changed, 210 insertions(+), 69 deletions(-) create mode 100644 components/loader-inline/loader-inline.css create mode 100644 components/loader-inline/loader-inline.examples.html create mode 100644 components/loader-inline/loader-inline.gemini.js diff --git a/components/button/button.examples.html b/components/button/button.examples.html index 9f69573294c..702a9c9ddd7 100644 --- a/components/button/button.examples.html +++ b/components/button/button.examples.html @@ -8,17 +8,11 @@ :global(.dark) { background: #000; } - - :global(.inline) { - display: inline-block; - padding: 8px; - }
-
@@ -47,6 +41,20 @@ href="/" >Button link + + + + + + { [ 'active', 'primary', 'danger', 'delayed', 'disabled' @@ -88,6 +96,11 @@ href="/" >Button link + + { [ 'active', 'primary', 'danger', 'delayed', 'disabled' @@ -104,37 +117,13 @@ render(dark, document.getElementById('dark')); - const dynamic = ( -
- - - -
- -
-
- ); - - render(dynamic, document.getElementById('dynamic')); -
- :global(.icon) { + #example > :not(:first-child) { margin-left: 8px; } @@ -147,6 +136,7 @@ import React, {Component, Fragment} from 'react'; import {render} from 'react-dom'; import Button from '@jetbrains/ring-ui/components/button/button'; + import Loader from '@jetbrains/ring-ui/components/loader-inline/loader-inline'; import {HourglassIcon} from '@jetbrains/ring-ui/components/icon'; class Sleeper extends Component { @@ -175,6 +165,7 @@