From 60073a0f4f9436492b2372dba825810172a44242 Mon Sep 17 00:00:00 2001 From: Bryan Brancotte <bryan.brancotte@pasteur.fr> Date: Thu, 16 Apr 2020 09:35:35 +0200 Subject: [PATCH] make the theme coherent between btn-primary/btn-outline-primary and btn-danger/btn-outline-danger. --- .../css/basetheme_bootstrap4_pasteur.css | 54 +++++++++++++++++++ setup.py | 2 +- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css b/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css index 99c66a5..01553b8 100644 --- a/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css +++ b/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css @@ -595,6 +595,9 @@ main a { .dropdown-menu { border-radius:0; } +/***************** +dropdown secondary +******************/ .btn-secondary.dropdown-toggle+.dropdown-menu{ background-color: #81796a; border-color: #81796a; @@ -638,6 +641,9 @@ main a { .btn-outline-secondary+.dropdown-menu>.dropdown-item.disabled,.btn-outline-secondary+.dropdown-menu>.dropdown-item:disabled { color: #bdb6ae; } +/***************** +dropdown primary +******************/ .btn-primary.dropdown-toggle+.dropdown-menu{ background-color: #0275e3; border-color: #0275e3; @@ -681,6 +687,54 @@ main a { .btn-outline-primary+.dropdown-menu>.dropdown-item.disabled,.btn-outline-primary+.dropdown-menu>.dropdown-item:disabled { color: #9fbbd6; } +/***************** +dropdown danger +******************/ +.btn-danger.dropdown-toggle+.dropdown-menu{ +background-color: #dc3545; +border-color: #dc3545; +} +.show>.btn-outline-danger.dropdown-toggle, +.show>.btn-outline-danger.dropdown-toggle:focus { + border-color: #dc3545; + color: #dc3545; + background-color:white; +} +.show>.btn-outline-danger.dropdown-toggle, +.show>.btn-outline-danger.dropdown-toggle:focus , +.show>.btn-danger.dropdown-toggle, +.show>.btn-danger.dropdown-toggle:focus { + box-shadow:none; +} +.btn-danger.dropdown-toggle+.dropdown-menu>.dropdown-item{ + color: #fff; +} +.btn-danger.dropdown-toggle+.dropdown-menu>.dropdown-item:hover, +.btn-danger.dropdown-toggle+.dropdown-menu>.dropdown-item:focus{ + color: #dc3545; + background-color:white; +} +.btn-danger.dropdown-toggle+.dropdown-menu.multiselect-container, +.btn-outline-danger.dropdown-toggle+.dropdown-menu{ + color: #dc3545; + border-color: #dc3545; + background-color:white; +} +.btn-outline-danger.dropdown-toggle+.dropdown-menu>.dropdown-item{ + color: #dc3545; +} +.btn-outline-danger.dropdown-toggle+.dropdown-menu>.dropdown-item:hover, +.btn-outline-danger.dropdown-toggle+.dropdown-menu>.dropdown-item:focus{ + color: #fff; + background-color: #dc3545; + border-color: #dc3545; +} +.btn-danger+.dropdown-menu>.dropdown-item.disabled,.btn-danger+.dropdown-menu>.dropdown-item:disabled, +.btn-outline-danger+.dropdown-menu>.dropdown-item.disabled,.btn-outline-danger+.dropdown-menu>.dropdown-item:disabled { + color: #bdb6ae; +} +/***************** +******************/ .input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle), .input-group>.input-group-append:last-child>.input-group-text:not(:last-child), .input-group>.input-group-append:not(:last-child)>.btn, .input-group>.input-group-append:not(:last-child)>.input-group-text, .input-group>.input-group-prepend>.btn, .input-group>.input-group-prepend>.input-group-text { border-radius:0; } diff --git a/setup.py b/setup.py index c933e1f..b2dfc5a 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ readme = open('README.rst').read() setup( name='django-basetheme-bootstrap', - version='0.2.30', + version='0.2.31', description='Django Basetheme Bootstrap', long_description=readme, author='Bryan Brancotte', -- GitLab