diff --git a/main.go b/main.go index 2b1818c5..276adace 100644 --- a/main.go +++ b/main.go @@ -94,7 +94,7 @@ func startDashboardServer(c conf.Configuration, k *kube.ResourceProvider, port i dashboard.EndpointHandler(w, r, c, k) }) router.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) { - http.ServeFile(w, r, "public/favicon.ico") + http.ServeFile(w, r, "pkg/dashboard/assets/favicon-32x32.png") }) router.HandleFunc("/details/{category}", func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) diff --git a/pkg/dashboard/assets/css/main.css b/pkg/dashboard/assets/css/main.css index cd79ee56..444f843a 100644 --- a/pkg/dashboard/assets/css/main.css +++ b/pkg/dashboard/assets/css/main.css @@ -6,28 +6,30 @@ body { } .navbar { - padding: 20px 20px 0; + padding-top: 20px; +} +.navbar, .main-content { + width: 960px; + margin: auto; } .navbar .navbar-content { - margin: 0 auto; - width: 900px; + padding: 0px 20px; } .navbar .navbar-right { - padding: 15px; float: right; } .navbar .logo { - width: 280px; + width: 250px; } .navbar span.oss-text { color: #23103A; display: block; font-size: 11px; - margin: 3px 0; + margin-bottom: 3px; } .navbar a { @@ -35,12 +37,7 @@ body { } .navbar .ro-logo { - height: 40px; -} - -.main-content { - width: 960px; - margin: 0 auto; + height: 50px; } .card { diff --git a/pkg/dashboard/assets/favicon-16x16.png b/pkg/dashboard/assets/favicon-16x16.png index 5901074f..4beffd03 100644 Binary files a/pkg/dashboard/assets/favicon-16x16.png and b/pkg/dashboard/assets/favicon-16x16.png differ diff --git a/pkg/dashboard/assets/favicon-32x32.png b/pkg/dashboard/assets/favicon-32x32.png index 149104e7..2fcdecfa 100644 Binary files a/pkg/dashboard/assets/favicon-32x32.png and b/pkg/dashboard/assets/favicon-32x32.png differ diff --git a/pkg/dashboard/assets/favicon.ico b/pkg/dashboard/assets/favicon.ico index 1ee1d8cb..1f38f4e9 100644 Binary files a/pkg/dashboard/assets/favicon.ico and b/pkg/dashboard/assets/favicon.ico differ diff --git a/pkg/dashboard/assets/images/polaris-logo.png b/pkg/dashboard/assets/images/polaris-logo.png index ba0a9510..41f84936 100644 Binary files a/pkg/dashboard/assets/images/polaris-logo.png and b/pkg/dashboard/assets/images/polaris-logo.png differ diff --git a/pkg/dashboard/templates/navbar.gohtml b/pkg/dashboard/templates/navbar.gohtml index 01db6ae1..eb66f9ab 100644 --- a/pkg/dashboard/templates/navbar.gohtml +++ b/pkg/dashboard/templates/navbar.gohtml @@ -6,7 +6,7 @@