Skip to content

Commit 1ad2a34

Browse files
authored
Merge pull request #3457 from ArmDeveloperEcosystem/adsv5
Adsv5
2 parents c4fea02 + f297b70 commit 1ad2a34

33 files changed

Lines changed: 207 additions & 113 deletions

assets/css/content-pages.css

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,31 @@
55
top:5px;
66
}
77

8+
.left-nav-pane a.a-tab {
9+
display: block;
10+
line-height: 0;
11+
margin: 0 !important;
12+
padding: 0 !important;
13+
}
14+
15+
.left-nav-pane a.a-tab + a.a-tab {
16+
margin-top: -1px !important;
17+
}
18+
819

920
/* Tab color on left */
10-
.tab-row {
21+
.left-nav-pane .tab-row {
1122
background-color: var(--arm-dark-grey);
23+
display: flex;
24+
gap: 0 !important;
25+
line-height: normal;
26+
margin: 0 !important;
27+
padding: 0 !important;
28+
row-gap: 0 !important;
29+
}
30+
31+
.left-nav-pane a.a-tab + a.a-tab .tab-row {
32+
margin-top: -1px !important;
1233
}
1334
html[theme='dark'] .tab-row {
1435
background-color: var(--arm-black); /* rgba(163, 168, 174,1); #2A2B2D; */
@@ -26,8 +47,11 @@ html[theme='dark'] .tab-row.active {
2647
.tab-right-card {
2748
border-style: solid;
2849
border-width: 1px;
50+
box-sizing: border-box;
2951
width: 100%;
3052
margin-left: 10px;
53+
margin-top: 0;
54+
margin-bottom: 0;
3155

3256
border-color: var(--arm-dark-grey);
3357
background-color: var(--arm-black);
@@ -61,6 +85,7 @@ html[theme='dark'] .tab-right-card > h6 {
6185
.tab-right-card-header {
6286
margin: 10px;
6387
font-size:1em;
88+
line-height: 1.2;
6489
}
6590

6691
/* Force a 2-line clamp for masthead title */
@@ -87,7 +112,7 @@ a:hover {
87112
border-color: var(--arm-green);
88113
}
89114
.tab-row.inactive:hover h6 {
90-
color: var(--arm-green); }
115+
color: var(--lp-hover-text); }
91116

92117

93118

@@ -103,14 +128,15 @@ p.github-link {
103128
margin-bottom: 0px;
104129

105130
color: var(--arm-web-safe-blue);
131+
line-height: 1.25;
106132
text-decoration: none;
107133
}
108134

109135
html[theme='dark'] p.github-link {
110136
color: var(--arm-light-blue);
111137
}
112138
html[theme='dark'] p.github-link:hover {
113-
color: var(--arm-green);
139+
color: var(--lp-hover-text);
114140
}
115141

116142
div.github-div {
@@ -133,6 +159,16 @@ html[theme='dark'] div.github-div {
133159

134160
}
135161

162+
div.github-div > a {
163+
display: block;
164+
margin: 0;
165+
padding: 0;
166+
}
167+
168+
div.github-div > a + a {
169+
margin-top: 8px;
170+
}
171+
136172

137173

138174
/* Multi-tool page styling (like for docker)
@@ -170,11 +206,11 @@ html[theme='dark'] .multi-tool-selection-title {
170206
}
171207
ads-card.multi-install-card:hover .multi-tool-selection-title{
172208
transition: color 0.3s ease-in-out;
173-
color: var(--arm-green);
209+
color: var(--lp-hover-text);
174210
}
175211
html[theme='dark'] ads-card.multi-install-card:hover .multi-tool-selection-title {
176212
transition: color 0.3s ease-in-out;
177-
color: var(--arm-green);
213+
color: var(--lp-hover-text);
178214
}
179215

180216

@@ -258,7 +294,7 @@ html[theme='dark'] .incorrect-explain {color: #e86868} /* 27% lighter than arm's
258294
text-decoration: none;
259295
}
260296
.social-icons a:hover {
261-
color: var(--arm-green);
297+
color: var(--lp-hover-text);
262298
}
263299

264300

@@ -342,11 +378,11 @@ html[theme='dark'] ads-expansion-panel.generated-summary-faq__panel {
342378
text-decoration: none;
343379
}
344380
.share-icon:hover {
345-
fill: var(--arm-green);
381+
fill: var(--lp-hover-text);
346382
cursor: pointer;
347383
}
348384
#link-copied-success {
349-
color: var(--arm-green);
385+
color: var(--lp-hover-text);
350386
background-color: var(--arm-black);
351387
border-radius: 10px;
352388
padding-left:8px;

assets/css/content.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ div.answer label {
196196
--ads-horizontal-tabs-tab-color-active: var(--arm-orange);
197197
--ads-horizontal-tabs-underline-color: var(--arm-orange);
198198

199-
--ads-horizontal-tabs-tab-color-hover: var(--arm-green);
199+
--ads-horizontal-tabs-tab-color-hover: var(--lp-hover-text);
200200
--ads-horizontal-tabs-tab-content-background-color: var(--arm-color-footing);
201201
}
202202

assets/css/cross-page.css

Lines changed: 50 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,19 @@
4646
/* UNIVERSAL */
4747
/****************************************************/
4848

49+
/* Local ADS v5 accent experiment */
50+
:root {
51+
--lp-accent-primary: #6023DE; /* ADS UI Violet 65 */
52+
--lp-accent-secondary: #D1BAFC; /* ADS UI Violet 04 */
53+
--lp-hover-text: #D9D9D9; /* ADS UI Gray 35 */
54+
55+
/* Keep existing site styles working while testing the v5 palette. */
56+
--arm-green: var(--lp-accent-primary);
57+
--arm-light-blue: var(--lp-accent-secondary);
58+
--arm-web-safe-blue: var(--lp-accent-secondary);
59+
--arm-blue: var(--lp-accent-secondary);
60+
}
61+
4962
/* ADS FIXES */
5063
/***************************************************/
5164
/* Font size hardcoding to fix ADS */
@@ -87,47 +100,50 @@ ads-button {
87100
/* primary */
88101
--ads-button-background-color-primary-hover: var(--arm-green);
89102
--ads-button-border-color-primary-hover: var(--arm-green);
103+
--ads-button-color-primary-hover: var(--lp-hover-text);
90104

91105
/* secondary */
92106
--ads-button-border-color-secondary-hover: var(--arm-green);
93-
--ads-button-color-secondary-hover: var(--arm-green);
107+
--ads-button-color-secondary-hover: var(--lp-hover-text);
94108

95109
/* tertiary */
96110
--ads-button-border-color-tertiary-hover: var(--arm-green);
97-
--ads-button-color-tertiary-hover: var(--arm-green);
111+
--ads-button-color-tertiary-hover: var(--lp-hover-text);
98112
}
99113
ads-cta-button {
100114
/* primary */
101115
--ads-cta-button-background-color-primary-hover: var(--arm-green);
102116
--ads-cta-button-border-color-primary-hover: var(--arm-green);
117+
--ads-cta-button-color-primary-hover: var(--lp-hover-text);
103118

104119
/* secondary */
105120
--ads-cta-button-border-color-secondary-hover: var(--arm-green);
106-
--ads-cta-button-color-secondary-hover: var(--arm-green);
121+
--ads-cta-button-color-secondary-hover: var(--lp-hover-text);
107122

108123
/* tertiary */
109124
--ads-cta-button-border-color-tertiary-hover: var(--arm-green);
110-
--ads-cta-button-color-tertiary-hover: var(--arm-green);
125+
--ads-cta-button-color-tertiary-hover: var(--lp-hover-text);
111126
}
112127

113128
/* button, form submit syntax */
114129
input[type="submit"]:hover {
115130
background-color: var(--arm-green);
116131
border-color: var(--arm-green);
132+
color: var(--lp-hover-text);
117133
box-shadow: none;
118134
}
119135
ads-tag {
120136
--ads-tag-border-color-hover: var(--arm-green);
121-
--ads-tag-color-hover: var(--arm-green);
137+
--ads-tag-color-hover: var(--lp-hover-text);
122138
}
123139

124140
/* Remove text decorations on all a links when highlighted */
125141
a:hover {
126142
text-decoration: none;
127-
color: var(--arm-green);
143+
color: var(--lp-hover-text);
128144
}
129145
ads-cta-link {
130-
--ads-cta-link-color-hover: var(--arm-green);
146+
--ads-cta-link-color-hover: var(--lp-hover-text);
131147
}
132148
ads-search {
133149
--ads-search-border-color-hover: var(--arm-green);
@@ -194,7 +210,6 @@ arm-top-navigation:not(:defined) {
194210
background-color: #010101;
195211
}
196212

197-
198213
/* Fix Masthead Height */
199214
#expanded-masthead {
200215
background-color: transparent;
@@ -218,9 +233,26 @@ ads-masthead {
218233

219234

220235
ads-breadcrumbs {
221-
--ads-breadcrumb-color: var(--arm-green);
222-
--ads-breadcrumbs-link-color: var(--arm-green);
223-
--ads-breadcrumbs-link-color-visited: var(--arm-green);
236+
--ads-breadcrumb-color: var(--lp-accent-secondary);
237+
--ads-breadcrumb-current-color: white;
238+
--ads-breadcrumb-hover-color: var(--lp-hover-text);
239+
--ads-breadcrumbs-link-color: var(--lp-accent-secondary);
240+
--ads-breadcrumbs-link-color-hover: var(--lp-hover-text);
241+
--ads-breadcrumbs-link-color-visited: var(--lp-accent-secondary);
242+
--ads-breadcrumbs-current-color: white;
243+
}
244+
245+
#breadcrumb-element ads-breadcrumb[current] {
246+
--ads-breadcrumb-color: white;
247+
--ads-breadcrumb-current-color: white;
248+
--ads-breadcrumbs-current-color: white;
249+
color: white;
250+
}
251+
252+
#breadcrumb-element ads-breadcrumb:not([current]):hover {
253+
--ads-breadcrumb-color: var(--lp-hover-text);
254+
--ads-breadcrumbs-link-color: var(--lp-hover-text);
255+
color: var(--lp-hover-text);
224256
}
225257

226258

@@ -251,8 +283,8 @@ ads-breadcrumbs {
251283
border-style: solid;
252284
border-width: 1px;
253285
border-radius: 0px;
254-
border-color: rgba(149, 214, 0, 0.25); /* var(--arm-green) with 25% transparency */
255-
border-color: rgba(0, 193, 222, 0.25); /* var(--arm-light-blue) with 25% transparency */
286+
border-color: rgba(96, 35, 222, 0.25); /* var(--lp-accent-primary) with 25% transparency */
287+
border-color: rgba(209, 186, 252, 0.25); /* var(--lp-accent-secondary) with 25% transparency */
256288

257289
padding-left: 4px;
258290
padding-right: 4px;
@@ -296,7 +328,7 @@ ads-breadcrumbs {
296328
margin: -1px;
297329
z-index: -1;
298330
border-radius: inherit;
299-
background: linear-gradient(90deg, #95D629, #20C1DE);
331+
background: linear-gradient(90deg, var(--lp-accent-primary), var(--lp-accent-secondary));
300332
opacity: 0;
301333
transition: opacity 0.3s ease;
302334
}
@@ -323,7 +355,7 @@ ads-breadcrumbs {
323355
margin: -2px;
324356
z-index: -1;
325357
border-radius: inherit;
326-
background: linear-gradient(90deg, #95D629, #20C1DE );
358+
background: linear-gradient(90deg, var(--lp-accent-primary), var(--lp-accent-secondary));
327359
opacity: 0;
328360
transition: opacity 0.3s ease;
329361
}
@@ -381,7 +413,7 @@ html[theme='light'] body {
381413
/* Mobile background */
382414
@media (max-width: 768px) {
383415
html[theme='dark'] body {
384-
background-image: url("/img/bg-img-736x800.webp");
416+
background-image: url("/img/bg-img-736x800-purple.webp");
385417
background-color: var(--arm-color-footing);
386418
background-position: 0% 100%;
387419
background-attachment: fixed;
@@ -391,7 +423,7 @@ html[theme='light'] body {
391423
/* Laptop background */
392424
@media (min-width: 768px) {
393425
html[theme='dark'] body {
394-
background-image: url("/img/bg-img-1920x1600.webp");
426+
background-image: url("/img/bg-img-1920x1600-purple.webp");
395427
background-color: var(--arm-color-footing);
396428
background-position: 0% 100%;
397429
background-attachment: fixed;
@@ -402,7 +434,7 @@ html[theme='light'] body {
402434
/* Large Monitor background */
403435
@media (min-width: 1400px) {
404436
html[theme='dark'] body {
405-
background-image: url("/img/bg-img-2500x1700.webp");
437+
background-image: url("/img/bg-img-2500x1700-purple.webp");
406438
background-color: var(--arm-color-footing);
407439
background-position: 0% 100%;
408440
background-attachment: fixed;

assets/css/demo.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
font-size: 14px!important;
174174
}
175175
#reset-demo-txt:hover {
176-
color: var(--arm-green);
176+
color: var(--lp-hover-text);
177177
}
178178
#ping-info, #traffic-info, #terms-of-use {
179179
float: left;

assets/css/feedback.css

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,17 @@
1616
}
1717
.rating label {
1818
color: white;
19+
cursor: pointer;
1920
position: relative;
2021
}
21-
/*
22-
.rating label:hover,
23-
.rating label:hover ~ label,
24-
.rating input:checked + label,
25-
.rating input:checked + label ~ label {
26-
color: pink!important;
27-
}
28-
*/
29-
.rating label:hover:before,
30-
.rating label:hover ~ label:before,
31-
.rating input:checked + label:before,
32-
.rating input:checked + label ~ label:before {
33-
content: "\f005"; /* fa-star */
34-
font-family: "Font Awesome 6 Pro";
35-
font-weight: 900;
36-
font-size: 2rem; /* fa-2x */
37-
color: white!important;
38-
position: absolute;
39-
left: 0;
40-
top: 0;
41-
margin-top:-8px;
42-
}
43-
4422

45-
/*
46-
.rating i.fa-star::before {
47-
content: "\f005";
48-
49-
padding-right:5px;
50-
color: white;
23+
.rating label:hover i,
24+
.rating label:hover ~ label i,
25+
.rating input:checked + label i,
26+
.rating input:checked + label ~ label i {
27+
font-family: "Font Awesome 6 Pro";
28+
font-weight: 900;
5129
}
52-
*/
5330

5431

5532
/****************************************************/
@@ -85,4 +62,4 @@ html[theme='dark'] #error-text {color: hsl(0, 73.9%, 60%);} /* 10% lighter than
8562
}
8663
#feedback-3-thanks.smooth-open {
8764
opacity:1
88-
}
65+
}

0 commit comments

Comments
 (0)