improve: nest Servers within Schemes container (via #4911)

* improve: nest Servers within Schemes container

* linter fixes

src/core/components/layouts/base.jsx

@@ -60,9 +60,10 @@ export default class BaseLayout extends React.Component {
               </Col>
             </Row>
 
-            <SchemesContainer/>
+            <SchemesContainer>
-
               <ServersContainer/>
+            </SchemesContainer>
+
 
             <FilterContainer/>
 

src/core/containers/schemes.jsx

@@ -7,6 +7,7 @@ export default class SchemesContainer extends React.Component {
     specActions: PropTypes.object.isRequired,
     specSelectors: PropTypes.object.isRequired,
     getComponent: PropTypes.func.isRequired,
+    children: PropTypes.any
   }
 
   render () {
@@ -24,6 +25,7 @@ export default class SchemesContainer extends React.Component {
         {schemes && schemes.size || securityDefinitions ? (
           <div className="scheme-container">
             <Col className="schemes wrapper" mobile={12}>
+              {this.props.children}
               {schemes && schemes.size ? (
                 <Schemes
                   currentScheme={currentScheme}

src/core/plugins/oas3/components/servers-container.jsx

@@ -15,15 +15,11 @@ export default class ServersContainer extends React.Component {
 
     const servers = specSelectors.servers()
 
-    const Col = getComponent("Col")
     const Servers = getComponent("Servers")
 
-    return (
+    return servers && servers.size ? (
       <div>
-        {servers && servers.size ? (
+        <span className="servers-title">Servers</span>
-          <div className="global-server-container">
-            <Col className="servers wrapper" mobile={12}>
-              <span className="servers-title">Server</span>
         <Servers
           servers={servers}
           currentServer={oas3Selectors.selectedServer()}
@@ -32,11 +28,6 @@ export default class ServersContainer extends React.Component {
           getServerVariable={oas3Selectors.serverVariableValue}
           getEffectiveServerValue={oas3Selectors.serverEffectiveValue}
         />
-            </Col>
+      </div> ) : null
-          </div>
-
-        ) : null}
-      </div>
-    )
   }
 }

src/style/_layout.scss

@@ -667,7 +667,7 @@
     .schemes
     {
         display: flex;
-        align-items: center;
+        align-items: flex-end;
 
          > label
         {

src/style/_servers.scss

@@ -53,20 +53,10 @@
     }
 }
 
-
-.global-server-container
-{
-    margin: 0 0 20px 0;
-    padding: 30px 0;
-
-    background: $server-container-background-color;
-    box-shadow: 0 1px 2px 0 rgba($server-container-box-shadow-color,.15);
-
 .servers-title {
-      line-height: 2em;
+    font-size: 12px;
     font-weight: bold;
 }
-}
 
 .operation-servers {
   h4.message {