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

.envrc

@@ -0,0 +1 @@
+use nix

.gitignore

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

CHANGELOG.md

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

kfet/open/tests.py

@@ -18,7 +18,7 @@ class OpenKfetTest(ChannelTestCase):
 
     def setUp(self):
         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)
 
@@ -145,7 +145,7 @@ class OpenKfetViewsTest(ChannelTestCase):
         self.c_a.login(username="admin", password="admin")
 
         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)
 
@@ -256,7 +256,7 @@ class OpenKfetScenarioTest(ChannelTestCase):
         )
 
         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)
 

kfet/static/kfet/css/base/main.css

@@ -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 ------------------- */
 
 .main-col, .fixed-col {

kfet/templates/kfet/base_nav.html

@@ -32,20 +32,20 @@
       </li>
       {% for item in menu_items %}
       {% 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">
           <span class="glyphicon glyphicon-home"></span>
         </a>
       </li>
       {% 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 }}">
           {{ item.text }}
         </a>
       </li>
       {% endif %}
       {% 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">
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>

kfet/templates/kfet/nav_item.html

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

shell.nix

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