Merge branch 'master' into feat/TMG-2380-web-replace-save-share-entit…

…lements-source-with-cps-endpoint-behind-feature-flag
newsuk · Oct 22, 2024 · 2c5b040 · 2c5b040
2 parents 6169cef + fb61d00
commit 2c5b040
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 13 deletions.
diff --git a/packages/article-main-comment/CHANGELOG.md b/packages/article-main-comment/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.90.0](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-22)
+
+
+### Features
+
+* **TMW-000:** ArticleHeader - MainComment ([#3966](https://github.com/newsuk/times-components/issues/3966)) ([e97af55](https://github.com/newsuk/times-components/commit/e97af5505ef84009b57f90673ba6fbb205d65d9c))
+
+
+
+
+
 ## [2.89.8](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-19)
 
 **Note:** Version bump only for package @times-components/article-main-comment

diff --git a/...ages/article-main-comment/__tests__/web/__snapshots__/article-with-style.web.test.js.snap b/...ages/article-main-comment/__tests__/web/__snapshots__/article-with-style.web.test.js.snap
@@ -495,9 +495,8 @@ exports[`full article with style 1`] = `
   font-size: 20px;
   line-height: 26px;
   color: #333333;
-  margin-bottom: 15px;
-  padding-left: 10px;
-  padding-right: 10px;
+  margin-top: -5px;
+  margin-bottom: 20px;
   text-align: center;
 }
 
@@ -696,6 +695,8 @@ exports[`full article with style 1`] = `
     margin: 0 auto 10px;
     margin-left: auto;
     margin-right: auto;
+    padding-right: 0;
+    padding-left: 0;
   }
 }
 
@@ -809,7 +810,6 @@ exports[`full article with style 1`] = `
           alignItems="center"
           className="c3"
           marginBottom="15px"
-          paddingBottom="20px"
           paddingLeft="10px"
           paddingRight="10px"
           paddingTop="35px"

diff --git a/packages/article-main-comment/package.json b/packages/article-main-comment/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@times-components/article-main-comment",
-  "version": "2.89.8",
+  "version": "2.90.0",
   "description": "Main Comment Article Template",
   "main": "dist/article-main-comment",
   "dev": "src/article-main-comment",

diff --git a/packages/article-main-comment/src/styles/responsive.js b/packages/article-main-comment/src/styles/responsive.js
@@ -49,6 +49,8 @@ export const HeaderContainer = styled(TcView)`
     margin: 0 auto ${spacing(2)};
     margin-left: auto;
     margin-right: auto;
+    padding-right: 0;
+    padding-left: 0;
   }
 
   @media (min-width: ${breakpoints.wide}px) {

diff --git a/packages/article-main-comment/src/styles/shared.js b/packages/article-main-comment/src/styles/shared.js
@@ -38,7 +38,6 @@ const sharedStyles = {
   header: {
     // TODO: put back after design signoff
     marginBottom: spacing(3),
-    paddingBottom: spacing(4),
     paddingTop: spacing(7)
   },
   label: {
@@ -75,9 +74,8 @@ const sharedStyles = {
       fontSize: "smallestHeadline"
     }),
     color: colours.functional.primary,
-    marginBottom: spacing(3),
-    paddingLeft: spacing(2),
-    paddingRight: spacing(2),
+    marginTop: spacing(-1),
+    marginBottom: spacing(4),
     textAlign: "center"
   }
 };

diff --git a/packages/article/CHANGELOG.md b/packages/article/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.17.29](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-22)
+
+**Note:** Version bump only for package @times-components/article
+
+
+
+
+
 ## [7.17.28](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-19)
 
 **Note:** Version bump only for package @times-components/article

diff --git a/packages/article/package.json b/packages/article/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@times-components/article",
-  "version": "7.17.28",
+  "version": "7.17.29",
   "description": "The article",
   "main": "dist/article",
   "dev": "src/article",
@@ -56,7 +56,7 @@
     "@times-components/article-in-depth": "3.90.8",
     "@times-components/article-magazine-comment": "3.86.8",
     "@times-components/article-magazine-standard": "3.86.8",
-    "@times-components/article-main-comment": "2.89.8",
+    "@times-components/article-main-comment": "2.90.0",
     "@times-components/article-main-standard": "3.98.8",
     "@times-components/context": "1.24.0",
     "@times-components/message-bar": "0.7.85",

diff --git a/packages/ssr/CHANGELOG.md b/packages/ssr/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.59.10](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-22)
+
+**Note:** Version bump only for package @times-components/ssr
+
+
+
+
+
 ## [2.59.9](https://github.com/newsuk/times-components/compare/@times-components/[email protected]...@times-components/[email protected]) (2024-10-19)
 
 **Note:** Version bump only for package @times-components/ssr

diff --git a/packages/ssr/package.json b/packages/ssr/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@times-components/ssr",
   "main": "src",
-  "version": "2.59.9",
+  "version": "2.59.10",
   "scripts": {
     "bundle:dev": "yarn cleanup-dist && webpack --config=webpack.config.js",
     "bundle:prod": "yarn cleanup-dist && NODE_ENV=production webpack --config=webpack.config.js -p",
@@ -52,7 +52,7 @@
     "webpack": "4.30.0"
   },
   "dependencies": {
-    "@times-components/article": "7.17.28",
+    "@times-components/article": "7.17.29",
     "@times-components/author-profile": "6.19.6",
     "@times-components/context": "1.24.0",
     "@times-components/provider": "1.41.4",