nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

css: Merge responsive.css into main style file

Browse Source 
- 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>
This commit is contained in:
Sunil Mohan Adapa 2020-02-29 21:09:01 -05:00 committed by Veiko Aasa
parent 4e24eca25d
commit b51ccff743
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plinth/templates/base.html
View File

@ -56,7 +56,6 @@
<link rel="stylesheet" href="{% static '/javascript/bootstrap/css/bootstrap.min.css' %}"/> <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 '/javascript/fork-awesome/css/fork-awesome.css' %}"/>
<link rel="stylesheet" href="{% static 'theme/css/plinth.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 --> <!-- Local link to system Turbolinks JS -->
<script type="text/javascript" src="{% static '/javascript/turbolinks/turbolinks.js' %}" defer></script> <script type="text/javascript" src="{% static '/javascript/turbolinks/turbolinks.js' %}" defer></script>
<!-- Local link to system Modernizr (includes HTML5 Shiv) --> <!-- Local link to system Modernizr (includes HTML5 Shiv) -->

7
static/themes/default/css/plinth.css
View File

@ -293,6 +293,13 @@ footer {
background: transparent; 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 { .navbar-default .navbar-toggle .icon-bar {
background-color: #FFF; background-color: #FFF;
} }

17
static/themes/default/css/responsive.css
View File

@ -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;
}
}