Merge branch refs/heads/develop into refs/heads/feature/制造-计划优化

jikimo_frontend/static/src/scss/custom_style.scss

@@ -3,7 +3,7 @@
 }
 
 .test_model > .o_form_label {
-  margin-left: 20px;
+  margin-left: 0px !important;
   margin-right: 0px !important;
   white-space: nowrap;
 }
@@ -257,6 +257,12 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
   top: 55px;
   right: 43.5%;
 }
+//------------------------------------------
+
+.test_model > .o_form_label  {
+  margin-left: 4px !important;
+  line-height: 0 !important;
+}
 
 @media screen and (min-width: 1200px) {
   div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .row {
@@ -289,4 +295,49 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
 
 .text-bg-warning {
   background-color: #FED300 !important;
-}
+}
+
+.test_model>div {
+  display: flex;
+  width: 40%;
+}
+
+.test_model>div .o_field_widget {
+  width: 40% !important;
+}
+
+.o_form_label {
+  font-weight: 700 !important;
+}
+
+.bigger .o_horizontal_separator {
+  font-size: 1.5rem;
+}
+
+.o_horizontal_separator {
+  font-size: 1.5rem;
+}
+
+.o_field_widget input[class='o_input'] {
+text-align: center
+}
+
+div:has(.o_required_modifier) > label::before {
+  position: absolute;
+  left: -3px;
+}
+
+.o_form_view .o_form_label {
+  position: relative;
+  width: 9rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding-left: 1rem;
+}
+
+.o_form_view .o_form_label:hover {
+  white-space: normal;
+  overflow: visible;
+}
+