Yuki Takei 2 лет назад
Родитель
Сommit
e300216299

+ 2 - 1
apps/app/src/components/PageStatusAlert.module.scss

@@ -17,7 +17,8 @@
       text-align: center;
 
       .btn {
-        @include bs.button-size(bs.$btn-padding-y-lg, bs.$btn-padding-x-lg, bs.$btn-font-size-lg, bs.$btn-line-height-lg, bs.$btn-border-radius-lg);
+        // TODO: activate (https://redmine.weseek.co.jp/issues/128307)
+        // @include bs.button-size(bs.$btn-padding-y-lg, bs.$btn-padding-x-lg, bs.$btn-font-size-lg, bs.$btn-line-height-lg, bs.$btn-border-radius-lg);
       }
     }
   }

+ 1 - 1
apps/app/src/components/Sidebar.module.scss

@@ -128,7 +128,7 @@
         }
         .hitarea {
           position: absolute;
-          border-radius: bs.$rounded-pill;
+          border-radius: bs.$border-radius-pill;
 
           @include hitarea(30px);
         }

+ 81 - 79
apps/app/src/styles/atoms/_custom_control.scss

@@ -1,94 +1,96 @@
 @use '../bootstrap/init' as *;
 
-.custom-checkbox .custom-control-label::before {
-  border-radius: $border-radius !important;
-}
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 
-label.custom-control-label {
-  font-weight: normal;
-}
+// .custom-checkbox .custom-control-label::before {
+//   border-radius: $border-radius !important;
+// }
 
-.custom-switch.custom-switch-sm {
-  $custom-control-indicator-size-sm: $custom-control-indicator-size * 0.8;
-  $custom-switch-width-sm: $custom-control-indicator-size-sm * 1.75;
-  $custom-control-gutter-sm: $custom-control-gutter * 0.8;
-  $custom-control-indicator-size-sm: $custom-control-indicator-size * 0.8;
-  $custom-switch-indicator-size-sm: subtract($custom-control-indicator-size-sm, $custom-control-indicator-border-width * 4);
+// label.custom-control-label {
+//   font-weight: normal;
+// }
 
-  padding-left: $custom-switch-width-sm + $custom-control-gutter-sm;
+// .custom-switch.custom-switch-sm {
+//   $custom-control-indicator-size-sm: $custom-control-indicator-size * 0.8;
+//   $custom-switch-width-sm: $custom-control-indicator-size-sm * 1.75;
+//   $custom-control-gutter-sm: $custom-control-gutter * 0.8;
+//   $custom-control-indicator-size-sm: $custom-control-indicator-size * 0.8;
+//   $custom-switch-indicator-size-sm: subtract($custom-control-indicator-size-sm, $custom-control-indicator-border-width * 4);
 
-  .custom-control-label {
-    &::before {
-      left: -($custom-switch-width-sm + $custom-control-gutter-sm);
-      width: $custom-switch-width-sm;
-      height: $custom-control-indicator-size-sm;
-    }
+//   padding-left: $custom-switch-width-sm + $custom-control-gutter-sm;
 
-    &::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-sm + $custom-control-gutter-sm), $custom-control-indicator-border-width * 2);
-      width: $custom-switch-indicator-size-sm;
-      height: $custom-switch-indicator-size-sm;
-    }
-  }
+//   .custom-control-label {
+//     &::before {
+//       left: -($custom-switch-width-sm + $custom-control-gutter-sm);
+//       width: $custom-switch-width-sm;
+//       height: $custom-control-indicator-size-sm;
+//     }
 
-  .custom-control-input:checked ~ .custom-control-label {
-    &::after {
-      transform: translateX($custom-switch-width-sm - $custom-control-indicator-size-sm);
-    }
-  }
-}
+//     &::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-sm + $custom-control-gutter-sm), $custom-control-indicator-border-width * 2);
+//       width: $custom-switch-indicator-size-sm;
+//       height: $custom-switch-indicator-size-sm;
+//     }
+//   }
 
-//lg
-.custom-switch.custom-switch-lg {
-  $custom-control-indicator-size-lg: $custom-control-indicator-size * 1.5;
-  $custom-switch-width-lg: $custom-control-indicator-size-lg * 1.75;
-  $custom-control-gutter-lg: $custom-control-gutter * 1.5;
-  $custom-control-indicator-size-lg: $custom-control-indicator-size * 1.5;
-  $custom-switch-indicator-size-lg: subtract($custom-control-indicator-size-lg, $custom-control-indicator-border-width * 4);
+//   .custom-control-input:checked ~ .custom-control-label {
+//     &::after {
+//       transform: translateX($custom-switch-width-sm - $custom-control-indicator-size-sm);
+//     }
+//   }
+// }
 
-  padding-left: $custom-switch-width-lg + $custom-control-gutter-lg;
+// //lg
+// .custom-switch.custom-switch-lg {
+//   $custom-control-indicator-size-lg: $custom-control-indicator-size * 1.5;
+//   $custom-switch-width-lg: $custom-control-indicator-size-lg * 1.75;
+//   $custom-control-gutter-lg: $custom-control-gutter * 1.5;
+//   $custom-control-indicator-size-lg: $custom-control-indicator-size * 1.5;
+//   $custom-switch-indicator-size-lg: subtract($custom-control-indicator-size-lg, $custom-control-indicator-border-width * 4);
 
-  line-height: $custom-control-indicator-size-lg;
-  .custom-control-label {
-    &::before {
-      top: ($font-size-base * $line-height-base - $custom-control-indicator-size-lg) / 2;
+//   padding-left: $custom-switch-width-lg + $custom-control-gutter-lg;
 
-      left: -($custom-switch-width-lg + $custom-control-gutter-lg);
-      width: $custom-switch-width-lg;
-      height: $custom-control-indicator-size-lg;
-      border-radius: $custom-control-indicator-size-lg/2;
-    }
+//   line-height: $custom-control-indicator-size-lg;
+//   .custom-control-label {
+//     &::before {
+//       top: ($font-size-base * $line-height-base - $custom-control-indicator-size-lg) / 2;
 
-    &::after {
-      top: add(($font-size-base * $line-height-base - $custom-control-indicator-size-lg) / 2, $custom-control-indicator-border-width * 2);
-      left: add(-($custom-switch-width-lg + $custom-control-gutter-lg), $custom-control-indicator-border-width * 2);
-      width: $custom-switch-indicator-size-lg;
-      height: $custom-switch-indicator-size-lg;
-      border-radius: $custom-control-indicator-size-lg/2;
-    }
-  }
+//       left: -($custom-switch-width-lg + $custom-control-gutter-lg);
+//       width: $custom-switch-width-lg;
+//       height: $custom-control-indicator-size-lg;
+//       border-radius: $custom-control-indicator-size-lg/2;
+//     }
 
-  .custom-control-input:checked ~ .custom-control-label {
-    &::after {
-      transform: translateX($custom-switch-width-lg - $custom-control-indicator-size-lg);
-    }
-  }
-}
+//     &::after {
+//       top: add(($font-size-base * $line-height-base - $custom-control-indicator-size-lg) / 2, $custom-control-indicator-border-width * 2);
+//       left: add(-($custom-switch-width-lg + $custom-control-gutter-lg), $custom-control-indicator-border-width * 2);
+//       width: $custom-switch-indicator-size-lg;
+//       height: $custom-switch-indicator-size-lg;
+//       border-radius: $custom-control-indicator-size-lg/2;
+//     }
+//   }
 
-.custom-switch.custom-switch-slack {
-  .custom-control-label {
-    &::before {
-      background-color: $gray-200;
-      border-color: transparent;
-    }
-    &::after {
-      background-size: 15px;
-    }
-  }
-  .input-group-addon {
-    input {
-      vertical-align: middle;
-    }
-  }
-}
+//   .custom-control-input:checked ~ .custom-control-label {
+//     &::after {
+//       transform: translateX($custom-switch-width-lg - $custom-control-indicator-size-lg);
+//     }
+//   }
+// }
+
+// .custom-switch.custom-switch-slack {
+//   .custom-control-label {
+//     &::before {
+//       background-color: $gray-200;
+//       border-color: transparent;
+//     }
+//     &::after {
+//       background-size: 15px;
+//     }
+//   }
+//   .input-group-addon {
+//     input {
+//       vertical-align: middle;
+//     }
+//   }
+// }

+ 3 - 0
apps/app/src/styles/bootstrap/_init.scss

@@ -1,8 +1,11 @@
 @import 'bootstrap/scss/functions';
 
 @import './variables';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/variables-dark';
 
 @import 'bootstrap/scss/maps';
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 // merge $colors to $theme-colors
 // $theme-colors: map-merge($theme-colors, $colors);
 

+ 2 - 0
apps/app/src/styles/bootstrap/_override.scss

@@ -1,3 +1,5 @@
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
+
 // * {
 //   outline: none !important;
 // }

+ 2 - 4
apps/app/src/styles/bootstrap/_variables.scss

@@ -1,5 +1,6 @@
 @use '../variables';
-@use 'bootstrap/scss/functions' as *;
+
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 
 //
 // Variables
@@ -167,6 +168,3 @@ $pre-color: dummyinvalildcolor; // disable pre color specification with invalid
 // $custom-checkbox-indicator-border-radius: 0px;
 // $custom-control-indicator-focus-box-shadow: none;
 // $custom-control-indicator-size: 1.2rem;
-
-@import 'bootstrap/scss/variables';
-@import 'bootstrap/scss/variables-dark';

+ 4 - 0
apps/app/src/styles/theme/_apply-colors-dark.scss

@@ -50,6 +50,7 @@
   $dropdown-link-active-bg: $bgcolor-dropdown-link-active;
 
   @import './mixins/list-group';
+  // TODO: activate (https://redmine.weseek.co.jp/issues/128307)
   // @import './reboot-bootstrap-text';
   // @import './reboot-bootstrap-border-colors';
   // @import './reboot-bootstrap-tables';
@@ -57,6 +58,9 @@
   // @import 'hsl-reboot-bootstrap-theme-colors';
   // @import './reboot-bootstrap-dropdown';
 
+
+  // TODO: activate (https://redmine.weseek.co.jp/issues/128307)
+
   //   // List Group
   //   @include override-list-group-item(
   //     $color-list,

+ 1 - 0
apps/app/src/styles/theme/_apply-colors-light.scss

@@ -49,6 +49,7 @@
   $dropdown-link-active-bg: $bgcolor-dropdown-link-active;
 
   @import './mixins/list-group';
+  // TODO: activate (https://redmine.weseek.co.jp/issues/128307)
   // @import './reboot-bootstrap-text';
   // @import './reboot-bootstrap-border-colors';
   // @import './reboot-bootstrap-tables';

+ 3 - 0
apps/app/src/styles/theme/apply-colors.scss

@@ -41,6 +41,7 @@ $nav-tabs-link-active-bg: var(--bgcolor-global);
 $nav-tabs-link-active-border-color: $bordercolor-nav-tabs-active;
 $theme-colors: map-merge($theme-colors, ( primary: $primary ));
 
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 // @import 'reboot-bootstrap-buttons';
 // @import 'reboot-bootstrap-colors';
 // @import 'reboot-bootstrap-theme-colors';
@@ -63,6 +64,7 @@ code:not([class^='language-']) {
 //== Apply to Bootstrap Elements
 //
 
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 // Alert link
 // @each $color, $value in $theme-colors {
 //   .alert.alert-#{$color} {
@@ -86,6 +88,7 @@ code:not([class^='language-']) {
   }
 }
 
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 // Form
 // .form-control {
 //   @include form-control-focus();

+ 1 - 0
packages/preset-themes/src/styles/bootstrap/_init.scss

@@ -5,6 +5,7 @@
 @import 'bootstrap/scss/variables-dark';
 
 @import 'bootstrap/scss/maps';
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 // merge $colors to $theme-colors
 // $theme-colors: map-merge($theme-colors, $colors);
 

+ 2 - 0
packages/preset-themes/src/styles/bootstrap/_override.scss

@@ -1,3 +1,5 @@
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
+
 // * {
 //   outline: none !important;
 // }

+ 2 - 0
packages/preset-themes/src/styles/bootstrap/_variables.scss

@@ -1,5 +1,7 @@
 @use '../variables';
 
+// TODO: activate (https://redmine.weseek.co.jp/issues/128307)
+
 //
 // Variables
 // --------------------------------------------------