From ae535268b2669828677fa134960d05bbca4aad13 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Fri, 18 Dec 2020 13:19:56 -0800
Subject: [PATCH] ui: Use common styling to hide logo during firstboot

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
---
 plinth/modules/first_boot/templates/base_firstboot.html  | 8 ++------
 .../modules/first_boot/templates/firstboot_welcome.html  | 7 ++++---
 plinth/templates/first_setup.html                        | 9 ++-------
 static/themes/default/css/main.css                       | 4 ++++
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/plinth/modules/first_boot/templates/base_firstboot.html b/plinth/modules/first_boot/templates/base_firstboot.html
index 42fc57e26..ed22363e0 100644
--- a/plinth/modules/first_boot/templates/base_firstboot.html
+++ b/plinth/modules/first_boot/templates/base_firstboot.html
@@ -5,12 +5,8 @@
 
 {% load static %}
 
-{% block page_head %}
-  <style type="text/css">
-   a.navbar-brand {
-       display: none;
-   }
-  </style>
+{% block body_class %}
+no-brand
 {% endblock %}
 
 {% block mainmenu_left_collapse %}
diff --git a/plinth/modules/first_boot/templates/firstboot_welcome.html b/plinth/modules/first_boot/templates/firstboot_welcome.html
index a51776d7a..66d7018a7 100644
--- a/plinth/modules/first_boot/templates/firstboot_welcome.html
+++ b/plinth/modules/first_boot/templates/firstboot_welcome.html
@@ -7,11 +7,12 @@
 {% load i18n %}
 {% load static %}
 
+{% block body_class %}
+no-brand
+{% endblock %}
+
 {% block page_head %}
   <style type="text/css">
-   .navbar-brand {
-       display: none;
-   }
    img.firstboot {
        display: block;
        max-width: 100%;
diff --git a/plinth/templates/first_setup.html b/plinth/templates/first_setup.html
index 79e4e1bf7..a68dffef8 100644
--- a/plinth/templates/first_setup.html
+++ b/plinth/templates/first_setup.html
@@ -7,15 +7,10 @@
 {% load i18n %}
 {% load static %}
 
-{% block page_head %}
-  <style type="text/css">
-   a.navbar-brand {
-       display: none;
-   }
-  </style>
+{% block body_class %}
+no-brand
 {% endblock %}
 
-
 {% block content %}
 
   {% if is_first_setup_running %}
diff --git a/static/themes/default/css/main.css b/static/themes/default/css/main.css
index 835c65226..6375eaa11 100644
--- a/static/themes/default/css/main.css
+++ b/static/themes/default/css/main.css
@@ -196,6 +196,10 @@ body {
     margin-right: 0.25rem;
 }
 
+.no-brand .navbar-brand {
+    display: none;
+}
+
 .navbar-brand .fa {
     float: left;
     margin-top: -0.4375rem;