@webiny/app-admin-rmwc 5.21.0-beta.0 → 5.22.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/modules/Brand/index.js +8 -5
  2. package/modules/Dashboard/Welcome.js +6 -6
  3. package/modules/Layout.js +7 -3
  4. package/modules/Navigation/Hamburger.js +1 -1
  5. package/modules/Navigation/renderers/MenuGroupRenderer.js +2 -2
  6. package/package.json +12 -12
package/modules/Brand/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import React, { Fragment, useCallback } from "react";
2
2
  import { Compose, BrandRenderer, useTags, Logo, AddLogo } from "@webiny/app-admin";
3
3
  import { Link } from "@webiny/react-router/";
4
- import { ReactComponent as LogoIcon } from "@svgr/webpack!./webiny-logo.svg";
4
+ import { ReactComponent as LogoIcon } from "./webiny-logo.svg";
5
5
  import { useNavigation } from "../Navigation";
6
6
 
7
7
  var BrandImpl = function BrandImpl() {
@@ -26,12 +26,15 @@ var WebinyLogo = function WebinyLogo() {
26
26
  var _useTags2 = useTags(),
27
27
  location = _useTags2.location;
28
28
 
29
+ var isLoginScreen = location === "loginScreen";
30
+ var isAppBar = location === "appBar";
31
+ var color = isAppBar ? "white" : "var(--mdc-theme-primary)";
29
32
  return /*#__PURE__*/React.createElement(LogoIcon, {
30
33
  style: {
31
- width: 100,
32
- height: 30,
33
- paddingLeft: 20,
34
- color: location === "navigation" ? "var(--mdc-theme-primary)" : "white"
34
+ width: isLoginScreen ? 125 : 100,
35
+ height: isLoginScreen ? "auto" : 30,
36
+ paddingLeft: isLoginScreen ? 0 : 20,
37
+ color: color
35
38
  }
36
39
  });
37
40
  };
package/modules/Dashboard/Welcome.js CHANGED
@@ -9,12 +9,12 @@ import { Typography } from "@webiny/ui/Typography";
9
9
  import { Cell, Grid } from "@webiny/ui/Grid";
10
10
  import { Elevation } from "@webiny/ui/Elevation"; // Icons
11
11
 
12
- import { ReactComponent as YouTubeIcon } from "@svgr/webpack!./icons/youtube.svg";
13
- import { ReactComponent as GithubIcon } from "@svgr/webpack!./icons/github.svg";
14
- import { ReactComponent as SlackIcon } from "@svgr/webpack!./icons/slack.svg";
15
- import { ReactComponent as TwitterIcon } from "@svgr/webpack!./icons/twitter.svg";
16
- import { ReactComponent as TextbookIcon } from "@svgr/webpack!./icons/textbook.svg";
17
- import { ReactComponent as LaptopIcon } from "@svgr/webpack!./icons/laptop.svg";
12
+ import { ReactComponent as YouTubeIcon } from "./icons/youtube.svg";
13
+ import { ReactComponent as GithubIcon } from "./icons/github.svg";
14
+ import { ReactComponent as SlackIcon } from "./icons/slack.svg";
15
+ import { ReactComponent as TwitterIcon } from "./icons/twitter.svg";
16
+ import { ReactComponent as TextbookIcon } from "./icons/textbook.svg";
17
+ import { ReactComponent as LaptopIcon } from "./icons/laptop.svg";
18
18
  var linkStyle = /*#__PURE__*/css({
19
19
  textDecoration: "none",
20
20
  "&:hover": {
package/modules/Layout.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React, { Fragment } from "react";
2
2
  import Helmet from "react-helmet";
3
- import { Compose, LayoutRenderer, Brand, Search, LocaleSelector, UserMenu, Navigation } from "@webiny/app-admin";
3
+ import { Compose, LayoutRenderer, Brand, Search, LocaleSelector, UserMenu, Navigation, Tags } from "@webiny/app-admin";
4
4
  import { TopAppBarPrimary, TopAppBarSection } from "@webiny/ui/TopAppBar";
5
5
 
6
6
  var RMWCLayout = function RMWCLayout() {
@@ -9,7 +9,11 @@ var RMWCLayout = function RMWCLayout() {
9
9
  children = _ref.children;
10
10
  return /*#__PURE__*/React.createElement(Fragment, null, title ? /*#__PURE__*/React.createElement(Helmet, {
11
11
  title: title
12
- }) : null, /*#__PURE__*/React.createElement(TopAppBarPrimary, {
12
+ }) : null, /*#__PURE__*/React.createElement(Tags, {
13
+ tags: {
14
+ location: "appBar"
15
+ }
16
+ }, /*#__PURE__*/React.createElement(TopAppBarPrimary, {
13
17
  fixed: true
14
18
  }, /*#__PURE__*/React.createElement(TopAppBarSection, {
15
19
  style: {
@@ -25,7 +29,7 @@ var RMWCLayout = function RMWCLayout() {
25
29
  width: "25%"
26
30
  },
27
31
  alignEnd: true
28
- }, /*#__PURE__*/React.createElement(LocaleSelector, null), /*#__PURE__*/React.createElement(UserMenu, null))), /*#__PURE__*/React.createElement("div", {
32
+ }, /*#__PURE__*/React.createElement(LocaleSelector, null), /*#__PURE__*/React.createElement(UserMenu, null)))), /*#__PURE__*/React.createElement("div", {
29
33
  style: {
30
34
  paddingTop: 67
31
35
  }
package/modules/Navigation/Hamburger.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React from "react";
2
2
  import { IconButton } from "@webiny/ui/Button";
3
- import { ReactComponent as MenuIcon } from "@svgr/webpack!./icons/hamburger.svg";
3
+ import { ReactComponent as MenuIcon } from "./icons/hamburger.svg";
4
4
  import { useNavigation } from "./index";
5
5
  import { useTags } from "@webiny/app-admin";
6
6
 
package/modules/Navigation/renderers/MenuGroupRenderer.js CHANGED
@@ -11,8 +11,8 @@ import { useMenuItem, MenuItems } from "@webiny/app-admin";
11
11
  import { List, ListItem, ListItemGraphic, ListItemMeta } from "@webiny/ui/List";
12
12
  import { IconButton } from "@webiny/ui/Button";
13
13
  import { useNavigation } from "../index";
14
- import { ReactComponent as UpIcon } from "@svgr/webpack!../icons/round-keyboard_arrow_up-24px.svg";
15
- import { ReactComponent as DownIcon } from "@svgr/webpack!../icons/round-keyboard_arrow_down-24px.svg";
14
+ import { ReactComponent as UpIcon } from "../icons/round-keyboard_arrow_up-24px.svg";
15
+ import { ReactComponent as DownIcon } from "../icons/round-keyboard_arrow_down-24px.svg";
16
16
  var defaultStyle = {
17
17
  transform: "translateY(-20px)",
18
18
  opacity: 0,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/app-admin-rmwc",
3
- "version": "5.21.0-beta.0",
3
+ "version": "5.22.0-beta.2",
4
4
  "main": "index.js",
5
5
  "repository": {
6
6
  "type": "git",
@@ -9,15 +9,15 @@
9
9
  "author": "Webiny Ltd.",
10
10
  "license": "MIT",
11
11
  "dependencies": {
12
- "@babel/runtime": "7.16.3",
13
- "@emotion/styled": "10.0.27",
12
+ "@babel/runtime": "7.16.7",
13
+ "@emotion/styled": "10.3.0",
14
14
  "@types/react": "16.14.2",
15
- "@webiny/app": "5.21.0-beta.0",
16
- "@webiny/app-admin": "5.21.0-beta.0",
17
- "@webiny/app-security": "5.21.0-beta.0",
18
- "@webiny/plugins": "5.21.0-beta.0",
19
- "@webiny/react-router": "5.21.0-beta.0",
20
- "@webiny/ui": "5.21.0-beta.0",
15
+ "@webiny/app": "5.22.0-beta.2",
16
+ "@webiny/app-admin": "5.22.0-beta.2",
17
+ "@webiny/app-security": "5.22.0-beta.2",
18
+ "@webiny/plugins": "5.22.0-beta.2",
19
+ "@webiny/react-router": "5.22.0-beta.2",
20
+ "@webiny/ui": "5.22.0-beta.2",
21
21
  "classnames": "2.3.1",
22
22
  "emotion": "10.0.27",
23
23
  "lodash": "4.17.21",
@@ -34,8 +34,8 @@
34
34
  "@babel/preset-env": "^7.5.5",
35
35
  "@babel/preset-react": "^7.0.0",
36
36
  "@babel/preset-typescript": "^7.8.3",
37
- "@webiny/cli": "^5.21.0-beta.0",
38
- "@webiny/project-utils": "^5.21.0-beta.0",
37
+ "@webiny/cli": "^5.22.0-beta.2",
38
+ "@webiny/project-utils": "^5.22.0-beta.2",
39
39
  "babel-plugin-emotion": "^9.2.8",
40
40
  "babel-plugin-named-asset-import": "^1.0.0-next.3e165448",
41
41
  "rimraf": "^3.0.2",
@@ -55,5 +55,5 @@
55
55
  "removeViewBox": false
56
56
  }
57
57
  },
58
- "gitHead": "cad155812edbdd577a1cc858b41038fdd7a6d2d9"
58
+ "gitHead": "c472d20682885fb538354c206a148deaae14bfe8"
59
59
  }