From b51ccff7431d7dca34fc685f3159fc92b804becb Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sat, 29 Feb 2020 21:09:01 -0500
Subject: [PATCH] css: Merge responsive.css into main style file

- Eliminate issue with collapsed navbar's drop-down menu text color when the
width is exactly 768px or less than 320px.

- Remove redundant footer's position: relative rule.

Tests performed:

- Change the browser width to 768px, the navbar is not collapsed and drop down
menu text color is black on white background.

- Change the browser width to 767px, the navbar is collapsed and drop down menu
text color is white on blue background.

- Change the browser width to less than 320px, the navbar is collapsed and drop
down menu text color is white on blue background.

- Footer on the main page and remaining pages is unchanged at <320px, =767px and
>= 768px.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
---
 plinth/templates/base.html               |  1 -
 static/themes/default/css/plinth.css     |  7 +++++++
 static/themes/default/css/responsive.css | 17 -----------------
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 static/themes/default/css/responsive.css

diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 7c6a146a5..0a47e762e 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -56,7 +56,6 @@
   <link rel="stylesheet" href="{% static '/javascript/bootstrap/css/bootstrap.min.css' %}"/>
   <link rel="stylesheet" href="{% static '/javascript/fork-awesome/css/fork-awesome.css' %}"/>
   <link rel="stylesheet" href="{% static 'theme/css/plinth.css' %}"/>
-  <link rel="stylesheet" href="{% static 'theme/css/responsive.css' %}"/>
   <!-- Local link to system Turbolinks JS -->
   <script type="text/javascript" src="{% static '/javascript/turbolinks/turbolinks.js' %}" defer></script>
   <!-- Local link to system Modernizr (includes HTML5 Shiv) -->
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 857364a21..f3da16ee2 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -293,6 +293,13 @@ footer {
     background: transparent;
 }
 
+@media screen and (max-width: 767px) {
+    .main-header.navbar-default .navbar-nav>.open .dropdown-menu > li > a,
+    .main-header.navbar-default .navbar-nav>.open .dropdown-menu > li > a:hover {
+        color: #FFF;
+    }
+}
+
 .navbar-default .navbar-toggle .icon-bar {
     background-color: #FFF;
 }
diff --git a/static/themes/default/css/responsive.css b/static/themes/default/css/responsive.css
deleted file mode 100644
index 7c772c62b..000000000
--- a/static/themes/default/css/responsive.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-# SPDX-License-Identifier: AGPL-3.0-or-later
-*/
-/* Responsive queries */
-/* Smartphone */
-
-@media only screen and (min-width: 320px) and (max-width: 768px) {
-    footer{
-        position: relative;
-    }
-
-    .navbar-default .navbar-nav .open .dropdown-menu > li > a,
-    .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover {
-        color: #FFF;
-    }
-
-}