完善样式

iwillhappy1314 · Dec 4, 2019 · a96fc7f · a96fc7f
1 parent de84fc6
commit a96fc7f
Show file tree

Hide file tree

Showing 14 changed files with 454 additions and 37 deletions.
diff --git a/frontend/assets/styles/chosen.scss b/frontend/assets/styles/chosen.scss
@@ -198,8 +198,7 @@ $chosen-sprite-retina: url('../images/chosen-sprite@2x.png') !default;
     }
 
     &.highlighted {
-      background-color: #3875d7;
-      background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+      background-color: $input-focus-border-color;
       color: #fff;
     }
 
@@ -348,7 +347,7 @@ $chosen-sprite-retina: url('../images/chosen-sprite@2x.png') !default;
 
     &.search-choice-disabled {
       padding-right: 5px;
-      border: 1px solid #ccc;
+      border: 1px solid #A0AEC0;
       background-color: #e4e4e4;
       background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
       color: #666;
@@ -370,7 +369,7 @@ $chosen-sprite-retina: url('../images/chosen-sprite@2x.png') !default;
 
   .chosen-drop .result-selected {
     display: list-item;
-    color: #ccc;
+    color: #A0AEC0;
     cursor: default;
   }
 }

diff --git a/frontend/assets/styles/form.scss b/frontend/assets/styles/form.scss
@@ -1,6 +1,31 @@
 @import "../../node_modules/bootstrap/scss/forms";
 @import "../../node_modules/bootstrap/scss/input-group";
 
+.rs-input-group > .rs-custom-select:not(:first-child),
+.rs-input-group > .rs-form-control:not(:first-child) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0
+}
+
+textarea.rs-form-control.rs-is-invalid {
+  padding-right: calc(1.5em + .75rem);
+  background-position: top calc(.375em + .1875rem) right calc(.375em + .1875rem);
+}
+
+select.rs-form-control:focus::-ms-value {
+  color: #495057;
+  background-color: #fff
+}
+
+select.rs-form-control[multiple], select.rs-form-control[size], textarea.rs-form-control {
+  height: auto
+}
+
+.ui-datepicker td .ui-state-default {
+  padding: 8px 10px !important;
+  line-height: normal;
+}
+
 .rs-form-legend {
   margin-bottom: 2rem;
   font-size: 1.5rem;
@@ -26,4 +51,24 @@
 .chosen-container-single .chosen-single {
   background: transparent !important;
   box-shadow: none !important;
+}
+
+input + .iris-picker {
+  position: absolute;
+  z-index: 999;
+}
+
+.rs-form--clone {
+  .rs-input-group {
+    margin-bottom: .5rem;
+    &:first-of-type{
+      margin-top: .5rem;
+    }
+    &:last-of-type{
+      margin-bottom: 0;
+    }
+  }
+  .js-more-button{
+    margin-top: .5rem;
+  }
 }
diff --git a/frontend/assets/styles/main.scss b/frontend/assets/styles/main.scss
@@ -22,6 +22,43 @@ html {
   display: none;
 }
 
+.rs-order-first {
+  -webkit-box-ordinal-group: 0;
+  order: -1
+}
+
+a.rs-btn.disabled, fieldset:disabled a.rs-btn {
+  pointer-events: none
+}
+
+@media (min-width: 576px) {
+  .order-sm-first {
+    -webkit-box-ordinal-group: 0;
+    order: -1
+  }
+}
+
+@media (min-width: 768px) {
+  .order-md-first {
+    -webkit-box-ordinal-group: 0;
+    order: -1
+  }
+}
+
+@media (min-width: 992px) {
+  .order-lg-first {
+    -webkit-box-ordinal-group: 0;
+    order: -1
+  }
+}
+
+@media (min-width: 1200px) {
+  .order-xl-first {
+    -webkit-box-ordinal-group: 0;
+    order: -1
+  }
+}
+
 .chosen-container {
   width: 100% !important;
 }