Skip to content
New issue

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

#

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

Already on GitHub? # to your account

IE arrows (fixes #498) #512

Merged
merged 5 commits into from
Jul 31, 2017
Merged

IE arrows (fixes #498) #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc621c7
fix
sseliverstov Jul 27, 2017
d68f6aa
font awesome instead svg bg
sseliverstov Jul 28, 2017
df1abe4
font awesome instead svg bg
sseliverstov Jul 28, 2017
1e4679e
fix test
sseliverstov Jul 28, 2017
3bdf6bb
Merge branch 'master' into 498-ie11-no-arrows
baev Jul 31, 2017
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
11 changes: 0 additions & 11 deletions allure-generator/src/main/javascript/blocks/arrow/arrow.svg
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions allure-generator/src/main/javascript/blocks/arrow/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.block__arrow {
top: 7px;
position: absolute;
visibility: visible;
transition: transform 0.1s;
font-weight: initial;
display: inline-block;
vertical-align: middle;
line-height: normal;
&__expanded {
transform: rotate(90deg);
}
}

.arrow {
width: 14px;
height: 14px;
background: url(./arrow.svg) center no-repeat;
.angle {
width: 18px;
}
2 changes: 1 addition & 1 deletion allure-generator/src/main/javascript/blocks/attachment-row/attachment-row.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div>
<div class="attachment-row" data-uid="{{uid}}">
<span class="attachment-row__arrow block__arrow arrow"></span>
<span class="attachment-row__arrow block__arrow">{{angle}}</span>
<div class="attachment-row__icon">
<span class="{{fileicon type}}" data-tooltip="{{type}}"></span>
</div>
Expand Down
1 change: 0 additions & 1 deletion allure-generator/src/main/javascript/blocks/attachment-row/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
&__arrow {
left: 7px;
position: absolute;
font-size: initial;
}
&__name {
flex: 1;
Expand Down
2 changes: 1 addition & 1 deletion allure-generator/src/main/javascript/components/testresult-execution/stages-block.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#if stages}}
<div class="{{b 'step' expanded=expanded}}">
<div class="{{b 'step' 'title' hasContent=true stage=true}}">
<span class="step__arrow block__arrow arrow"></span>
<span class="step__arrow block__arrow">{{angle}}</span>
{{name}}
</div>
<div class="{{b 'step' 'content'}}">
Expand Down
2 changes: 1 addition & 1 deletion allure-generator/src/main/javascript/components/tree/tree-group.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#if children}}
<div class="node" data-uid="{{uid}}">
<div class="node__title long-line" data-uid="{{uid}}">
<span class="node__arrow block__arrow arrow"></span>
<span class="node__arrow block__arrow">{{angle}}</span>
{{#if name}}
<div class="node__name">
{{name}}
Expand Down
6 changes: 6 additions & 0 deletions allure-generator/src/main/javascript/helpers/angle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import {SafeString} from 'handlebars/runtime';


export default function() {
return new SafeString('<span class="angle fa fa-angle-right fa-fw fa-lg"></span>');
}
1 change: 1 addition & 0 deletions allure-generator/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ module.exports = (env) => {
new CaseSensitivePathsPlugin()
],
devServer: {
disableHostCheck: true,
contentBase: './build/demo-report/',
stats: {colors: true},
host: '0.0.0.0',
Expand Down