看板样式修改

2023-10-20 16:33:00 +08:00
parent d023848c70
commit 26de811174
1 changed files with 0 additions and 3 deletions
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -290,8 +290,6 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
 .text-bg-warning {
  background-color: #FED300 !important;
 }
-<<<<<<< HEAD
-=======

 .test_model>div {
  display: flex;
@@ -337,4 +335,3 @@ div:has(.o_required_modifier) > label::before {
  overflow: visible;
 }

->>>>>>> develop