diff --git a/frontend/public/index.html b/frontend/public/index.html index ad4d9f93c8..377011c949 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -7,16 +7,11 @@ - Unleash - Enterprise ready feature toggles -
diff --git a/frontend/src/app.css b/frontend/src/app.css index a56797a0e7..0ef333e86e 100644 --- a/frontend/src/app.css +++ b/frontend/src/app.css @@ -1,3 +1,27 @@ +@font-face { + font-family: 'Roboto'; + font-weight: 300; + src: url('./assets/fonts/Roboto-300.ttf'); +} + +@font-face { + font-family: 'Roboto'; + font-weight: 400; + src: url('./assets/fonts/Roboto-400.ttf'); +} + +@font-face { + font-family: 'Roboto'; + font-weight: 500; + src: url('./assets/fonts/Roboto-500.ttf'); +} + +@font-face { + font-family: 'Roboto'; + font-weight: 700; + src: url('./assets/fonts/Roboto-700.ttf'); +} + * { box-sizing: border-box; } diff --git a/frontend/src/assets/fonts/Roboto-300.ttf b/frontend/src/assets/fonts/Roboto-300.ttf new file mode 100644 index 0000000000..0e977514ff Binary files /dev/null and b/frontend/src/assets/fonts/Roboto-300.ttf differ diff --git a/frontend/src/assets/fonts/Roboto-400.ttf b/frontend/src/assets/fonts/Roboto-400.ttf new file mode 100644 index 0000000000..3d6861b423 Binary files /dev/null and b/frontend/src/assets/fonts/Roboto-400.ttf differ diff --git a/frontend/src/assets/fonts/Roboto-500.ttf b/frontend/src/assets/fonts/Roboto-500.ttf new file mode 100644 index 0000000000..e89b0b79a2 Binary files /dev/null and b/frontend/src/assets/fonts/Roboto-500.ttf differ diff --git a/frontend/src/assets/fonts/Roboto-700.ttf b/frontend/src/assets/fonts/Roboto-700.ttf new file mode 100644 index 0000000000..3742457900 Binary files /dev/null and b/frontend/src/assets/fonts/Roboto-700.ttf differ diff --git a/frontend/src/component/addons/AddonList/AddonList.jsx b/frontend/src/component/addons/AddonList/AddonList.jsx index 9e0b3ed109..0e0f3a4b8d 100644 --- a/frontend/src/component/addons/AddonList/AddonList.jsx +++ b/frontend/src/component/addons/AddonList/AddonList.jsx @@ -2,7 +2,9 @@ import React, { useContext, useEffect } from 'react'; import PropTypes from 'prop-types'; import ConfiguredAddons from './ConfiguredAddons'; import AvailableAddons from './AvailableAddons'; -import { Avatar, Icon } from '@material-ui/core'; +import { Avatar } from '@material-ui/core'; +import { DeviceHub } from '@material-ui/icons'; + import ConditionallyRender from '../../common/ConditionallyRender/ConditionallyRender'; import AccessContext from '../../../contexts/AccessContext'; @@ -65,7 +67,7 @@ const getIcon = name => { default: return ( - device_hub + ); } diff --git a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.jsx b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.jsx index d980f0b658..1107444ef3 100644 --- a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.jsx +++ b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.jsx @@ -1,6 +1,5 @@ import React from 'react'; import { - Icon, IconButton, List, ListItem, @@ -8,6 +7,8 @@ import { ListItemSecondaryAction, ListItemText, } from '@material-ui/core'; +import { Visibility, VisibilityOff, Delete } from '@material-ui/icons'; + import ConditionallyRender from '../../../common/ConditionallyRender/ConditionallyRender'; import { DELETE_ADDON, @@ -62,11 +63,11 @@ const ConfiguredAddons = ({ } onClick={() => toggleAddon(addon)} > - - {addon.enabled - ? 'visibility' - : 'visibility_off'} - + } + elseShow={} + /> } /> @@ -78,7 +79,7 @@ const ConfiguredAddons = ({ title="Remove addon" onClick={onRemoveAddon(addon)} > - delete + } /> diff --git a/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap b/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap index 968590e939..c305d72f50 100644 --- a/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap +++ b/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap @@ -88,12 +88,16 @@ exports[`renders correctly with permissions 1`] = ` - - link - + + diff --git a/frontend/src/component/feature/feature-tag-component.jsx b/frontend/src/component/feature/feature-tag-component.jsx index 6d55927438..3fe4699301 100644 --- a/frontend/src/component/feature/feature-tag-component.jsx +++ b/frontend/src/component/feature/feature-tag-component.jsx @@ -1,6 +1,8 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; -import { Icon, Chip } from '@material-ui/core'; +import { Chip } from '@material-ui/core'; +import { Label } from '@material-ui/icons'; + import ConditionallyRender from '../common/ConditionallyRender/ConditionallyRender'; import Dialogue from '../common/Dialogue'; @@ -55,7 +57,7 @@ function FeatureTagComponent({ /> ); default: - return label; + return