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

pencil icon moved to the right ... menu #4022

Merged
merged 2 commits into from
Sep 7, 2020
Merged

pencil icon moved to the right ... menu #4022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fad3f90
pencil icon moved to the right ... menu
tauqeer-haider Aug 31, 2020
e200b85
override the style
tauqeer-haider Sep 7, 2020
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
4 changes: 3 additions & 1 deletion ...ide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/PersonaBarPageTreeMenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { PropTypes } from "prop-types";
import "./styles.less";
import PersonaBarSelectionArrow from "./_PersonaBarSelectionArrow";
import PersonaBarExpandCollapseIcon from "./_PersonaBarExpandCollapseIcon";
import PersonaBarDraftPencilIcon from "./_PersonaBarDraftPencilIcon";

export class PersonaBarPageTreeMenu extends Component {

Expand Down Expand Up @@ -47,11 +48,12 @@ export class PersonaBarPageTreeMenu extends Component {

return listItems.map((item, index) => {
return (
<li key={"pageTreeListItem" + index} className="list-item-menu">
<li key={"pageTreeListItem" + index} className="list-item-menu-right">
<div
className={(item.selected) ? "list-item-highlight" : null}
style={{ height: "28px", lineHeight: "35px" }}>
<div className="draft-pencil">
<PersonaBarDraftPencilIcon display={item.hasUnpublishedChanges} />
{item.canViewPage && <PersonaBarSelectionArrow
CallCustomAction={this.props.CallCustomAction}
onAddPage={this.props.onAddPage}
Expand Down
4 changes: 0 additions & 4 deletions ...ide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/PersonaBarPageTreeview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import utils from "utils";
import "./styles.less";
import { SingleLineInput } from "@dnnsoftware/dnn-react-common";
import PersonaBarPageIcon from "./_PersonaBarPageIcon";
import PersonaBarDraftPencilIcon from "./_PersonaBarDraftPencilIcon";

export class PersonaBarPageTreeview extends Component {

Expand Down Expand Up @@ -178,9 +177,6 @@ export class PersonaBarPageTreeview extends Component {
item.name
}
</span>
<div className="draft-pencil">
<PersonaBarDraftPencilIcon display={item.hasUnpublishedChanges} />
</div>
</div>
{((item.childListItems && !item.isOpen) || !item.childListItems) && index === total && this.renderDropZone("after", item)}
</div>
Expand Down
16 changes: 15 additions & 1 deletion ...erience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/styles.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,20 @@
}
}
}
.list-item-menu-right {
width: 70px;
.draft-pencil {
width: auto;
display: inline-block;
svg:hover {
fill: @alto;
}
.dnn-persona-bar-draft-icon {
display: inline-block;
width: 20px;
}
}
}
.tree-menu-ul ul {
padding: 0;
}
Expand Down Expand Up @@ -123,7 +137,7 @@
.selection-arrow {
display: inline-block;
position: relative;
width: 90px;
width: 50px;
Copy link
Contributor

Choose a reason for hiding this comment

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

@valadas and others, this is the only bit that I see that might impact Platform only.

Long term, this Evoq only code shouldn't be here IMHO.

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree, we purposefully tried hard to gain as many pixels as possible for the very tight room we have in there. I would prefer if Evoq needs to shorten that, it is overriden in Evoq to not affect our efforts in this area for Platform.

@tauqeer-haider Would you be able to remove this change here and override it in Evoq css only ?

top: 0px;
left: 5px;
font-size: 18px;
Expand Down