From f4960af783eaeac223643f9ac9289247fd76f00b Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Thu, 29 Aug 2019 17:03:43 +0200
Subject: [PATCH] improving dropdown menu theme
---
.../css/basetheme_bootstrap4_pasteur.css | 48 +++++++++++++++----
setup.py | 2 +-
.../templates/test_app_1/mybasePasteur.html | 34 +++++++++++++
3 files changed, 73 insertions(+), 11 deletions(-)
diff --git a/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css b/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css
index 1ff59b3..60302b3 100644
--- a/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css
+++ b/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css
@@ -277,7 +277,6 @@ color: #0275e3;
.btn{
border-radius: 0;
}
-.show>.btn-outline-primary.dropdown-toggle,
.show>.btn-primary.dropdown-toggle,
.btn-outline-primary:hover ,
.btn-primary:hover,
@@ -290,7 +289,6 @@ color: #0275e3;
background-color: #0275e3;
border-color: #0275e3;
}
-.show>.btn-outline-secondary.dropdown-toggle,
.show>.btn-secondary.dropdown-toggle,
.btn-outline-secondary:hover,
.btn-secondary:hover,
@@ -303,11 +301,13 @@ color: #0275e3;
background-color: #81796a;
border-color: #81796a;
}
+.show>.btn-outline-primary.dropdown-toggle,
.btn-primary {
color: #fff;
background-color: #2d96fa;
border-color: #2d96fa;
}
+.show>.btn-outline-secondary.dropdown-toggle,
.btn-secondary {
color: #fff;
background-color: #989287;
@@ -327,32 +327,60 @@ color: #0275e3;
.dropdown-menu {
border-radius:0;
}
-.btn-outline-secondary.dropdown-toggle+.dropdown-menu{
+.btn-secondary.dropdown-toggle+.dropdown-menu{
background-color: #81796a;
border-color: #81796a;
border:#fff;
}
-.btn-outline-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item{
+.btn-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item{
color: #fff;
}
-.btn-outline-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item:hover,
-.btn-outline-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item:focus{
+.btn-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item:hover,
+.btn-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item:focus{
color: #989287;
background-color:white;
}
-.btn-outline-primary.dropdown-toggle+.dropdown-menu{
+.btn-outline-secondary.dropdown-toggle+.dropdown-menu{
+ color: #989287;
+ border-color: #989287;
+ background-color:white;
+}
+.btn-outline-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item{
+ color: #989287;
+}
+.btn-outline-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item:hover,
+.btn-outline-secondary.dropdown-toggle+.dropdown-menu>.dropdown-item:focus{
+ color: #fff;
+ background-color: #989287;
+ border-color: #989287;
+}
+.btn-primary.dropdown-toggle+.dropdown-menu{
background-color: #0275e3;
border-color: #0275e3;
border:#fff;
}
-.btn-outline-primary.dropdown-toggle+.dropdown-menu>.dropdown-item{
+.btn-primary.dropdown-toggle+.dropdown-menu>.dropdown-item{
color: #fff;
}
-.btn-outline-primary.dropdown-toggle+.dropdown-menu>.dropdown-item:hover,
-.btn-outline-primary.dropdown-toggle+.dropdown-menu>.dropdown-item:focus{
+.btn-primary.dropdown-toggle+.dropdown-menu>.dropdown-item:hover,
+.btn-primary.dropdown-toggle+.dropdown-menu>.dropdown-item:focus{
+ color: #2d96fa;
+ background-color:white;
+}
+.btn-outline-primary.dropdown-toggle+.dropdown-menu{
color: #2d96fa;
+ border-color: #2d96fa;
background-color:white;
}
+.btn-outline-primary.dropdown-toggle+.dropdown-menu>.dropdown-item{
+ color: #2d96fa;
+}
+.btn-outline-primary.dropdown-toggle+.dropdown-menu>.dropdown-item:hover,
+.btn-outline-primary.dropdown-toggle+.dropdown-menu>.dropdown-item:focus{
+ color: #fff;
+ background-color: #2d96fa;
+ border-color: #2d96fa;
+}
.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;
}
\ No newline at end of file
diff --git a/setup.py b/setup.py
index afd62cc..82e7a02 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
setup(
name='django-basetheme-bootstrap',
- version='0.2.3',
+ version='0.2.4',
description='Django Basetheme Bootstrap',
long_description=readme,
author='Bryan Brancotte',
diff --git a/test_app_1/templates/test_app_1/mybasePasteur.html b/test_app_1/templates/test_app_1/mybasePasteur.html
index 8b881d3..8acbce3 100644
--- a/test_app_1/templates/test_app_1/mybasePasteur.html
+++ b/test_app_1/templates/test_app_1/mybasePasteur.html
@@ -67,6 +67,23 @@
</button>
</div>
</div>
+ <div class="float-right dropleft">
+ <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuExport"
+ data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+ dropleft
+ </a>
+ <div class="dropdown-menu" aria-labelledby="dropdownMenuExport" x-placement="bottom-start"
+ style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(1258px, 47px, 0px);">
+ <button class="dropdown-item" type="button">
+ <i class="fa fa-clipboard"></i>
+ Copy link into clipboard (recommended)
+ </button>
+ <button class="dropdown-item" type="button" onclick="$('form').submit()">
+ <i class="fa fa-download"></i>
+ Download displayed data in a spreadsheet
+ </button>
+ </div>
+ </div>
<div class="">
<a class="btn btn-outline-primary dropdown-toggle" href="#" role="button" id="dropdownMenuExport2"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
@@ -84,5 +101,22 @@
</button>
</div>
</div>
+ <div class="">
+ <a class="btn btn-primary dropdown-toggle" href="#" role="button" id="dropdownMenuExport2"
+ data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+ regular
+ </a>
+ <div class="dropdown-menu" aria-labelledby="dropdownMenuExport2" x-placement="bottom-start"
+ style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(1258px, 47px, 0px);">
+ <button class="dropdown-item" type="button">
+ <i class="fa fa-clipboard"></i>
+ Copy link into clipboard (recommended)
+ </button>
+ <button class="dropdown-item" type="button" onclick="$('form').submit()">
+ <i class="fa fa-download"></i>
+ Download displayed data in a spreadsheet
+ </button>
+ </div>
+ </div>
</div>
{% endblock %}
--
GitLab