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.

Sign up for GitHub

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

Feature/minor frontend changes in rerun feature #395

Merged
merged 4 commits into from
Oct 23, 2018
Merged

Feature/minor frontend changes in rerun feature #395

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d33ea41
changed description of rerun time under test to more descriptive'
plutasnyy Oct 15, 2018
7fb9c9b
changed css for rerun msg
plutasnyy Oct 15, 2018
b7d12b5
fixed formatting and sctructure of css calss in rerun message
plutasnyy Oct 18, 2018
3a32391
updated changelog
plutasnyy Oct 18, 2018
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
6 changes: 3 additions & 3 deletions report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h4 class="toolbar-link-header ellipsis">
<span class="preformatted">{{toolbarBottom.viewMode}}:</span>
<span ng-if="toolbarBottom.viewMode != 'url'">{{toolbarBottom.model.name}}</span>
<div ng-if="toolbarBottom.viewMode != 'url' && toolbarBottom.model.lastRerunTimestamp()">
<h5>Last rerun: {{toolbarBottom.model.lastRerunTimestamp() | date:'yyyy-MM-dd HH:mm' }}</h5>
<h5>Last rerun of URL in this test: {{toolbarBottom.model.lastRerunTimestamp() | date:'yyyy-MM-dd HH:mm' }}</h5>
</div>
<a ng-if="toolbarBottom.viewMode == 'url'"
href="{{toolbarBottom.model.domain + toolbarBottom.model.url}}" target="_blank"
Expand Down Expand Up @@ -93,8 +93,8 @@ <h5 ng-if="toolbarBottom.viewMode == 'url'">
</h5>
</div>
<div class="suite-rerun" ng-if="rerunInProgress">
<p class="suite-rerun-msg">Status: {{rerunMsg}}</p>
<p class="suite-rerun-progress" ng-if="rerunInProgressSuccessful">Progress: {{rerunProgress | number: 2}}%</p>
<p class="preformatted suite-rerun-msg-font">Status: {{rerunMsg}}</p>
<p class="preformatted suite-rerun-msg-font suite-rerun-progress" ng-if="rerunInProgressSuccessful">Progress: {{rerunProgress | number: 2}}%</p>
</div>
<div class="toolbar-blocks">
<div class="toolbar-btns is-absolute">
Expand Down
13 changes: 13 additions & 0 deletions report/src/main/webapp/assets/sass/_toolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,3 +274,16 @@
.preformatted {
font-family: monospace;
}

.suite-rerun{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space before {

margin-top: 24px;
}

.suite-rerun-msg-font{
color: grey;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is grey used everywhere in app or could we use a color already used as variable?

font-size: 16px;
}

.suite-rerun-msg{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there still html containig this class? Ive seen you removed one occurence in line 96, are there more?

padding-bottom: 0px;
}