Skip to content

Commit 2d93919

Browse files
amyblaisamyblais
authored
Merge branch 'master' into v9.6-documentation
2 parents 3ab73e8 + 1957a8a commit 2d93919

File tree

4 files changed

+93
-35
lines changed

4 files changed

+93
-35
lines changed

‎source/_static/myscript.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ $(document).ready(function () {
174174

175175
// Fallback for when a notification CTA expires - ie. webinar happens
176176
const dateInFuture = (value) => new Date().getTime() <= new Date(value).getTime();
177-
const expiryDate = '2024-11-01T00:00:00-0500';
178-
// 2023-11-01 @ 12am EST
177+
const expiryDate = '2024-04-01T00:00:00-0500';
178+
// 2024-04-01 @ 12am EST
179179
const fallback_url = 'https://mattermost.com/solutions/mattermost-for-microsoft-teams/';
180180
const fallback_text = 'Learn more about Mattermost for Microsoft Teams »';
181181

@@ -192,7 +192,7 @@ $(document).ready(function () {
192192
// So it will show up for new announcements
193193
// Keep "mm_notification_banner__" at the beginning of the key
194194
// Add system to clean out storage items that are no longer needed
195-
let notification_banner_key = 'mm_notification_banner__inc-23';
195+
let notification_banner_key = 'mm_notification_banner__webinar-security-mar-2024';
196196
if (!dateInFuture(expiryDate)) {
197197
notification_banner_key = 'mm_notification_banner__fallback-mst';
198198
}

‎source/_static/mytheme.css

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2430,9 +2430,9 @@ pre {
24302430

24312431
.site-header__col--menu .site-nav__hassubnav .sub-menu__developers .sub-menu__developers-grid-wrapper {
24322432
display: grid;
2433-
grid-template-columns: 75px 95px;
2434-
-moz-column-gap: 70px;
2435-
column-gap: 70px
2433+
grid-template-columns: 120px 95px;
2434+
-moz-column-gap: 40px;
2435+
column-gap: 40px
24362436
}
24372437
}
24382438

@@ -2451,13 +2451,46 @@ pre {
24512451
}
24522452

24532453
@media (min-width:992px) {
2454-
.site-header__col--menu .site-nav__hassubnav .sub-menu__login {
2454+
.site-header__col--menu .site-nav__hassubnav .sub-menu__login,
2455+
.site-header__col--menu .site-nav__hassubnav .sub-menu__enterprise {
24552456
right: unset;
24562457
margin-left: -40px;
24572458
padding: 50px 60px 20px;
24582459
}
24592460
}
24602461

2462+
@media (max-width:768px) {
2463+
.site-nav-login {
2464+
margin-top: 3rem;
2465+
}
2466+
.site-nav-login .toplink-wrapper {
2467+
border-bottom: none !important;
2468+
text-align: center;
2469+
}
2470+
.site-nav-login .sub-menu__links--single a {
2471+
justify-content: center;
2472+
}
2473+
.site-nav-login .sub-menu__links--single {
2474+
margin-bottom: 2rem !important;
2475+
}
2476+
.site-nav-login .sub-menu__links--single:last-child {
2477+
margin-bottom: 5rem !important;
2478+
}
2479+
}
2480+
2481+
@media (min-width:992px) {
2482+
.site-nav-login {
2483+
margin-left: 2rem !important;
2484+
}
2485+
}
2486+
2487+
@media (min-width:1200px) {
2488+
.site-nav-login {
2489+
margin-left: 6rem !important;
2490+
}
2491+
}
2492+
2493+
24612494
.site-header__col--menu .site-nav__hassubnav .sub-menu__col {
24622495
display: flex;
24632496
flex-wrap: wrap;
@@ -2640,7 +2673,7 @@ pre {
26402673
}
26412674

26422675
.site-header .site-nav__button:not(.site-nav__button--secondary) {
2643-
padding-top: 40px;
2676+
padding-top: 0px;
26442677
}
26452678
}
26462679

‎source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3455,12 +3455,12 @@ def setup(_: Sphinx):
34553455
# A list of CSS files. The entry must be a filename string or a tuple containing the filename string and the attributes
34563456
# dictionary. The filename must be relative to the html_static_path, or a full URI with scheme like
34573457
# https://example.org/style.css. The attributes is used for attributes of <link> tag. It defaults to an empty list.
3458-
html_css_files = ["mytheme.css?version=v52", "css/compass-icons.css"]
3458+
html_css_files = ["mytheme.css?version=v59", "css/compass-icons.css"]
34593459

34603460
# A list of JavaScript filenames. The entry must be a filename string or a tuple containing the filename string and the
34613461
# attributes dictionary. The filename must be relative to the html_static_path, or a full URI with scheme like
34623462
# https://example.org/script.js. The attributes is used for attributes of <script> tag. It defaults to an empty list.
3463-
html_js_files = ["myscript.js?version=v19"]
3463+
html_js_files = ["myscript.js?version=v20"]
34643464

34653465
# The name of an image file, relative to the configuration directory, to use as favicon of the docs. This file should
34663466
# be a Windows icon file (.ico) being 16x16 or 32x32 pixels in size.

‎source/templates/header.html

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<span aria-hidden="true">×</span>
55
</a>
66
<div class="notification-bar__wrapper">
7-
<img src="{{ pathto('_static/images/notification-bar/icon-green-rocket.svg', 1) }}" alt="" class="notification-bar__icon"><a href="https://mattermost.com/blog/inc-recognizes-mattermost-as-a-power-partner/" target="_blank" class="notification-bar__link">Inc. Recognizes Mattermost as a 2023 'Power Partner'!</a>
7+
<a href="https://mattermost.com/webinar/cybersecurity-incident-response/" target="_blank" class="notification-bar__link">[WEBINAR] Learn how to secure mission-critical work 🔐</a>
88
</div>
99
</div>
1010
</div>
@@ -157,15 +157,44 @@
157157
</div>
158158
</div>
159159
</li>
160-
<li class="site-nav__toplink">
161-
<a href="https://mattermost.com/pricing/" data-ol-has-click-handler="">
162-
<div class="toplink-wrapper">Pricing</div>
160+
<li class="site-nav__toplink site-nav__hassubnav">
161+
<a href="javascript:void(0);">
162+
<div class="toplink-wrapper">
163+
Enterprise
164+
<span>
165+
<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
166+
<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round" />
167+
</svg>
168+
</span>
169+
</div>
163170
</a>
171+
<div class="sub-menu sub-menu__enterprise">
172+
<div class="sub-menu__links-wrapper">
173+
<p class="sub-menu__link-col-header">Enterprise</p>
174+
<ul>
175+
<li class="sub-menu__links--single">
176+
<a href="https://mattermost.com/solutions/enterprise/">
177+
Enterprise Overview
178+
</a>
179+
</li>
180+
<li class="sub-menu__links--single">
181+
<a href="https://mattermost.com/solutions/why-choose-enterprise">
182+
Why Upgrade to Enterprise
183+
</a>
184+
</li>
185+
<li class="sub-menu__links--single">
186+
<a href="https://mattermost.com/solutions/enterprise/cloud/">
187+
Cloud Enterprise
188+
</a>
189+
</li>
190+
</ul>
191+
</div>
192+
</div>
164193
</li>
165194
<li class="site-nav__toplink site-nav__hassubnav">
166195
<a href="javascript:void(0);" data-ol-has-click-handler="">
167196
<div class="toplink-wrapper">
168-
Developers
197+
Resources
169198
<span>
170199
<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
171200
<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round"></path>
@@ -175,15 +204,14 @@
175204
</a>
176205
<div class="sub-menu sub-menu__developers">
177206
<div class="sub-menu__developers__main">
178-
<p class="sub-menu__link-col-header">Developers</p>
207+
<p class="sub-menu__link-col-header">Resources</p>
179208
<div class="sub-menu__developers-grid-wrapper">
180209
<div class="sub-menu__dev-link-col">
181210
<ul>
182211
<li class="sub-menu__links--single">
183-
<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
184-
Deploy
212+
<a href="https://mattermost.com/resources/" data-ol-has-click-handler="">Resources Library
185213
</a>
186-
</li>
214+
</li>
187215
<li class="sub-menu__links--single">
188216
<a href="https://developers.mattermost.com/integrate/getting-started/" data-ol-has-click-handler="">
189217
Integrate
@@ -200,10 +228,10 @@
200228
</a>
201229
</li>
202230
<li class="sub-menu__links--single">
203-
<a href="https://mattermost.com/resources/" data-ol-has-click-handler="">
204-
Resources
231+
<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
232+
Deploy
205233
</a>
206-
</li>
234+
</li>
207235
</ul>
208236
</div>
209237
<div class="sub-menu__dev-link-col">
@@ -240,19 +268,19 @@
240268
</div>
241269
</li>
242270
<li class="site-nav__toplink">
243-
<a href="https://mattermost.com/enterprise/" data-ol-has-click-handler="">
244-
<div class="toplink-wrapper">Enterprise</div>
271+
<a href="https://mattermost.com/pricing/" data-ol-has-click-handler="">
272+
<div class="toplink-wrapper">Pricing</div>
245273
</a>
246274
</li>
247-
<li class="site-nav__toplink site-nav__hassubnav">
275+
<li class="site-nav__toplink">
276+
<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
277+
<div class="toplink-wrapper">Download</div>
278+
</a>
279+
</li>
280+
<li class="site-nav__toplink site-nav__hassubnav site-nav-login">
248281
<a href="javascript:void(0);" data-ol-has-click-handler="">
249282
<div class="toplink-wrapper">
250283
Login
251-
<span>
252-
<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
253-
<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round"></path>
254-
</svg>
255-
</span>
256284
</div>
257285
</a>
258286
<div class="sub-menu sub-menu__login">
@@ -283,11 +311,8 @@
283311
</div>
284312
</div>
285313
</li>
286-
<li class="site-nav__toplink site-nav__button">
287-
<a class="mm-button mm-button-solid mm-button-blue" href="https://mattermost.com/download/" data-ol-has-click-handler="">Get Started</a>
288-
</li>
289-
<li class="site-nav__toplink site-nav__button site-nav__button--secondary">
290-
<a class="mm-button mm-button-outline--thin mm-button-outline--thin-blue" href="https://mattermost.com/contact-sales/" data-ol-has-click-handler="">Contact Sales</a>
314+
<li class="site-nav__toplink site-nav__button">
315+
<a class="mm-button mm-button-solid mm-button-blue" href="https://mattermost.com/contact-sales/" data-ol-has-click-handler="">Contact Sales</a>
291316
</li>
292317
</ul>
293318
</div>

0 commit comments

Comments
 (0)