Skip to content

Commit

Permalink
Merge branch 'assets-72024' into assets-98992
Browse files Browse the repository at this point in the history
  • Loading branch information
mdickson-adbe authored Jul 29, 2024
2 parents 3c63967 + 7deaa91 commit 4d444de
Show file tree
Hide file tree
Showing 12 changed files with 431 additions and 92 deletions.
10 changes: 10 additions & 0 deletions blocks/adp-header/adp-header.css
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,10 @@ header nav .nav-bottom {
width: 100%;
}

header.hide-navigation-tabs nav .nav-bottom {
display: none;
}

header nav {
display: grid;
grid-template-areas:
Expand All @@ -526,6 +530,12 @@ header nav {
box-shadow: 0 0 4px rgba(233 233 233 / 100%);
}

header.hide-navigation-tabs nav {
grid-template-areas:
"nav-top";
grid-template-rows: calc(var(--nav-height) - var(--header-banner-height));
}

.contenthub header nav {
background: var(--contenthub-header-background);
border-bottom: unset;
Expand Down
6 changes: 3 additions & 3 deletions blocks/adp-header/adp-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ function toggleMenu(nav, navSections, forceExpanded = null) {
*/
export default async function decorate(block) {
block.textContent = '';

const logoUrl = document.querySelector('head meta[name="logo-link"]')?.getAttribute('content');
// decorate nav DOM
const nav = document.createElement('nav');
nav.id = 'nav';
nav.innerHTML = `
<div class="nav-top">
<div class="nav-brand">
<a class="adp-logo" href="${getBaseConfigPath()}/"></a>
<a class="adp-logo" href="${logoUrl ?? getBaseConfigPath()}/"></a>
<div></div>
</div>
<div class="nav-sections">
Expand Down Expand Up @@ -224,7 +224,7 @@ export default async function decorate(block) {
}

if (await getUserProfile() !== null) {
document.querySelector('.adp-logo').href = getBaseConfigPath() + '/assets';
document.querySelector('.adp-logo').href = logoUrl ?? (getBaseConfigPath() + '/assets');
loadSearchField(nav);
if (!window.unifiedShellRuntime) {
await createUserInfo(nav);
Expand Down
142 changes: 136 additions & 6 deletions blocks/gmo-program-details/gmo-program-details.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
:root {
border-bottom: none;
}

body {
background-color: rgb(247, 246, 246);
}

.back-button {
margin-top: 20px;
background-color: #FFFFFF;
Expand All @@ -26,6 +28,7 @@ body {
font-weight: bold;
}
}

.gmo-program-details.block {
& .h1 {
font: normal normal bold 18px/27px Adobe Clean;
Expand Down Expand Up @@ -99,6 +102,51 @@ body {
}
}

.header-row3 .icon-release-tier {
width: 16px;
height: 16px;
background-image: url('/icons/launch.svg');
background-size: contain;
background-repeat: no-repeat;
margin-right: 8px;
margin-left: 16px;
}

.header-row3 .icon-categories {
width: 16px;
height: 16px;
background-image: url('/icons/folderOpenOutline.svg');
background-size: contain;
background-repeat: no-repeat;
margin-right: 8px;
margin-left: 16px;
}

.header-row3 .release-tier {
font: normal normal normal 14px/21px Adobe Clean;
margin-left: 8px;
}

.header-row3 .categories {
font: normal normal normal 14px/21px Adobe Clean;
margin-left: 8px;
}


.details-header-wrapper .header-row3 {
display: flex;
align-items: center;
}

.details-header-wrapper .header-row3 .icon-calendar {
margin-right: 10px;
}

.details-header-wrapper .header-row3 .driver-text {
font: normal normal normal 14px/21px Adobe Clean;
margin-left: 55px;
}

.campaign-img {
width: 80px;
height: 80px;
Expand Down Expand Up @@ -133,6 +181,7 @@ body {
}
}
}

.tab.two-column {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -569,6 +618,7 @@ body {
cursor: pointer;
}
}

.kpis-wrapper {
margin-top: 30px;
& ul {
Expand All @@ -582,6 +632,7 @@ body {
margin-top: 15px;
}
}

.use-cases-wrapper {
margin-bottom: 30px;
}
Expand Down Expand Up @@ -619,6 +670,7 @@ body {
flex-direction: column;
margin-top: 20px;
}

.links-wrapper {
margin-top: 30px;
& .links {
Expand All @@ -632,6 +684,7 @@ body {
color: #0D66D0;
}
}

.infocards-wrapper {
margin-right: 40px;
& .card {
Expand All @@ -645,6 +698,7 @@ body {
}
}
}

.card {
& .card-heading {
margin-top: 10px;
Expand All @@ -660,6 +714,7 @@ body {
font-size: 14px;
}
}

.milestone, .card-content {
font: normal normal normal 14px/21px Adobe Clean;
& .icon {
Expand All @@ -672,6 +727,7 @@ body {
margin-bottom: 5px;
}
}

.deliverables {
& > .page-heading {
display: flex;
Expand Down Expand Up @@ -707,6 +763,48 @@ body {
}
}
}

.total-assets-tooltip {
position: relative;
display: inline-block;
cursor: pointer;
}

.total-assets-tooltip .tooltiptext {
visibility: hidden;
white-space: nowrap; /* Ensure text appears on one line */
background-color: #D3D3D3; /* Match the background color */
color: black; /* Match the text color */
text-align: left; /* Left-align the text */
border-radius: 4px;
padding: 5px 10px; /* Adjust padding as needed */
position: absolute;
z-index: 1;
top: 50%; /* Center vertically */
left: 100%; /* Position to the right of the element */
transform: translateY(-50%); /* Center vertically */
margin-left: 10px; /* Adjust margin to match the screenshot */
opacity: 0;
transition: opacity 0.3s;
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1); /* Add shadow for better visibility */
}

.total-assets-tooltip .tooltiptext::after {
content: "";
position: absolute;
top: 50%; /* Center the arrow vertically */
left: -5px; /* Adjust to position the arrow */
transform: translateY(-50%); /* Center vertically */
border-width: 5px;
border-style: solid;
border-color: transparent #D3D3D3 transparent transparent; /* Arrow color matches tooltip background */
}

.total-assets-tooltip:hover .tooltiptext {
visibility: visible;
opacity: 1;
}

.table-wrapper {
font: normal normal bold 14px/21px Adobe Clean;
& > .table-header {
Expand All @@ -724,6 +822,7 @@ body {
top: 0;
}
}

.table-content {
max-height: 45vh;
min-height: 7vh;
Expand All @@ -732,10 +831,12 @@ body {
display: none;
}
}

.inactive {
display: none !important;
visibility: hidden;
}

.row {
height: 56px;
&:not(:last-child) {
Expand All @@ -744,23 +845,24 @@ body {
&.datarow {
display: flex;
align-items: center;
height: 88px;
height: auto; /* Set to auto to accommodate varying heights */
font-weight: 200;
& .property {
line-height: 88px;
line-height: normal; /* Adjust line-height to normal */
padding: 10px 0; /* Add padding for better spacing */
}
&:first-child, &:nth-child(2) {
border-top: 2px solid #F4F4F4;
}
& .deliverable-name, .platforms, .deliverable-type, .review-link, .kpi {
& .deliverable-name, .platforms, .deliverable-type, .qa-files, .kpi {
overflow: hidden;
text-overflow: ellipsis;
line-height: 16px;
}
& .date-wrapper {
display: flex;
flex-direction: column;
justify-content:center;
justify-content: center;
& > .completion-date, .revised-date {
line-height: 21px;
}
Expand Down Expand Up @@ -801,6 +903,7 @@ body {
justify-content: center;
}
}

.subheader {
&:nth-child(2) {
border-top: 2px solid #F4F4F4;
Expand Down Expand Up @@ -845,12 +948,13 @@ body {
border-radius: 3px;
}
}

}

.header-row3:hover .date-tooltip {
visibility: visible;
opacity: 1;
}

.date-tooltip {
background-color: #D3D3D3;
border-radius: 2px;
Expand All @@ -863,32 +967,58 @@ body {
font: normal normal normal 12px/17px Adobe Clean;
margin-left: 100px;
}

.column1 {
margin-left: 45px;
}

.column1 {
width: 200px;
}

.column3 {
width: 140px;
}
.column4, & .column5, & .column6 {

.column4, .column5, .column6 {
width: 110px;
}

.column2 {
width: 130px;
}

.column7 {
width: 170px;
}

.column8 {
width: 120px;
}

.column9 {
width: 150px;
word-wrap: break-word;
white-space: normal;
line-height: 1.2;
}

.table-column {
&:not(:last-child) {
margin-right: 85px;
}
}

@media (max-width: 1255px) {
.column9 {
width: 100px;
}
}

.hide-overflow {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
overflow: hidden;
text-overflow: ellipsis;
}
Loading

0 comments on commit 4d444de

Please sign in to comment.