From e64fb4cdbdeec2d3fa2bf1219ada09e082101d8f Mon Sep 17 00:00:00 2001 From: Jordan Doig Date: Tue, 8 Dec 2020 22:22:46 -0700 Subject: [PATCH] Insights card styles, navbar restructuring, begin navbar styles --- pkg/dashboard/assets/css/dashboard.css | 7 ++++ pkg/dashboard/assets/css/main.css | 25 +----------- pkg/dashboard/templates/dashboard.gohtml | 6 +-- pkg/dashboard/templates/head.gohtml | 1 + pkg/dashboard/templates/navbar.gohtml | 48 +++++++++++++++++++++--- 5 files changed, 54 insertions(+), 33 deletions(-) diff --git a/pkg/dashboard/assets/css/dashboard.css b/pkg/dashboard/assets/css/dashboard.css index a0284376..cd9f542c 100644 --- a/pkg/dashboard/assets/css/dashboard.css +++ b/pkg/dashboard/assets/css/dashboard.css @@ -11,6 +11,13 @@ background-color: #CACBD2; padding-left: 40px; padding-right: 40px; + box-shadow: none; +} +.card.insights a { + background-color: #20162D; + color: #fff; + font-weight: bold; + border-radius: 2rem; } .filters .title, diff --git a/pkg/dashboard/assets/css/main.css b/pkg/dashboard/assets/css/main.css index 83c0145c..db31da81 100644 --- a/pkg/dashboard/assets/css/main.css +++ b/pkg/dashboard/assets/css/main.css @@ -5,34 +5,11 @@ body { line-height: 1.3em; } -.navbar { - padding-top: 20px; -} -.navbar, .main-content { +.main-content { width: 960px; margin: auto; } -.navbar .navbar-content { - padding: 0px 20px; -} - -.navbar .navbar-right { - float: right; -} - -.navbar .logo { - height: 80px; -} - -.navbar .fw-logo { - height: 64px; -} - -.navbar a { - text-decoration: none; -} - .card { margin: 25px 20px; padding: 20px; diff --git a/pkg/dashboard/templates/dashboard.gohtml b/pkg/dashboard/templates/dashboard.gohtml index 91720785..0a039327 100644 --- a/pkg/dashboard/templates/dashboard.gohtml +++ b/pkg/dashboard/templates/dashboard.gohtml @@ -83,10 +83,10 @@ -
- +
+ Fairwinds, the company behind Polaris, now offers Fairwinds Insights, a multi-cluster, multi-user Kubernetes configuration validation and policy enforcement platform. Fairwinds Insights can help you avoid errors that lead to wasted time, compute costs, and increased risk. - + Try Insights
diff --git a/pkg/dashboard/templates/head.gohtml b/pkg/dashboard/templates/head.gohtml index b2870b38..bd885890 100644 --- a/pkg/dashboard/templates/head.gohtml +++ b/pkg/dashboard/templates/head.gohtml @@ -18,6 +18,7 @@ + diff --git a/pkg/dashboard/templates/navbar.gohtml b/pkg/dashboard/templates/navbar.gohtml index f5073f8c..0f681c98 100644 --- a/pkg/dashboard/templates/navbar.gohtml +++ b/pkg/dashboard/templates/navbar.gohtml @@ -1,14 +1,50 @@ {{define "navbar"}}