Skip to content

[MDL2]: ContextualMenu #63

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

Merged
atneik merged 9 commits into from
Aug 4, 2016
Merged

[MDL2]: ContextualMenu #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de3144e
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 2, 2016
43794bd
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 3, 2016
b52dbc3
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 3, 2016
33fb294
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 3, 2016
84f555f
Update example icons, change selected item bg
Aug 4, 2016
b4451ef
aligning icons
Aug 4, 2016
2ff5809
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into anihan/mdl2/c…
Aug 4, 2016
216d4a9
Fix example
Aug 4, 2016
16f21e5
Using semantic variables
Aug 4, 2016
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 src/components/ContextualMenu/ContextualMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$ContextualMenu-background: $ms-color-white;
$ContextualMenu-itemHover: $ms-color-neutralLight;
$ContextualMenu-expandedItemBackground: $ms-color-themeLight;
$ContextualMenu-expandedItemBackground: $ms-color-neutralQuaternaryAlt;
$ContextualMenu-itemHeight: 40px;
$ContextualMenu-iconWidth: 24px;

Expand Down Expand Up @@ -72,6 +72,8 @@ $ContextualMenu-iconWidth: 24px;
min-height: 1px;
width: $ContextualMenu-iconWidth;
text-align: center;
padding-top: ($ContextualMenu-itemHeight - $ms-font-size-m) / 2;
vertical-align: top;
}

.ms-ContextualMenu-itemText {
Expand Down
18 changes: 9 additions & 9 deletions src/demo/pages/ContextualMenuPage/examples/ContextualMenu.Basic.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class ContextualMenuBasicExample extends React.Component<any, any> {
[
{
key: 'newItem',
icon: 'circlePlus',
icon: 'CirclePlus',
items: [
{
key: 'emailMessage',
Expand All @@ -41,7 +41,7 @@ export class ContextualMenuBasicExample extends React.Component<any, any> {
},
{
key: 'upload',
icon: 'upload',
icon: 'Upload',
name: 'Upload'
},
{
Expand All @@ -67,12 +67,12 @@ export class ContextualMenuBasicExample extends React.Component<any, any> {
},
{
key: 'share',
icon: 'share',
icon: 'Share',
items: [
{
key: 'sharetoemail',
name: 'Share to Email',
icon: 'mail'
icon: 'Mail'
},
{
key: 'sharetofacebook',
Expand All @@ -81,12 +81,12 @@ export class ContextualMenuBasicExample extends React.Component<any, any> {
{
key: 'sharetotwitter',
name: 'Share to Twitter',
icon: 'share',
icon: 'Share',
items: [
{
key: 'sharetoemail_1',
name: 'Share to Email',
icon: 'mail'
icon: 'Mail'
},
{
key: 'sharetofacebook_1',
Expand All @@ -95,7 +95,7 @@ export class ContextualMenuBasicExample extends React.Component<any, any> {
{
key: 'sharetotwitter_1',
name: 'Share to Twitter',
icon: 'share'
icon: 'Share'
},
],
},
Expand All @@ -104,12 +104,12 @@ export class ContextualMenuBasicExample extends React.Component<any, any> {
},
{
key: 'print',
icon: 'print',
icon: 'Print',
name: 'Print'
},
{
key: 'music',
icon: 'music',
icon: 'MusicInCollectionFill',
name: 'Music',
},
{
Expand Down
12 changes: 6 additions & 6 deletions src/demo/pages/ContextualMenuPage/examples/ContextualMenu.Checkmarks.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,23 @@ export class ContextualMenuCheckmarksExample extends React.Component<any, IConte
[
{
key: keys[0],
icon: 'circlePlus',
icon: 'CirclePlus',
name: 'New',
canCheck: true,
isChecked: selection[keys[0]],
onClick: this._onToggleSelect
},
{
key: keys[1],
icon: 'share',
icon: 'Share',
name: 'Share',
canCheck: true,
isChecked: selection[keys[1]],
onClick: this._onToggleSelect
},
{
key: keys[2],
icon: 'mobile',
icon: 'CellPhone',
name: 'Mobile',
canCheck: true,
isChecked: selection[keys[2]],
Expand All @@ -69,23 +69,23 @@ export class ContextualMenuCheckmarksExample extends React.Component<any, IConte

{
key: keys[3],
icon: 'print',
icon: 'Print',
name: 'Print',
canCheck: true,
isChecked: selection[keys[3]],
onClick: this._onToggleSelect
},
{
key: keys[4],
icon: 'music',
icon: 'MusicInCollectionFill',
name: 'Music',
canCheck: true,
isChecked: selection[keys[4]],
onClick: this._onToggleSelect
},
{
key: keys[5],
icon: 'circlePlus',
icon: 'CirclePlus',
items: [
{
key: keys[6],
Expand Down
46 changes: 23 additions & 23 deletions src/demo/pages/ContextualMenuPage/examples/ContextualMenu.Customization.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class ContextualMenuCustomizationExample extends React.Component<any, ICo
[
{
key: 'newItem',
icon: 'circlePlus',
icon: 'CirclePlus',
items: [
{
key: 'emailMessage',
Expand All @@ -50,7 +50,7 @@ export class ContextualMenuCustomizationExample extends React.Component<any, ICo
},
{
key: 'upload',
icon: 'upload',
icon: 'Upload',
name: 'Upload'
},
{
Expand All @@ -67,86 +67,86 @@ export class ContextualMenuCustomizationExample extends React.Component<any, ICo
name: 'None'
},
{
key: 'cat',
name: 'cat',
key: 'bulb',
name: 'Lightbulb',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'dog',
name: 'dog',
key: 'run',
name: 'Running',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'plane',
name: 'plane',
name: 'Airplane',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'page',
name: 'page',
name: 'Page',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'firstAid',
name: 'firstAid',
key: 'cake',
name: 'Cake',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'trophy',
name: 'trophy',
key: 'soccer',
name: 'Soccer',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'home',
name: 'home',
name: 'Home',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'pill',
name: 'pill',
key: 'emoji',
name: 'Emoji2',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'briefcase',
name: 'briefcase',
key: 'work',
name: 'Work',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'coffee',
name: 'coffee',
name: 'Coffee',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'people',
name: 'people',
name: 'People',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'stopwatch',
name: 'stopwatch',
name: 'Stopwatch',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'music',
name: 'music',
name: 'MusicInCollectionFill',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
},
{
key: 'bag',
name: 'bag',
key: 'lock',
name: 'Lock',
onRender: this._renderCharmMenuItem,
className: 'ms-ContextualMenu-customizationExample-item'
}
Expand Down
12 changes: 6 additions & 6 deletions src/demo/pages/ContextualMenuPage/examples/ContextualMenu.Directional.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export class ContextualMenuDirectionalExample extends React.Component<{}, IConte
{
key: 'newItem',
name: 'New',
icon: 'circlePlus',
icon: 'CirclePlus',
items: [
{
key: 'emailMessage',
Expand All @@ -103,7 +103,7 @@ export class ContextualMenuDirectionalExample extends React.Component<{}, IConte
{
key: 'upload',
name: 'Upload',
icon: 'upload'
icon: 'Upload'
},
{
key: 'rename',
Expand All @@ -116,12 +116,12 @@ export class ContextualMenuDirectionalExample extends React.Component<{}, IConte
{
key: 'share',
name: 'Share',
icon: 'share',
icon: 'Share',
items: [
{
key: 'sharetoemail',
name: 'Share to Email',
icon: 'mail'
icon: 'Mail'
},
{
key: 'sharetofacebook',
Expand All @@ -130,14 +130,14 @@ export class ContextualMenuDirectionalExample extends React.Component<{}, IConte
{
key: 'sharetotwitter',
name: 'Share to Twitter',
icon: 'share'
icon: 'Share'
},
]
},
{
key: 'print',
name: 'Print',
icon: 'print'
icon: 'Print'
},
]
}
Expand Down
3 changes: 1 addition & 2 deletions src/demo/pages/ContextualMenuPage/examples/ContextualMenuExample.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
position: absolute;
vertical-align: top;
width: 300px;
top: 85px;
top: 108px;
margin: 0 100px;
text-align: center;
}

.ms-ContextualMenuDirectionalExample-buttonArea .ms-Button {
top: 80px;
text-align: center;
width: 100%;
}
Expand Down