From bc74ce214b971778857b024aba8fe5554931de0a Mon Sep 17 00:00:00 2001 From: Florent gravin Date: Tue, 22 Mar 2016 17:01:45 +0100 Subject: [PATCH] Add bootstrap grid system in tools panel - See #862 --- contribs/gmf/apps/desktop/index.html | 74 ++++++++++++++++++++-------- contribs/gmf/less/desktop.less | 2 +- 2 files changed, 55 insertions(+), 21 deletions(-) diff --git a/contribs/gmf/apps/desktop/index.html b/contribs/gmf/apps/desktop/index.html index d1ea7361ca27..7a80ded04a1d 100644 --- a/contribs/gmf/apps/desktop/index.html +++ b/contribs/gmf/apps/desktop/index.html @@ -56,28 +56,62 @@ -
-
- × -
- Login -
- -
-
-
- × -
- Print -
-
-
- × -
- Measure +
+
+
+
+
+
+ Print + × +
+ +
+
+
+
+
+ Print + × +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+
+ Measure + × +
+
+
diff --git a/contribs/gmf/less/desktop.less b/contribs/gmf/less/desktop.less index 3f9e303e7ff8..ab9fad56df10 100644 --- a/contribs/gmf/less/desktop.less +++ b/contribs/gmf/less/desktop.less @@ -145,7 +145,6 @@ gmf-layertree ul .treenode { background-color: @brand-secondary; .tools-content { - padding: @app-margin; width: @right-panel-width; margin-right: -@right-panel-width + @toolbar-width; transition: margin-right 0.2s ease; @@ -165,6 +164,7 @@ gmf-layertree ul .treenode { color: @color; padding-bottom: @app-margin; margin-bottom: @app-margin; + margin-top: @grid-gutter-width / 2; border-bottom: 1px solid @color; } }