Merge branch 'master' into page-weight-change

mattermost · Feb 29, 2024 · 0ef1b1b · 0ef1b1b
2 parents e100fa4 + 00093d5
commit 0ef1b1b
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 53 deletions.
diff --git a/site/config.toml b/site/config.toml
@@ -32,8 +32,8 @@ enableEmoji = true
 
   [params.notification]
     enable = true
-    url = "https://mattermost.com/blog/inc-recognizes-mattermost-as-a-power-partner/"
-    text = "Inc. Recognizes Mattermost as a 2023 'Power Partner'!"
+    url = "https://mattermost.com/webinar/cybersecurity-incident-response/"
+    text = "[WEBINAR] Learn how to secure mission-critical work"
 
   [params.search]
     enable = true

diff --git a/site/layouts/partials/nav.html b/site/layouts/partials/nav.html
@@ -144,15 +144,44 @@
 							</div>
 						</div>
 					</li>
-					<li class="site-nav__toplink">
-						<a href="https://mattermost.com/pricing/" data-ol-has-click-handler="">
-							<div class="toplink-wrapper">Pricing</div>
+					<li class="site-nav__toplink site-nav__hassubnav">
+						<a href="javascript:void(0);">
+							<div class="toplink-wrapper">
+								Enterprise
+								<span>
+									<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+										<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round" />
+									</svg>
+								</span>
+							</div>
 						</a>
+						<div class="sub-menu sub-menu__enterprise">
+							<div class="sub-menu__links-wrapper">
+								<p class="sub-menu__link-col-header">Enterprise</p>
+								<ul>
+									<li class="sub-menu__links--single">
+										<a href="https://mattermost.com/solutions/enterprise/">
+											Enterprise Overview
+										</a>
+									</li>
+									<li class="sub-menu__links--single">
+										<a href="https://mattermost.com/solutions/why-choose-enterprise">
+											Why Upgrade to Enterprise
+										</a>
+									</li>
+									<li class="sub-menu__links--single">
+										<a href="https://mattermost.com/solutions/enterprise/cloud/">
+											Cloud Enterprise
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
 					</li>
 					<li class="site-nav__toplink site-nav__hassubnav">
 						<a href="javascript:void(0);" data-ol-has-click-handler="">
 							<div class="toplink-wrapper">
-								Developers
+								Resources
 								<span>
 									<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
 										<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round"></path>
@@ -162,15 +191,14 @@
 						</a>
 						<div class="sub-menu sub-menu__developers">
 							<div class="sub-menu__developers__main">
-								<p class="sub-menu__link-col-header">Developers</p>
+								<p class="sub-menu__link-col-header">Resources</p>
 								<div class="sub-menu__developers-grid-wrapper">
 									<div class="sub-menu__dev-link-col">
 										<ul>
 											<li class="sub-menu__links--single">
-												<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
-												Deploy
+												<a href="https://mattermost.com/resources/" data-ol-has-click-handler="">Resources Library
 												</a>
-											</li>	
+											</li>
 											<li class="sub-menu__links--single">
 												<a href="https://developers.mattermost.com/integrate/getting-started/" data-ol-has-click-handler="">
 												Integrate
@@ -187,10 +215,10 @@
 												</a>
 											</li>
 											<li class="sub-menu__links--single">
-												<a href="https://mattermost.com/resources/" data-ol-has-click-handler="">
-													Resources
+												<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
+												Deploy
 												</a>
-											</li>
+											</li>	
 										</ul>
 									</div>
 									<div class="sub-menu__dev-link-col">
@@ -227,19 +255,19 @@
 						</div>
 					</li>
 					<li class="site-nav__toplink">
-						<a href="https://mattermost.com/enterprise/" data-ol-has-click-handler="">
-						<div class="toplink-wrapper">Enterprise</div>
+						<a href="https://mattermost.com/pricing/" data-ol-has-click-handler="">
+							<div class="toplink-wrapper">Pricing</div>
 						</a>
 					</li>
-					<li class="site-nav__toplink site-nav__hassubnav">
+					<li class="site-nav__toplink">
+						<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
+							<div class="toplink-wrapper">Download</div>
+						</a>
+					</li>
+					<li class="site-nav__toplink site-nav__hassubnav site-nav-login">
 						<a href="javascript:void(0);" data-ol-has-click-handler="">
 							<div class="toplink-wrapper">
 								Login
-								<span>
-									<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
-										<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round"></path>
-									</svg>
-								</span>
 							</div>
 						</a>
 						<div class="sub-menu sub-menu__login">
@@ -270,11 +298,8 @@
 							</div>
 						</div>
 					</li>
-											<li class="site-nav__toplink site-nav__button">
-							<a class="mm-button mm-button-solid mm-button-blue" href="https://mattermost.com/download/" data-ol-has-click-handler="">Get Started</a>
-						</li>
-										<li class="site-nav__toplink site-nav__button site-nav__button--secondary">
-						<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>
+					<li class="site-nav__toplink site-nav__button">
+						<a class="mm-button mm-button-solid mm-button-blue" href="https://mattermost.com/contact-sales/" data-ol-has-click-handler="">Contact Sales</a>
 					</li>
 				</ul>
 			</div>

diff --git a/site/layouts/partials/nav2.html b/site/layouts/partials/nav2.html
@@ -144,15 +144,44 @@
 							</div>
 						</div>
 					</li>
-					<li class="site-nav__toplink">
-						<a href="https://mattermost.com/pricing/" data-ol-has-click-handler="">
-							<div class="toplink-wrapper">Pricing</div>
+					<li class="site-nav__toplink site-nav__hassubnav">
+						<a href="javascript:void(0);">
+							<div class="toplink-wrapper">
+								Enterprise
+								<span>
+									<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+										<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round" />
+									</svg>
+								</span>
+							</div>
 						</a>
+						<div class="sub-menu sub-menu__enterprise">
+							<div class="sub-menu__links-wrapper">
+								<p class="sub-menu__link-col-header">Enterprise</p>
+								<ul>
+									<li class="sub-menu__links--single">
+										<a href="https://mattermost.com/solutions/enterprise/">
+											Enterprise Overview
+										</a>
+									</li>
+									<li class="sub-menu__links--single">
+										<a href="https://mattermost.com/solutions/why-choose-enterprise">
+											Why Upgrade to Enterprise
+										</a>
+									</li>
+									<li class="sub-menu__links--single">
+										<a href="https://mattermost.com/solutions/enterprise/cloud/">
+											Cloud Enterprise
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
 					</li>
 					<li class="site-nav__toplink site-nav__hassubnav">
 						<a href="javascript:void(0);" data-ol-has-click-handler="">
 							<div class="toplink-wrapper">
-								Developers
+								Resources
 								<span>
 									<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
 										<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round"></path>
@@ -162,15 +191,14 @@
 						</a>
 						<div class="sub-menu sub-menu__developers">
 							<div class="sub-menu__developers__main">
-								<p class="sub-menu__link-col-header">Developers</p>
+								<p class="sub-menu__link-col-header">Resources</p>
 								<div class="sub-menu__developers-grid-wrapper">
 									<div class="sub-menu__dev-link-col">
 										<ul>
 											<li class="sub-menu__links--single">
-												<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
-												Deploy
+												<a href="https://mattermost.com/resources/" data-ol-has-click-handler="">Resources Library
 												</a>
-											</li>	
+											</li>
 											<li class="sub-menu__links--single">
 												<a href="https://developers.mattermost.com/integrate/getting-started/" data-ol-has-click-handler="">
 												Integrate
@@ -187,10 +215,10 @@
 												</a>
 											</li>
 											<li class="sub-menu__links--single">
-												<a href="https://mattermost.com/resources/" data-ol-has-click-handler="">
-													Resources
+												<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
+												Deploy
 												</a>
-											</li>
+											</li>	
 										</ul>
 									</div>
 									<div class="sub-menu__dev-link-col">
@@ -227,19 +255,19 @@
 						</div>
 					</li>
 					<li class="site-nav__toplink">
-						<a href="https://mattermost.com/enterprise/" data-ol-has-click-handler="">
-						<div class="toplink-wrapper">Enterprise</div>
+						<a href="https://mattermost.com/pricing/" data-ol-has-click-handler="">
+							<div class="toplink-wrapper">Pricing</div>
 						</a>
 					</li>
-					<li class="site-nav__toplink site-nav__hassubnav">
+					<li class="site-nav__toplink">
+						<a href="https://mattermost.com/download/" data-ol-has-click-handler="">
+							<div class="toplink-wrapper">Download</div>
+						</a>
+					</li>
+					<li class="site-nav__toplink site-nav__hassubnav site-nav-login">
 						<a href="javascript:void(0);" data-ol-has-click-handler="">
 							<div class="toplink-wrapper">
 								Login
-								<span>
-									<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg">
-										<path d="M1 1.50262L5.5 5.97313L10 1.50262" stroke="#BABEC9" stroke-width="1.5" stroke-linejoin="round"></path>
-									</svg>
-								</span>
 							</div>
 						</a>
 						<div class="sub-menu sub-menu__login">
@@ -270,11 +298,8 @@
 							</div>
 						</div>
 					</li>
-											<li class="site-nav__toplink site-nav__button">
-							<a class="mm-button mm-button-solid mm-button-blue" href="https://mattermost.com/download/" data-ol-has-click-handler="">Get Started</a>
-						</li>
-										<li class="site-nav__toplink site-nav__button site-nav__button--secondary">
-						<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>
+					<li class="site-nav__toplink site-nav__button">
+						<a class="mm-button mm-button-solid mm-button-blue" href="https://mattermost.com/contact-sales/" data-ol-has-click-handler="">Contact Sales</a>
 					</li>
 				</ul>
 			</div>

diff --git a/site/static/css/styles.css b/site/static/css/styles.css
@@ -4868,11 +4868,15 @@ ol > li + li {
 }
 
 @media (min-width:992px) {
-	.site-header__col--menu .site-nav__hassubnav .sub-menu__login {
+	.site-header__col--menu .site-nav__hassubnav .sub-menu__login,
+    .site-header__col--menu .site-nav__hassubnav .sub-menu__enterprise {
 		right: unset;
 		margin-left: -40px;
 		padding: 50px 60px 20px;
 	}
+    .sub-menu__enterprise ul {
+		padding-left: 0px;
+	}
 }
 
 .site-header__col--menu .site-nav__hassubnav .sub-menu__col {
@@ -5054,7 +5058,38 @@ ol > li + li {
 	}
 
 	.site-header .site-nav__button:not(.site-nav__button--secondary) {
-		padding-top: 40px;
+		padding-top: 0px;
+	}
+}
+
+@media (max-width:768px) {
+	.site-nav-login {
+		margin-top: 3rem;
+	}
+	.site-nav-login .toplink-wrapper {
+		border-bottom: none !important;
+		text-align: center;
+	}
+	.site-nav-login .sub-menu__links--single a {
+		justify-content: center;
+	}
+	.site-nav-login .sub-menu__links--single {
+		margin-bottom: 2rem !important;
+	}
+	.site-nav-login .sub-menu__links--single:last-child {
+		margin-bottom: 5rem !important;
+	}
+}
+
+@media (min-width:992px) {
+	.site-nav-login {
+		margin-left: 2rem !important;
+	}
+}
+
+@media (min-width:1200px) {
+	.site-nav-login {
+		margin-left: 6rem !important;
 	}
 }
 
@@ -5384,7 +5419,6 @@ footer.site-footer {
     }
 }
 
-
 /* Footer */
 .footer__icons {
     margin: 0;