Merge branch 'develop' into feature/decix-merge

client/assets/scss/components/card.scss

@@ -1,7 +1,7 @@
 
 .card {
   background: white;
-  margin: 10px 20px;
+  margin: 0px 0px 20px 20px;
   border-radius: 2px;
   box-shadow: 0px 1px 3px #cccccc;
   padding: 20px;

client/assets/scss/components/routes.scss

@@ -25,5 +25,6 @@
   .date-since {
     white-space: nowrap;
   }
+  background: white;
 }
 

client/assets/scss/layouts/main.scss

@@ -51,7 +51,7 @@ body,
 }
 
 .page-sidebar {
-  flex: 0 0 255px;
+  flex: 0 0 220px;
   background: #272634;
   // border-left: 1px solid #ccc;
 }

client/components/routeservers/page.jsx

@@ -28,7 +28,7 @@ class RouteserversPage extends React.Component {
         </PageHeader>
 
         <div className="row details-main">
-          <div className="col-md-8">
+          <div className="col-lg-9 col-xs-12 col-md-8">
             <div className="card">
               <SearchInput
                 value={this.props.protocolsFilterValue}
@@ -39,7 +39,7 @@ class RouteserversPage extends React.Component {
 
             <Protocols protocol="bgp" routeserverId={this.props.params.routeserverId} />
           </div>
-          <div className="col-md-4">
+          <div className="col-lg-3 col-md-4 col-xs-12">
             <div className="card">
               <Status routeserverId={this.props.params.routeserverId} />
             </div>

client/components/routeservers/protocols/index.jsx

@@ -37,7 +37,7 @@ function _filteredProtocols(protocols, filter) {
 class RoutesLink extends React.Component {
   render() {
     let url = `/routeservers/${this.props.routeserverId}/protocols/${this.props.protocol}/routes`;
-    if (this.props.state != 'up') {
+    if (this.props.state.toLowerCase() != 'up') {
       return (<span>{this.props.children}</span>);
     }
     return (