Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

advanced screen comparision - layout fix #408

Merged
merged 6 commits into from
Nov 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ All notable changes to AET will be documented in this file.
- [PR-385](https://github.com/Cognifide/aet/pull/385) Fixed ChefDK and vagrant-berkshelf versions
- [PR-404](https://github.com/Cognifide/aet/pull/404) Added missing tooltip for conditional tests

- [PR-408](https://github.com/Cognifide/aet/pull/408) Advanced Screen Comparision button layout fix

## Version 3.1.0

- [PR-409](https://github.com/Cognifide/aet/pull/409) Added sources link in "view source" url
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions report/src/main/webapp/assets/sass/_newComparison.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/

.advanced-screen-comparison {
display: inline-block;
vertical-align: middle;
margin-top: 3px;
margin-right: 20px;
a {
color: $white;
}
Expand Down
1 change: 1 addition & 0 deletions report/src/main/webapp/assets/sass/_toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@
display: block;
line-height: 44px;
cursor: pointer;
margin-right: 10px;

&.small {
line-height: 37px;
Expand Down