Merge from branch feature/534-settings-page

Author: ravichdev

package-lock.json

@@ -33,6 +33,7 @@
     "@material/checkbox": "5.1.0",
     "@material/circular-progress": "7.0.0",
     "@material/data-table": "5.1.0",
+    "@material/dialog": "10.0.0",
     "@material/drawer": "5.1.0",
     "@material/floating-label": "5.1.0",
     "@material/form-field": "5.1.0",
@@ -59,7 +60,7 @@
     "@wordpress/components": "9.4.0",
     "@wordpress/compose": "3.12.0",
     "@wordpress/data": "4.14.2",
-    "@wordpress/date": "^3.13.1",
+    "@wordpress/date": "3.13.1",
     "@wordpress/dom": "2.8.0",
     "@wordpress/dom-ready": "2.8.0",
     "@wordpress/e2e-test-utils": "4.16.0",

package.json

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 .material-settings__api {
 	padding-left: 0;
 	padding-right: 0;

plugin/assets/css/src/settings/api.css

@@ -46,6 +46,10 @@
 		margin-top: 0;
 	}
 
+	& h2 {
+		margin-top: 32px;
+	}
+
 	& p {
 		font-size: 16px;
 		margin: 0;
@@ -63,4 +67,20 @@
 		text-align: left;
 		width: 105px;
 	}
+
+	& .material-settings__message {
+		align-items: center;
+		color: var(--material-design-settings-error-color);
+		display: flex;
+	}
+
+	& .material-settings__message-text {
+		font-size: 16px;
+		font-weight: 500;
+		margin-left: 10px;
+	}
+
+	.mdc-dialog .mdc-dialog__title {
+		margin-top: 0;
+	}
 }

plugin/assets/css/src/settings/base.css

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 .material-settings__cell--justify-end {
 	justify-self: flex-end;
 }

plugin/assets/css/src/settings/cell.css

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 @import "./base.css";
 @import "./updater.css";
 @import "./switch.css";

plugin/assets/css/src/settings/index.css

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 .material-settings__switch {
 	align-items: center;
 	display: flex;

plugin/assets/css/src/settings/switch.css

@@ -1,18 +1,22 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 .material-settings__updater {
 	background-color: var(--material-design-settings-background-color);
 	border-radius: 8px;
 	box-shadow: 0 1px 4px rgba(0, 0, 0, 0.12);
 	margin-bottom: 15px;
-
-	& .material-settings__message {
-		align-items: center;
-		color: var(--material-design-settings-error-color);
-		display: flex;
-	}
-
-	& .material-settings__message-text {
-		font-size: 16px;
-		font-weight: 500;
-		margin-left: 10px;
-	}
 }