diff --git a/package.json b/package.json index f3bcd66d70..dc5679dfca 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,11 @@ }, "devDependencies": { "@polkadot/dev-react": "^0.19.25", - "gh-pages": "^1.1.0" + "autoprefixer": "^8.6.2", + "gh-pages": "^1.1.0", + "precss": "^3.1.2", + "postcss-import": "^11.1.0", + "postcss-nested": "^3.0.0", + "postcss-simple-vars": "^4.1.0" } } diff --git a/packages/apps/webpack.config.js b/packages/apps/webpack.config.js index bc9b451340..fca0eb3738 100644 --- a/packages/apps/webpack.config.js +++ b/packages/apps/webpack.config.js @@ -54,6 +54,11 @@ function createWebpack ({ alias = {}, context, name = 'index' }) { options: { ident: 'postcss', plugins: () => [ + require('precss'), + require('autoprefixer'), + require('postcss-simple-vars'), + require('postcss-nested'), + require('postcss-import'), require('postcss-clean')(), require('postcss-flexbugs-fixes') ] diff --git a/packages/ui-app/src/Button/Group.js b/packages/ui-app/src/Button/Group.js index 92496db83e..9a890f9e5c 100644 --- a/packages/ui-app/src/Button/Group.js +++ b/packages/ui-app/src/Button/Group.js @@ -8,6 +8,7 @@ import type { BareProps } from '../types'; import React from 'react'; import SUIButton from 'semantic-ui-react/dist/es/elements/Button'; +import Button from '@polkadot/ui-app/Button'; import classes from '../util/classes'; import Divider from './Divider'; @@ -22,6 +23,7 @@ function ButtonGroup ({ children, className, style }: Props): React$Node { style={style} > + {children} diff --git a/packages/ui-app/src/styles/components.css b/packages/ui-app/src/styles/components.css index 2e40b433be..23d170a2eb 100644 --- a/packages/ui-app/src/styles/components.css +++ b/packages/ui-app/src/styles/components.css @@ -2,6 +2,8 @@ /* This software may be modified and distributed under the terms /* of the ISC license. See the LICENSE file for details. */ +@import 'partials/_variables.css'; + .ui--output { background: #f9f9f9; border-radius: 4px; @@ -24,3 +26,17 @@ background: #fff6f6; border-color: #e0b4b4; } + +.ui--Button-Group { + .ui.buttons { + .ui.button.compact.mini.basic + .button:nth-child(2) { + border-top-right-radius: $small-corner; + border-bottom-right-radius: $small-corner; + } + .ui.button.compact.mini.basic + .button:nth-child(2), + .ui.button.compact.mini.basic + .button:nth-child(4) { + border-top-left-radius: $small-corner; + border-bottom-left-radius: $small-corner; + } + } +} \ No newline at end of file diff --git a/packages/ui-app/src/styles/partials/_variables.css b/packages/ui-app/src/styles/partials/_variables.css new file mode 100644 index 0000000000..407875e354 --- /dev/null +++ b/packages/ui-app/src/styles/partials/_variables.css @@ -0,0 +1 @@ +$small-corner: .28571429rem; \ No newline at end of file