Skip to content

Commit 676c79d

Browse files
authored
Merge pull request #2377 from topcoder-platform/develop-from-master-23may
Fix for Fixes tco03 and tco07 loading issue Add support for spaceName in header menus updates for #2348 tco19 banner P fixes Fixed table header for Lookers fix #2345
2 parents cc171c7 + b1e682b commit 676c79d

File tree

7 files changed

+35
-19
lines changed

7 files changed

+35
-19
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ workflows:
182182
branches:
183183
only:
184184
- legacy-tco
185+
- hot-fixes-3
185186
# This is beta env for production soft releases
186187
- "build-prod-beta":
187188
context : org-global

src/shared/components/Contentful/Banner/themes/tco19.scss

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,23 @@ $contentWrapperPadding: 0;
7777
}
7878

7979
p {
80-
font-size: 20px;
80+
font-size: 15px;
8181
margin-bottom: 1em;
8282
line-height: 25px;
83+
84+
strong {
85+
font-weight: bold;
86+
}
87+
88+
em {
89+
font-style: italic;
90+
}
8391
}
8492

8593
ul {
8694
list-style: disc;
8795
margin-bottom: 1em;
8896
margin-left: 20px;
89-
90-
li {
91-
p {
92-
font-size: 16px;
93-
line-height: 27px;
94-
}
95-
}
9697
}
9798

9899
input {

src/shared/components/Contentful/ContentBlock/themes/TCO19.scss

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,22 @@
110110
td {
111111
@include roboto-regular;
112112

113-
font-size: 20px;
114-
line-height: 70px;
113+
font-size: 15px;
114+
line-height: 25px;
115115
text-align: left;
116116
color: $tc-gray-80;
117117
border-top: 1px solid #ededf2;
118118
border-bottom: 1px solid #ededf2;
119-
padding: 0 10px;
119+
padding: 10px 0;
120+
min-height: 51px;
121+
122+
&:first-child {
123+
padding-left: 10px;
124+
}
125+
126+
&:last-child {
127+
padding-right: 10px;
128+
}
120129
}
121130

122131
ul,

src/shared/components/Looker/index.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ export default function Looker(props) {
7171
cols.map((c) => {
7272
const name = c.headerName;
7373
const { styles } = c;
74-
return (
74+
return name ? (
7575
<th key={name} style={styles}>{ name }</th>
76-
);
76+
) : null;
7777
})
7878

7979
}
@@ -82,7 +82,7 @@ export default function Looker(props) {
8282

8383
const bodyRow = (record, cols, i) => (
8484
<tr key={Object.values(record)}>
85-
{ (countRows && (limit <= 0 || i < limit)) ? <td> {i + 1}. </td> : ' ' }
85+
{ (countRows && (limit <= 0 || i < limit)) ? <td style={{ borderTop: '1px solid #D5D5D5' }}> {i + 1}. </td> : ' ' }
8686
{
8787
cols.map((c) => {
8888
const prop = c.property;
@@ -96,11 +96,11 @@ export default function Looker(props) {
9696
value = record[prop].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
9797
}
9898
}
99-
return (
99+
return value ? (
100100
<td key={record[prop]} style={styles} title={value}>
101101
{value}
102102
</td>
103-
);
103+
) : null;
104104
})
105105
}
106106
</tr>

src/shared/components/tc-communities/Header/index.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,12 @@ Toggle navigation
252252
<div className={isMobileOpen ? theme.menuWrapOpen : theme.menuWrap}>
253253
{
254254
menuItems[0] && menuItems[0].navigationMenu ? (
255-
<Menu id={menuItems[0].navigationMenu} baseUrl={baseUrl} />
255+
<Menu
256+
id={menuItems[0].navigationMenu}
257+
baseUrl={baseUrl}
258+
spaceName={menuItems[0].spaceName}
259+
environment={menuItems[0].environment}
260+
/>
256261
) : (
257262
<ul className={theme.menu}>
258263
{_.map(menuItems, menuIterator)}

src/shared/routes/Communities/TCO03/Routes.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default function TCO03({ base }) {
2525
<ContentfulRoute
2626
baseUrl={base}
2727
error404={<Error404 />}
28-
id="4mKZxfgAi6Us6dRS4Hy2Ab"
28+
id="2MKnrhssyBHnKH2wuV9Ate"
2929
/>
3030
<Route
3131
component={Error404}

src/shared/routes/Communities/TCO07/Routes.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default function TCO07({ base }) {
2525
<ContentfulRoute
2626
baseUrl={base}
2727
error404={<Error404 />}
28-
id="2XWcxVALvInOlAOfROErKS"
28+
id="52NfYmZnxLnJXKpIQXwnzC"
2929
/>
3030
<Route
3131
component={Error404}

0 commit comments

Comments
 (0)