Skip to content

Commit

Permalink
Merge branch 'leecalcote/identity'
Browse files Browse the repository at this point in the history
  • Loading branch information
leecalcote committed Oct 28, 2023
2 parents cd39181 + 616281f commit 9915638
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 23 deletions.
8 changes: 4 additions & 4 deletions assets/scss/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
> h1 {
font-weight: $font-weight-bold;
margin-bottom: 1rem;
color: $saffron;
color: $casper;
}

> h2 {
margin-bottom: 1rem;
color: $saffron;
color: $casper;
}

> h2:not(:first-child) {
margin-top: 3rem;
color: $saffron;
color: $casper;
}

> h2 + h3 {
Expand All @@ -37,7 +37,7 @@
> h6 {
margin-bottom: 1rem;
margin-top: 2rem;
color: $saffron;
color: $lightslategray;
& a {
color: pink;
}
Expand Down
12 changes: 12 additions & 0 deletions assets/scss/_styles_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
.navbar-brand {
margin: 1.5rem;
}
.navbar-dark {
background-color: $black;
}

// Main Body

.td-outer {
margin-top: 2rem;
}

// Links

a {
Expand All @@ -19,6 +25,7 @@ a:not([href]):not([class]), a:not([href]):not([class]):hover {
color: inherit;
text-decoration: none; }

// Taxonomy

.taxonomy-label {
color: $gray-900;
Expand All @@ -30,3 +37,8 @@ a:not([href]):not([class]), a:not([href]):not([class]):hover {
background-color: $secondary;
}
}

// Footer
.td-footer {
background-color: $black;
}
20 changes: 10 additions & 10 deletions assets/scss/_variables_project.scss
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@


// Bootstrap options

$enable-gradients: true !default;
$enable-shadows: true !default;
$enable-gradients: true;
$enable-shadows: false;

// Theme colors

$primary: #00B39F;
$green: #00B39F;
$secondary: #00D3A9;

$success: #3772ff !default;
$info: #c0e0de !default;
$warning: #ed6a5a !default;
$danger: #ed6a5a !default;
$danger: #ed6a5a;
$light: #d3f3ee;
$dark: #1E2117;
$blonde: #FFF3C5;
$saffron: #EBC017;
$lightslategray: #7A848E;
$casper: #B1B6B8;

// $bg-gradient:#1E2117;
$code-color: shade-color($secondary, 40%) !default;
Expand All @@ -28,16 +27,17 @@ $code-color: shade-color($secondary, 40%) !default;
// Body
$body-color: #ccc;
$body-bg: #010101;
$color: yellow;

// UI element colors
// Lefthand sidebar with inter-page docs menu

$border-color: rgba($primary, .33);
$td-sidebar-tree-root-color: #ccc;
$td-sidebar-bg-color: rgba($dark, .33);
$td-sidebar-color: rgba($white, .33);
$td-sidebar-border-color: $border-color;
$td-sidebar-bg-color: rgba($dark,.73);

// Righthand sidebar with intra-page table of contents
$td-sidebar-toc-bg-color: rgba($dark,.73);

// Background colors for the sections on home page etc. It is a paint by number
Expand Down Expand Up @@ -96,8 +96,8 @@ $pagination-disabled-color: $gray-300 !default;

// Navbar

$navbar-dark-color: rgba($white, 0.75) !default; // TODO: consider moving into UG SCSS
$navbar-dark-hover-color: rgba($white, 0.35) !default; // TODO: consider moving into UG SCSS
$navbar-dark-color: rgba($white, 0.75) !default;
$navbar-dark-hover-color: rgba($white, 0.35) !default;

// Footer

Expand Down
13 changes: 8 additions & 5 deletions content/en/Playground/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,23 @@ linkTitle: Playground
menu: {main: {weight: 10}}
---

{{% blocks/cover title="Meshery Playground" image_anchor="bottom" height="auto" %}}
{{% blocks/cover title="Meshery Playground" %}}
[Try it now!](https://play.meshery.io)

**The Cloud Native Playground**

Explore the Cloud Native Computing Foundation's graduated, incubation, and sandbox projects as well as many other popular open source projects. Use Meshery Playground to explore a new way of DevOps - visual and collaborative configuration management for your infrastructure.
Become a Layer5 power user.
{.mt-5}
<!--
{{% /blocks/cover %}}

{{% blocks/lead %}}

{{% /blocks/cover %}}


{{% /blocks/lead %}} -->
{{% blocks/lead %}}
{{% blocks/feature icon="fa-brands fa-github" title="Contributions welcome!" url="https://github.com/gohugoio/hugo" %}}
We do a [Pull Request](https://github.com/gohugoio/hugo/pulls) contributions workflow on **GitHub**. New users are always welcome!
{{% /blocks/feature %}}


{{% /blocks/lead %}}
File renamed without changes
6 changes: 3 additions & 3 deletions content/en/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
title: Layer5
---

{{< blocks/cover title="Find your way" image_anchor="top" height="full" >}}
{{< blocks/cover title="Expect More from Your Infrastructure" image_anchor="top" height="full" >}}
<a class="btn btn-lg btn-primary me-3 mb-4" href="/docs/">
User Guide <i class="fas fa-arrow-alt-circle-right ms-2"></i>
Cloud Docs <i class="fas fa-arrow-alt-circle-right ms-2"></i>
</a>
<a class="btn btn-lg btn-secondary me-3 mb-4" href="/meshmap">
Administrator Guide <i class="fab fa-github ms-2 "></i>
MeshMap Docs <i class="fas fa-arrow-alt-circle-right ms-2"></i>
</a>
<p class="lead mt-5"></p>

Expand Down
46 changes: 46 additions & 0 deletions layouts/partials/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{{ $links := .Site.Params.links -}}
<footer class="td-footer row d-print-none">
<div class="container-fluid">
<div class="row mx-md-2">
<div class="col-6 col-sm-4 text-xs-center order-sm-2">
{{ with $links }}
{{ with index . "user" }}
{{ template "footer-links-block" . }}
{{ end }}
{{ end }}
</div>
<div class="col-6 col-sm-4 text-end text-xs-center order-sm-3">
{{ with $links }}
{{ with index . "developer" }}
{{ template "footer-links-block" . }}
{{ end }}
{{ end }}
</div>
<div class="td-footer__copyright-etc col-12 col-sm-4 text-center py-2 order-sm-2">
{{ with .Site.Params.copyright -}}
<span>&copy; {{ now.Year }} {{ . }} {{ T "footer_all_rights_reserved" }}</span>
{{- end }}
{{ with .Site.Params.privacy_policy -}}
<span class="ms-1"><a href="{{ . }}" target="_blank" rel="noopener">{{ T "footer_privacy_policy" }}</a></span>
{{- end }}
{{ if not .Site.Params.ui.footer_about_disable -}}
{{ with .Site.GetPage "about" -}}
<p class="td-footer__about mt-2"><a href="{{ .RelPermalink }}">{{ .Title }}</a></p>
{{- end -}}
{{ end }}
</div>
</div>
</div>
</footer>

{{- define "footer-links-block" }}
<ul class="td-footer__links-list">
{{ range . }}
<li class="td-footer__links-item" data-bs-toggle="tooltip" title="{{ .name }}" aria-label="{{ .name }}">
<a target="_blank" rel="noopener" href="{{ .url }}" aria-label="{{ .name }}">
<i class="{{ .icon }}"></i>
</a>
</li>
{{ end }}
</ul>
{{ end -}}
2 changes: 1 addition & 1 deletion layouts/partials/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-}}
{{ $baseURL := urls.Parse $.Site.Params.Baseurl -}}

<nav class="td-navbar navbar-dark js-navbar-scroll bg-dark
<nav class="td-navbar navbar-dark js-navbar-scroll
{{- if $cover }} td-navbar-cover {{- end }}">
<div class="container-fluid flex-column flex-md-row">
<a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
Expand Down

0 comments on commit 9915638

Please sign in to comment.