Просмотр исходного кода

Adjust the appearance of the buttons.

oshikishintaro 5 лет назад
Родитель
Сommit
2a471b28da

+ 10 - 37
src/client/styles/scss/_on-edit.scss

@@ -124,7 +124,6 @@ body.on-edit {
 
 
     .grw-slack-notification {
     .grw-slack-notification {
       white-space: nowrap !important;
       white-space: nowrap !important;
-      //kokokara-test
       border-style: solid;
       border-style: solid;
       border-width: 1px;
       border-width: 1px;
       border-radius: 16px;
       border-radius: 16px;
@@ -133,43 +132,17 @@ body.on-edit {
         padding: 0px !important;
         padding: 0px !important;
         border-radius: 16px 0px 0px 16px;
         border-radius: 16px 0px 0px 16px;
       }
       }
-      .custom-switch {
-        padding-left: $custom-switch-width + $custom-control-gutter;
+
+      .custom-control-label {
+        &::after {
+          background-image: url(/images/icons/editor/slack-logo-on.svg);
+        }
+      }
+      .custom-control-input:checked ~ .custom-control-label {
+        &::after {
+          background-image: url(/images/icons/editor/slack-logo-off.svg);
+        }
       }
       }
-      //   .custom-control-label {
-      //     &::before {
-      //       // stylelint-disable-next-line property-blacklist
-      //       vertical-align: middle;
-      //       // width: 44px;
-      //       // height: $input-height;
-
-      //       border-color: transparent;
-      //       border-radius: 35px 0px 0px 35px;
-      //     }
-
-      //     &::after {
-      //       // stylelint-disable-next-line property-blacklist
-      //       // width: 20px;
-      //       // height: 20px;
-      //       // border-radius: 10px;
-      //     }
-      //   }
-
-      //   .custom-control-input:checked ~ .custom-control-label {
-      //     &::after {
-      //       width: 20px;
-      //       height: 20px;
-      //       transform: translateX(20px);
-      //     }
-      //   }
-
-      //   .custom-control-input:disabled {
-      //     &:checked ~ .custom-control-label::before {
-      //       background-color: pink;
-      //     }
-      //   }
-      // }
-      //kokomade
 
 
       .input-group-addon {
       .input-group-addon {
         padding: 2px 8px;
         padding: 2px 8px;

+ 1 - 1
src/client/styles/scss/_override-bootstrap-variables.scss

@@ -88,4 +88,4 @@ $pre-color: dummyinvalildcolor; // disable pre color specification with invalid
 //== Custom Checkbox
 //== Custom Checkbox
 $custom-checkbox-indicator-border-radius: 0px;
 $custom-checkbox-indicator-border-radius: 0px;
 $custom-control-indicator-focus-box-shadow: none;
 $custom-control-indicator-focus-box-shadow: none;
-$custom-control-indicator-size: 2.2rem;
+$custom-control-indicator-size: 1.2rem;

+ 80 - 21
src/client/styles/scss/atoms/_custom_control.scss

@@ -35,33 +35,92 @@ label.custom-control-label {
 
 
 //slack
 //slack
 
 
-.custom-switch.custom-switch-slack {
-  $custom-control-indicator-size-slack: $custom-control-indicator-size * 1.5;
-  $custom-switch-width-slack: $custom-control-indicator-size-slack * 1.75;
-  $custom-control-gutter-slack: $custom-control-gutter * 1.5;
-  $custom-control-indicator-size-slack: $custom-control-indicator-size * 1.5;
-  $custom-switch-indicator-size-slack: subtract($custom-control-indicator-size-slack, $custom-control-indicator-border-width * 4);
+// .custom-switch.custom-switch-slack {
+//   $custom-control-indicator-size-slack: $custom-control-indicator-size * 1.5;
+//   $custom-switch-width-slack: $custom-control-indicator-size-slack * 1.75;
+//   $custom-control-gutter-slack: $custom-control-gutter * 1.5;
+//   $custom-control-indicator-size-slack: $custom-control-indicator-size * 1.5;
+//   $custom-switch-indicator-size-slack: subtract($custom-control-indicator-size-slack, $custom-control-indicator-border-width * 4);
 
 
-  padding-left: $custom-switch-width-slack + $custom-control-gutter-slack;
+//   padding-left: $custom-switch-width-slack + $custom-control-gutter-slack;
 
 
-  .custom-control-label {
-    &::before {
-      left: -($custom-switch-width-slack + $custom-control-gutter-slack);
-      width: $custom-switch-width-slack;
-      height: $custom-control-indicator-size-slack;
+//   .custom-control-label {
+//     &::before {
+//       left: -($custom-switch-width-slack + $custom-control-gutter-slack);
+//       width: $custom-switch-width-slack;
+//       height: $custom-control-indicator-size-slack;
+//     }
+
+//     &::after {
+//       top: add(($font-size-base * $line-height-base - $custom-control-indicator-size) / 2, $custom-control-indicator-border-width * 2);
+//       left: add(-($custom-switch-width-slack + $custom-control-gutter-slack), $custom-control-indicator-border-width * 2);
+//       width: $custom-switch-indicator-size-slack;
+//       height: $custom-switch-indicator-size-slack;
+//     }
+//   }
+
+//   .custom-control-input:checked ~ .custom-control-label {
+//     &::after {
+//       transform: translateX($custom-switch-width-slack - $custom-control-indicator-size-slack);
+//     }
+//   }
+// }
+
+.grw-slack-notification {
+  $custom-control-indicator-size-slack: 2rem; //size shitei
+
+  //from _variables.scss of bs4
+  $custom-switch-width: $custom-control-indicator-size-slack * 1.75;
+  $custom-switch-indicator-border-radius: $custom-control-indicator-size-slack / 2;
+  $custom-switch-indicator-size: subtract($custom-control-indicator-size-slack, $custom-control-indicator-border-width * 4);
+
+  //base class from _custom-forms.scss of bs4
+  .custom-control {
+    padding-left: $custom-control-gutter + $custom-control-indicator-size-slack;
+  }
+  .custom-control-input {
+    width: $custom-control-indicator-size-slack;
+    height: ($font-size-base * $line-height-base + $custom-control-indicator-size-slack) / 2 !important;
+  }
+  //base end
+
+  .custom-switch {
+    padding-left: $custom-switch-width + $custom-control-gutter;
+
+    .custom-control-label {
+      &::before {
+        top: ($font-size-base * $line-height-base - $custom-control-indicator-size-slack) / 2;
+        left: -($custom-switch-width + $custom-control-gutter);
+        width: $custom-switch-width;
+        height: $custom-control-indicator-size-slack;
+        pointer-events: all;
+        // stylelint-disable-next-line property-blacklist
+        border-radius: $custom-switch-indicator-border-radius;
+      }
+
+      &::after {
+        top: add(($font-size-base * $line-height-base - $custom-control-indicator-size-slack) / 2, $custom-control-indicator-border-width * 2);
+        left: add(-($custom-switch-width + $custom-control-gutter), $custom-control-indicator-border-width * 2);
+        width: $custom-switch-indicator-size;
+        height: $custom-switch-indicator-size;
+        background-color: $custom-control-indicator-border-color;
+        // stylelint-disable-next-line property-blacklist
+        border-radius: $custom-switch-indicator-border-radius;
+        @include transition(transform 0.15s ease-in-out, $custom-forms-transition);
+      }
     }
     }
 
 
-    &::after {
-      top: add(($font-size-base * $line-height-base - $custom-control-indicator-size) / 2, $custom-control-indicator-border-width * 2);
-      left: add(-($custom-switch-width-slack + $custom-control-gutter-slack), $custom-control-indicator-border-width * 2);
-      width: $custom-switch-indicator-size-slack;
-      height: $custom-switch-indicator-size-slack;
+    .custom-control-input:checked ~ .custom-control-label {
+      &::after {
+        background-color: $custom-control-indicator-bg;
+        transform: translateX($custom-switch-width - $custom-control-indicator-size-slack);
+      }
     }
     }
-  }
 
 
-  .custom-control-input:checked ~ .custom-control-label {
-    &::after {
-      transform: translateX($custom-switch-width-slack - $custom-control-indicator-size-slack);
+    .custom-control-input:disabled {
+      &:checked ~ .custom-control-label::before {
+        background-color: $custom-control-indicator-checked-disabled-bg;
+      }
     }
     }
   }
   }
 }
 }

+ 1 - 0
src/client/styles/scss/theme/_apply-colors.scss

@@ -334,6 +334,7 @@ body.on-edit {
       .custom-control-label {
       .custom-control-label {
         &::before {
         &::before {
           background-color: lighten($color-slack, 60%);
           background-color: lighten($color-slack, 60%);
+          border-color: transparent;
         }
         }
         &::after {
         &::after {
           background-color: white;
           background-color: white;