Merge branch 'thubrecht/kfetcms-css' into 'master'

kfetcms: Update the fixtures and fix the navbar behaviour due to a longer menu

See merge request klub-dev-ens/gestioCOF!513
This commit is contained in:
Tom Hubrecht 2022-10-03 10:54:37 +02:00
commit 1be5dcb6af
9 changed files with 727 additions and 16 deletions

1
.envrc Normal file
View file

@ -0,0 +1 @@
use nix

3
.gitignore vendored
View file

@ -18,4 +18,5 @@ media/
.cache .cache
# VSCode # VSCode
.vscode/ .vscode/
.direnv

View file

@ -27,6 +27,10 @@ adhérents ni des cotisations.
## Version ??? - ??/??/???? ## Version ??? - ??/??/????
### K-Fêt
- Fixe un problème de rendu causé par l'agrandissement du menu
## Version 0.12 - 17/06/2022 ## Version 0.12 - 17/06/2022
### K-Fêt ### K-Fêt

File diff suppressed because one or more lines are too long

View file

@ -18,7 +18,7 @@ class OpenKfetTest(ChannelTestCase):
def setUp(self): def setUp(self):
self.kfet_open = OpenKfet( self.kfet_open = OpenKfet(
cache_prefix="test_kfetopen_%s" % random.randrange(2 ** 20) cache_prefix="test_kfetopen_%s" % random.randrange(2**20)
) )
self.addCleanup(self.kfet_open.clear_cache) self.addCleanup(self.kfet_open.clear_cache)
@ -145,7 +145,7 @@ class OpenKfetViewsTest(ChannelTestCase):
self.c_a.login(username="admin", password="admin") self.c_a.login(username="admin", password="admin")
self.kfet_open = OpenKfet( self.kfet_open = OpenKfet(
cache_prefix="test_kfetopen_%s" % random.randrange(2 ** 20) cache_prefix="test_kfetopen_%s" % random.randrange(2**20)
) )
self.addCleanup(self.kfet_open.clear_cache) self.addCleanup(self.kfet_open.clear_cache)
@ -256,7 +256,7 @@ class OpenKfetScenarioTest(ChannelTestCase):
) )
self.kfet_open = OpenKfet( self.kfet_open = OpenKfet(
cache_prefix="test_kfetopen_%s" % random.randrange(2 ** 20) cache_prefix="test_kfetopen_%s" % random.randrange(2**20)
) )
self.addCleanup(self.kfet_open.clear_cache) self.addCleanup(self.kfet_open.clear_cache)

View file

@ -1,3 +1,40 @@
/* Navbar hacks -------------------- */
.visible-xl,
.visible-xl-block,
.visible-xl-inline,
.visible-xl-inline-block {
display: none !important;
}
@media (min-width: 1415px) {
.visible-xl {
display: block !important;
}
table.visible-xl {
display: table !important;
}
tr.visible-xl {
display: table-row !important;
}
th.visible-xl,
td.visible-xl {
display: table-cell !important;
}
.visible-xl-block {
display: block !important;
}
.visible-xl-inline {
display: inline !important;
}
.visible-xl-inline-block {
display: inline-block !important;
}
}
/* Global layout ------------------- */ /* Global layout ------------------- */
.main-col, .fixed-col { .main-col, .fixed-col {

View file

@ -32,20 +32,20 @@
</li> </li>
{% for item in menu_items %} {% for item in menu_items %}
{% if item.text == "Accueil" %} {% if item.text == "Accueil" %}
<li class="{{ item.active_class }} hidden-xs hidden-sm"> <li class="{{ item.active_class }} hidden-xs hidden-sm hidden-md">
<a href="{{ item.href }}" title="Accueil"> <a href="{{ item.href }}" title="Accueil">
<span class="glyphicon glyphicon-home"></span> <span class="glyphicon glyphicon-home"></span>
</a> </a>
</li> </li>
{% else %} {% else %}
<li class="{{ item.active_class }} hidden-xs hidden-sm"> <li class="{{ item.active_class }} hidden-xs hidden-sm hidden-md">
<a href="{{ item.href }}"> <a href="{{ item.href }}">
{{ item.text }} {{ item.text }}
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<li class="dropdown visible-xs visible-sm nav-pages"> <li class="dropdown visible-xs visible-sm visible-md nav-pages">
<a href="#" data-toggle="dropdown" roles="button" aria-haspopup="true" aria-expanded="false" class="navbar-toggle"> <a href="#" data-toggle="dropdown" roles="button" aria-haspopup="true" aria-expanded="false" class="navbar-toggle">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>

View file

@ -11,7 +11,7 @@
--><span class="glyphicon glyphicon-{{ glyphicon }}"></span><!-- --><span class="glyphicon glyphicon-{{ glyphicon }}"></span><!--
{% endif %} {% endif %}
{% if text %} {% if text %}
--><span class="visible-lg-inline">{{ text }}</span><!-- --><span class="visible-xl-inline">{{ text }}</span><!--
{% endif %} {% endif %}
--> -->
{% if href %} {% if href %}

22
shell.nix Normal file
View file

@ -0,0 +1,22 @@
let
mach-nix = import
(builtins.fetchGit {
url = "https://github.com/DavHau/mach-nix";
ref = "refs/tags/3.5.0";
})
{ };
requirements = builtins.readFile ./requirements.txt;
requirements-dev = ''
django-debug-toolbar
ipython
black
isort
flake8
'';
in
mach-nix.mkPythonShell {
requirements = requirements + requirements-dev;
}