Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge

2 files changed, 26 insertions, 12 deletions

diff --git a/view/css/default.css b/view/css/default.css
index 765a197d9..bd0f14ba2 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -1,22 +1,37 @@
 main {
-	display: table;
-	table-layout: fixed;
 	position: relative;
-	width: 100%;
-	height: 100vh;
+	min-height: 100vh;
+	display: flex;
+	flex-direction: column;
 }
 
-aside {
+.content {
+	display: flex;
+	flex: 1;
+}
+
+.columns {
+	display: flex;
+	flex:1;
+	min-width: 0;
+}
+
+#region_1 {
 	position: relative;
-	display: table-cell;
-	vertical-align: top;
+	order: 1;
 	padding: 4.5rem 7px 0px 7px;
 }
 
-section {
+#region_2 {
 	position: relative;
-	width: 100%;
-	display: table-cell;
-	vertical-align: top;
+	flex: 1;
+	order: 2;
 	padding: 4.5rem 7px 200px 7px;
+	min-width: 0;
+}
+
+#region_3 {
+	position: relative;
+	order: 3;
+	padding: 4.5rem 7px 0px 7px;
 }
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index 67a182c5c..b02f928f0 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -71,7 +71,6 @@
 	width: 32px;
 	height: 32px;
 	border-radius: 4px;
-	border: 1px solid #ccc;
 	text-align: center;
 }