Skip to content

T
third-party
Commit e0a0f306 by Félicie
Options

tile added

parent d6fb1b0c
dev_cooperatic … #5673_bug_calendrier_echange_service 3832-makeups-and-member-status-update 4081 4444_improve_presence_recording 4709 4778-reception-dont-get-finished-orders 4809-remove-shelf-value-col-to-reduce-server-load 4880-rapports-reception-faux 4950-douchage-appli-reception 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages 5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites 6286_bug_encaissement_souscription_cheque_espece 6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template 6832--certaines-absences-engendrent-une-erreur 7723-7559-change-purchase-order-workflow-django-side 7731-third-party-side-brinks-pos-export-not-working 7747-inventaire-par-article 7800-make-test-solution-work 7848-cannot-validate-qty-with-decimal-on-kg-product adaptation_supercafoutch adaptation_supercoop adaptation_supercoop_supercafoutch adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif dev_principale export_capital_detenu fix_bug_process_picking fusion_custom_graoucoop graoucoop_backup graoucoop_prod graoucoop_tmp hot_fix_shelf_labels_auto_print impression_etiquettes_rayons integration_lien_precommandes_dans_espace_membre lacagette_prod local_branch meal-voucher-and-label-printer-software-bug migration-v12 pour_graoucoop_prod pour_version_prod_cagette refonte_espace_membre_sc retouches_tickets_supercoop sc-setup-stock-app supercafoutch-preprod supercafoutch-prod-20221003 supercafoutch_prod ticket_4146 supercafoutch_20250120_151258 supercafoutch_20250120_150340 supercafoutch_20240909_080630 supercafoutch_20240609_115709 supercafoutch_20240212_082431 supercafoutch_20240107_181851 supercafoutch_prod_until_240107 supercafoutch-prod-20221003 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823 supercafoutch-230823-the-true-one migration-v12-tag lacagette_20240310_074751 lacagette_20240107_122554 lacagette_20240107_120916 graoucoop_20240609_122614 cagette_testtag cagette-230814 cagette-230630
2 merge requests!1412170 create delete binome,!164Intégration des dév. Cooperatic pour la Cagette
Pipeline #1863 passed with stage
in 1 minute 30 seconds
Showing with 14 additions and 40 deletions
members/static/css/admin/manage_attached.css
...@@ -16,18 +16,6 @@ ...@@ -16,18 +16,6 @@
} }
/* Search membres area */ /* Search membres area */
#search_member_area {
margin-top: 30px;
display: flex;
flex-direction: column;
align-items: center;
}
@media screen and (max-width: 992px) {
#search_member_area {
flex-direction: column;
}
}
#search_member_form_area { #search_member_form_area {
align-items: center; align-items: center;
...@@ -54,7 +42,16 @@ ...@@ -54,7 +42,16 @@
/* -- Tiles */ /* -- Tiles */
.tiles_container {
display: flex;
flex-wrap: wrap;
}
@media screen and (max-width: 992px) {
.tiles_container {
flex-direction: column;
}
}
.tile { .tile {
flex: 1 0 45%; flex: 1 0 45%;
...@@ -71,26 +68,3 @@ ...@@ -71,26 +68,3 @@
.small_tile { .small_tile {
min-height: 250px; min-height: 250px;
} }
\ No newline at end of file
.full_width_tile {
flex: 1 0 90%;
min-height: 100px;
}
.tile_title {
display: flex;
justify-content: center;
align-items: center;
border-bottom: 1px solid #e7e9ed;
font-size: 2.4rem;
padding: 2rem 0;
width: 80%;
}
.tile_content {
position: relative;
margin: 3rem 0;
width: 80%;
display: flex;
height: 100%;
}
\ No newline at end of file
templates/members/admin/manage_attached_create_pair.html
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
<div class="page_content"> <div class="page_content">
<div class="tiles_container"> <div class="tiles_container">
<div id="search_member_area">
<div class="tile high_tile">
<div id="search_member_form_area"> <div id="search_member_form_area">
<h4>Rechercher le.a coopérateur.ice titulaire</h4> <h4>Rechercher le.a coopérateur.ice titulaire</h4>
<form id="search_member_form" action="javascript:;" method="post"> <form id="search_member_form" action="javascript:;" method="post">
...@@ -35,7 +36,6 @@ ...@@ -35,7 +36,6 @@
<button type="submit" class="btn--primary" id="search_member_button">Recherche</button> <button type="submit" class="btn--primary" id="search_member_button">Recherche</button>
</form> </form>
</div> </div>
</div>
<div class="search_member_results_area" style="display:none;"> <div class="search_member_results_area" style="display:none;">
<div class="search_results_text"> <div class="search_results_text">
<p><i>Choisissez parmi les membres trouvés :</i></p> <p><i>Choisissez parmi les membres trouvés :</i></p>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<div class="search_member_results"></div> <div class="search_member_results"></div>
</div> </div>
</div> </div>
<div id="search_member_area"> <div class="tile ">
<div id="search_member_form_area"> <div id="search_member_form_area">
<h4>Rechercher le.a coopérateur.ice co-titulaire</h4> <h4>Rechercher le.a coopérateur.ice co-titulaire</h4>
<form id="search_member_form" action="javascript:;" method="post"> <form id="search_member_form" action="javascript:;" method="post">
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
<button type="submit" class="btn--primary" id="search_member_button">Recherche</button> <button type="submit" class="btn--primary" id="search_member_button">Recherche</button>
</form> </form>
</div> </div>
</div>
<div class="search_member_results_area" style="display:none;"> <div class="search_member_results_area" style="display:none;">
<div class="search_results_text"> <div class="search_results_text">
<p><i>Choisissez parmi les membres trouvés :</i></p> <p><i>Choisissez parmi les membres trouvés :</i></p>
...@@ -59,6 +58,7 @@ ...@@ -59,6 +58,7 @@
<div class="search_member_results"></div> <div class="search_member_results"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment