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

Jump to bottom

fix(abc:sv): fix detail misalignment when content include block #545

Merged
merged 2 commits into from Apr 29, 2019
Merged

fix(abc:sv): fix detail misalignment when content include block #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a87d336
fix(abc:sv): fix detail misalignment when content include block
cipchk Apr 29, 2019
bd66275
Merge branch 'master' into issues-1055
cipchk Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/abc/ellipsis/style/index.less
View file
Open in desktop
@@ -1,7 +1,7 @@
@import '../../../theme/styles/default.less';

ellipsis {
display: inline-block;
display: inline;
}

.ellipsis {
Expand Down
1 change: 1 addition & 0 deletions packages/abc/view/style/index.less
View file
Open in desktop
Expand Up @@ -63,6 +63,7 @@
}
}
&__detail {
// contents 对 ie, edge 不支持，但对于子组件的支持会更友好
display: table-cell;
width: 100%;
padding-bottom: @sv-bottom;
Expand Down
4 changes: 3 additions & 1 deletion packages/abc/view/view.component.html
View file
Open in desktop
Expand Up @@ -8,5 +8,7 @@
#conEl>
<ng-content></ng-content>
</span>
<span class="sv__unit" *stringTemplateOutlet="unit">{{unit}}</span>
<ng-container *ngIf="!!unit">
<span class="sv__unit" *stringTemplateOutlet="unit">{{unit}}</span>
</ng-container>
</div>