diff --git a/README.md b/README.md index da45b9ce9..77aeb5f09 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ $(npm bin)/jest --runInBand test/unit/components/button.test.jsx ``` #### Running integration tests + Integration tests use a headless browser to manipulate the actual HTML and javascript that the repo produces. You will not see this activity (though you can hear it when sounds are played!). diff --git a/src/components/menu-bar/check.svg b/src/components/menu-bar/check.svg new file mode 100644 index 000000000..afe11c097 --- /dev/null +++ b/src/components/menu-bar/check.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/menu-bar/menu-bar.css b/src/components/menu-bar/menu-bar.css index 786108d5d..f77d8a27e 100644 --- a/src/components/menu-bar/menu-bar.css +++ b/src/components/menu-bar/menu-bar.css @@ -115,6 +115,7 @@ } .file-group .menu-bar-item { + margin: 0 .25rem; padding: 0 0.75rem; } @@ -166,6 +167,7 @@ } .account-info-group .menu-bar-item { + margin: 0 .25rem; padding: 0 0.75rem; } @@ -175,7 +177,11 @@ } .help-icon { - margin-right: 0.35rem; + margin: 0 .25rem 0 0; +} + +[dir="rtl"] .help-icon { + margin: 0 0 0 .25rem; } .account-nav-menu, .mystuff-button { diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx index 0043ae96b..29d9f2e89 100644 --- a/src/components/menu-bar/menu-bar.jsx +++ b/src/components/menu-bar/menu-bar.jsx @@ -434,6 +434,7 @@ class MenuBar extends React.Component { theme={this.props.theme} themeMenuOpen={this.props.themeMenuOpen} />)} + {(this.props.canManageFiles) && (
-
- - - - +
+
+ + + + +
-
{/* show the proper UI in the account menu, given whether the user is diff --git a/src/components/menu-bar/theme-menu.css b/src/components/menu-bar/theme-menu.css index 8bd2dad7e..7c79945c2 100644 --- a/src/components/menu-bar/theme-menu.css +++ b/src/components/menu-bar/theme-menu.css @@ -32,6 +32,19 @@ background-color: $ui-black-transparent; } +.check { + margin: 0 .25rem 0 0; + visibility: hidden; +} + +[dir="rtl"] .check { + margin: 0 0 0 .25rem; +} + +.selected { + visibility: visible; +} + @media only screen and (max-width: 1024px) { .theme-label { display: none; diff --git a/src/components/menu-bar/theme-menu.jsx b/src/components/menu-bar/theme-menu.jsx index 607cce902..afd58aa53 100644 --- a/src/components/menu-bar/theme-menu.jsx +++ b/src/components/menu-bar/theme-menu.jsx @@ -8,6 +8,7 @@ import {DEFAULT_THEME, HIGH_CONTRAST_THEME, themeMap} from '../../lib/themes'; import {MenuItem, MenuSection} from '../menu/menu.jsx'; import dropdownCaret from './dropdown-caret.svg'; +import check from './check.svg'; import styles from './theme-menu.css'; import menuBarStyles from './menu-bar.css'; @@ -27,9 +28,12 @@ const ThemeMenuItem = props => {
+