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

basic responsive design finished with a few hacks

YAN Guanyu 5 лет назад
Родитель
Сommit
824c614355

+ 4 - 6
src/client/js/components/PageEditor/EditorNavbarBottom.jsx

@@ -51,12 +51,10 @@ const EditorNavbarBottom = (props) => {
       { isSlackExpanded && (
         <Collapse isOpen={isSlackExpanded && isDeviceSmallerThanMd}>
           <nav className={`navbar navbar-expand-lg border-top ${additionalClasses.join(' ')}`}>
-            <form className="form-inline mx-2 my-2 w-100">
-              <SavePageControls
-                isDeviceSmallerThanMd={false}
-                slackOnly
-              />
-            </form>
+            <SavePageControls
+              isDeviceSmallerThanMd={false}
+              slackOnly
+            />
           </nav>
         </Collapse>
         )}

+ 2 - 0
src/client/js/components/SavePageControls.jsx

@@ -91,6 +91,7 @@ class SavePageControls extends React.Component {
           onEnabledFlagChange={this.slackEnabledFlagChangedHandler}
           onChannelChange={this.slackChannelsChangedHandler}
           id="idForSavePageControl"
+          slackOnly
         />
       );
     }
@@ -107,6 +108,7 @@ class SavePageControls extends React.Component {
                   click={this.props.click}
                   smallScreen={this.props.smallScreen}
                   id="idForSavePageControl"
+                  slackOnly={false}
                 />
               </div>
             )

+ 6 - 4
src/client/js/components/SlackNotification.jsx

@@ -36,11 +36,11 @@ class SlackNotification extends React.Component {
   }
 
   getSlackNormal() {
-    const { t } = this.props;
+    const { t, slackOnly } = this.props;
 
     return (
       <div className="grw-slack-notification w-100">
-        <div className="input-group extended-setting">
+        <div Style="height: 24px" className="input-group extended-setting">
           <label className="input-group-addon">
             <div className="custom-control custom-switch custom-switch-lg custom-switch-slack">
               <input
@@ -50,12 +50,13 @@ class SlackNotification extends React.Component {
                 checked={this.props.isSlackEnabled}
                 onChange={this.updateCheckboxHandler}
               />
-              <label className="custom-control-label" htmlFor={this.props.id}>
+              <label className={`custom-control-label align-center ${slackOnly ? 'mt-1' : ''}`} htmlFor={this.props.id}>
               </label>
             </div>
           </label>
           <input
-            className="form-control"
+            Style="height: 24px"
+            className="form-control align-top"
             type="text"
             value={this.props.slackChannels}
             placeholder="Input channels"
@@ -105,6 +106,7 @@ affect the rendering of the banner itself.
 SlackNotification.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   click: PropTypes.func.isRequired,
+  slackOnly: PropTypes.bool.isRequired,
 
   smallScreen: PropTypes.bool.isRequired,
   isSlackEnabled: PropTypes.bool.isRequired,