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

Deleted unnecessary description.
Layout adjustment test.

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

+ 15 - 15
src/client/js/components/SlackNotification.jsx

@@ -42,7 +42,7 @@ class SlackNotification extends React.Component {
       <div className="grw-slack-notification">
         <div className="input-group input-group-sm extended-setting">
           <label className="input-group-addon">
-
+            {/* slack redesign area */}
             <div className="custom-control custom-switch ">
               <input
                 type="checkbox"
@@ -54,22 +54,22 @@ class SlackNotification extends React.Component {
               <label className="custom-control-label" htmlFor="slackSwitch">
               </label>
             </div>
+            {/* slack redesign area end */}
+
           </label>
-          <div>
-            <input
-              className="form-control"
-              type="text"
-              value={this.props.slackChannels}
-              placeholder="Input channels"
-              data-toggle="popover"
-              title={t('slack_notification.popover_title')}
-              data-content={t('slack_notification.popover_desc')}
-              data-trigger="focus"
-              data-placement="top"
-              onChange={this.updateSlackChannelsHandler}
-            />
+          <input
+            className="form-control"
+            type="text"
+            value={this.props.slackChannels}
+            placeholder="Input channels"
+            data-toggle="popover"
+            title={t('slack_notification.popover_title')}
+            data-content={t('slack_notification.popover_desc')}
+            data-trigger="focus"
+            data-placement="top"
+            onChange={this.updateSlackChannelsHandler}
+          />
 
-          </div>
         </div>
       </div>
     );

+ 6 - 4
src/client/styles/scss/_on-edit.scss

@@ -121,20 +121,22 @@ body.on-edit {
 
   .grw-editor-navbar-bottom {
     height: $grw-editor-navbar-bottom-height;
-
+    //slack redesign area
     .grw-slack-notification {
+      $custom-select-height-slack: 2rem;
       border-style: solid;
       border-width: 1px;
-      border-radius: 16px;
+      border-radius: $input-height-sm/2 0 0 $input-height-sm/2;
 
       .input-group-addon {
         padding: 0px !important;
-        border-radius: 16px 0px 0px 16px;
+        border-radius: 2px;
       }
 
       .custom-control-label {
         &::after {
           background-image: url(/images/icons/slack/slack-logo-on.svg);
+          background-size: 15px;
         }
       }
       .custom-control-input:checked ~ .custom-control-label {
@@ -151,7 +153,7 @@ body.on-edit {
           vertical-align: middle;
         }
       }
-
+      //slack redesign area end
       .form-control {
         width: 80px;
         border: transparent;

+ 4 - 0
src/client/styles/scss/_override-bootstrap-variables.scss

@@ -89,3 +89,7 @@ $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;
+
+
+// test kesu warning kesu warning
+$input-height-sm:1.8rem;

+ 2 - 2
src/client/styles/scss/atoms/_custom_control.scss

@@ -33,10 +33,10 @@ label.custom-control-label {
   }
 }
 
-//slack
+//slack btn
 
 .grw-slack-notification {
-  $custom-control-indicator-size-slack: 2rem; //size shitei
+  $custom-control-indicator-size-slack: 1.8rem; //size shitei
 
   //from _variables.scss of bs4
   $custom-switch-width: $custom-control-indicator-size-slack * 1.75;