Merge branch 'sidebarlayout' into staging

www/settings/app-settings.less

@@ -17,6 +17,10 @@
     flex-flow: column;
     font: @colortheme_app-font;
 
+    .cp-sidebarlayout-element {
+        max-width: 650px;
+    }
+
     #cp-export-container {
         font-size: 16px;
         display: flex;
@@ -121,8 +125,13 @@
                 border: 1px solid black;
             }
             .cp-settings-language-selector {
+                #cp-language-selector {
+                    display: inline;
+                }
                 button.btn {
                     width: @sidebar_button-width;
+                    max-width: 100%;
+                    margin: 0 !important;
                     background-color: @colortheme_sidebar-button-alt-bg;
                     border-color: #adadad;
                     color: black;
@@ -149,6 +158,7 @@
             .cp-settings-info-block {
                 [type="text"] {
                     width: @sidebar_button-width;
+                    max-width: 100%;
                 }
             }