From fbb0f228dcaf832aa68b1507028cc872e8d016bc Mon Sep 17 00:00:00 2001
From: Ernest <ernest.osiak@cognifide.com>
Date: Mon, 22 Oct 2018 11:29:06 +0200
Subject: [PATCH 1/2] advanced screen comparision - layout fix

---
 .../webapp/app/layout/main/url/reports/screen_layout.html   | 6 +++---
 report/src/main/webapp/assets/sass/_newComparison.scss      | 4 ++--
 report/src/main/webapp/assets/sass/_toolbar.scss            | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/report/src/main/webapp/app/layout/main/url/reports/screen_layout.html b/report/src/main/webapp/app/layout/main/url/reports/screen_layout.html
index dc6ab3e13..95e604c42 100644
--- a/report/src/main/webapp/app/layout/main/url/reports/screen_layout.html
+++ b/report/src/main/webapp/app/layout/main/url/reports/screen_layout.html
@@ -30,11 +30,11 @@
     </div>
     <span ng-if="case.comparator.stepResult.data.excludeMessage" class="checkboxes-inline">Exclude info: {{case.comparator.stepResult.data.excludeMessage}}</span>
   </div>
-  <div class="advanced-screen-comparison button button-small button-blue">
-  <a ng-if="case.status == 'FAILED' || case.status == 'CONDITIONALLY_PASSED'" data-ng-click="advancedScreenComparison()" data-aet-compare-screens>Advanced Screen Comparison</a>
-  </div>
   <div class="toolbar-blocks">
     <div class="toolbar-btns pull-right">
+      <div class="advanced-screen-comparison button button-small button-blue">
+        <a ng-if="case.status == 'FAILED' || case.status == 'CONDITIONALLY_PASSED'" data-ng-click="advancedScreenComparison()" data-aet-compare-screens>Advanced Screen Comparison</a>
+      </div>
       <ng-include src="'app/layout/main/url/navigation/navigation.comments.html'"/>
       <ng-include src="'app/layout/main/url/navigation/navigation.patternButtons.html'"/>
     </div>
diff --git a/report/src/main/webapp/assets/sass/_newComparison.scss b/report/src/main/webapp/assets/sass/_newComparison.scss
index 947e711fe..ca84156ab 100644
--- a/report/src/main/webapp/assets/sass/_newComparison.scss
+++ b/report/src/main/webapp/assets/sass/_newComparison.scss
@@ -17,8 +17,8 @@
  */
 
 .advanced-screen-comparison {
-  display: inline-block;
-  vertical-align: middle;
+  margin-top: 3px;
+  margin-right: 20px;
   a {
     color: $white;
   }
diff --git a/report/src/main/webapp/assets/sass/_toolbar.scss b/report/src/main/webapp/assets/sass/_toolbar.scss
index a2fedd420..8cf509483 100644
--- a/report/src/main/webapp/assets/sass/_toolbar.scss
+++ b/report/src/main/webapp/assets/sass/_toolbar.scss
@@ -229,6 +229,7 @@
   display: block;
   line-height: 44px;
   cursor: pointer;
+  margin-right: 10px;
 
   &.small {
     line-height: 37px;

From 15820d7eff00ca7bacaefdfe25841c3ccf8fc6bb Mon Sep 17 00:00:00 2001
From: ernestosiak <44050749+ernestosiak@users.noreply.github.com>
Date: Tue, 23 Oct 2018 15:11:11 +0200
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6236a08b8..6c541c356 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to AET will be documented in this file.
 
 ## Unreleased
 **List of changes that are finished but not yet released in any final version.**
+- [PR-408](https://github.com/Cognifide/aet/pull/408) Advanced Screen Comparision button layout fix
 - [PR-399](https://github.com/Cognifide/aet/pull/399) Bug fix on side panel - conditional tests ([#398](https://github.com/Cognifide/aet/issues/398))
 - [PR-396](https://github.com/Cognifide/aet/pull/396) Added horizontal scrollbar for wide pages ([#393](https://github.com/Cognifide/aet/issues/393)) 
 - [PR-403](https://github.com/Cognifide/aet/pull/403) Conditionally passed tests can be accepted ([#400](https://github.com/Cognifide/aet/issues/400))