From 4259fb413e70e68c0a26aa130268f540c0a24b82 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier Date: Fri, 27 Mar 2020 19:34:45 +0100 Subject: [PATCH] v0.2.9.17 UPDATE: inrae and saclay css updated to take into account the new navbar the navbar changed into the commit 8ccde276 --- DESCRIPTION | 2 +- NEWS.md | 2 +- inst/ShinyGR/www/css/bootstrap.min_Inrae.css | 21 ++++++++++++++----- inst/ShinyGR/www/css/bootstrap.min_Saclay.css | 21 ++++++++++++++----- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 09cf8b2..9b49ecd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGRteaching Type: Package Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included) -Version: 0.2.9.16 +Version: 0.2.9.17 Date: 2020-03-27 Authors@R: c( person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), diff --git a/NEWS.md b/NEWS.md index 244164a..66999cb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 0.2.9.16 Release Notes (2020-03-27) +### 0.2.9.17 Release Notes (2020-03-27) #### New features diff --git a/inst/ShinyGR/www/css/bootstrap.min_Inrae.css b/inst/ShinyGR/www/css/bootstrap.min_Inrae.css index 728a923..809f535 100644 --- a/inst/ShinyGR/www/css/bootstrap.min_Inrae.css +++ b/inst/ShinyGR/www/css/bootstrap.min_Inrae.css @@ -158,16 +158,27 @@ border-color: #00a3a6; .navbar-default .navbar-nav > li > a:focus { background: #275662; } +/* selected navbar button when drop-menu is open */ +.navbar-default .navbar-nav > .open > a, +.navbar-default .navbar-nav > .open > a:hover, +.navbar-default .navbar-nav > .open > a:focus { +background-color: #008c8e; +} +/* navbar drop-menu with computer mouse pointer */ +.navbar-default .navbar-nav .dropdown-menu > li > a:hover, +.navbar-default .navbar-nav .dropdown-menu > li > a:focus { +background: #00a3a6; +} /* link color */ a:link { color: #62003c; } a:hover { - color: #9dc544; - text-decoration: underline; +color: #9dc544; +text-decoration: underline; } a:active { - color: #9ed6e3; - text-decoration: underline; -} +color: #9ed6e3; +text-decoration: underline; +} diff --git a/inst/ShinyGR/www/css/bootstrap.min_Saclay.css b/inst/ShinyGR/www/css/bootstrap.min_Saclay.css index c5fe347..1315dc6 100644 --- a/inst/ShinyGR/www/css/bootstrap.min_Saclay.css +++ b/inst/ShinyGR/www/css/bootstrap.min_Saclay.css @@ -147,17 +147,28 @@ border-color: #62003c; .navbar-default .navbar-nav > li > a:focus { background: #AF006B; } +/* selected navbar button when drop-menu is open */ +.navbar-default .navbar-nav > .open > a, +.navbar-default .navbar-nav > .open > a:hover, +.navbar-default .navbar-nav > .open > a:focus { +background-color: #008c8e; +} +/* navbar drop-menu with computer mouse pointer */ +.navbar-default .navbar-nav .dropdown-menu > li > a:hover, +.navbar-default .navbar-nav .dropdown-menu > li > a:focus { +background: #00a3a6; +} /* link color */ a:link { - color: #62003c; +color: #62003c; } a:hover { - color: #9dc544; - text-decoration: underline; +color: #9dc544; +text-decoration: underline; } a:active { - color: #9ed6e3; - text-decoration: underline; +color: #9ed6e3; +text-decoration: underline; } -- GitLab