Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
language: node_js
node_js:
- '8'
- '7'
before_script:
- npm install -g gulp
script:
- npm run buildfast
cache:
directories:
- node_modules
- common/node_modules
- npm run build
25 changes: 25 additions & 0 deletions apps/fabric-website/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,31 @@
{
"name": "@uifabric/fabric-website",
"entries": [
{
"version": "4.5.36",
"tag": "@uifabric/fabric-website_v4.5.36",
"date": "Mon, 12 Jun 2017 01:47:18 GMT",
"comments": {
"patch": [
{
"author": "Christian Gonzalez <[email protected]>",
"commit": "de7c49d2bd5e85af8d7ae0aee97eb9afd297966d",
"comment": "Enable no implicit any in utilities package"
}
],
"dependency": [
{
"comment": "Updating dependency \"@uifabric/example-app-base\" from `3.0.0` to `3.0.1`"
},
{
"comment": "Updating dependency \"@uifabric/utilities\" from `>=4.1.2 <5.0.0` to `>=4.1.2 <5.0.0`"
},
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=4.4.2 <5.0.0` to `>=4.4.2 <5.0.0`"
}
]
}
},
{
"version": "4.5.35",
"tag": "@uifabric/fabric-website_v4.5.35",
Expand Down
9 changes: 8 additions & 1 deletion apps/fabric-website/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change Log - @uifabric/fabric-website

This log was last generated on Thu, 08 Jun 2017 00:18:05 GMT and should not be manually modified.
This log was last generated on Mon, 12 Jun 2017 01:47:18 GMT and should not be manually modified.

## 4.5.36
Mon, 12 Jun 2017 01:47:18 GMT

### Patches

- Enable no implicit any in utilities package

## 4.5.35
Thu, 08 Jun 2017 00:18:05 GMT
Expand Down
4 changes: 2 additions & 2 deletions apps/fabric-website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uifabric/fabric-website",
"version": "4.5.35",
"version": "4.5.36",
"description": "Reusable React components for building experiences for Office 365.",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -47,7 +47,7 @@
"webpack-bundle-analyzer": "^2.2.1"
},
"dependencies": {
"@uifabric/example-app-base": "3.0.0",
"@uifabric/example-app-base": "3.0.1",
"@uifabric/utilities": ">=4.1.2 <5.0.0",
"color-functions": "1.1.0",
"json-loader": "^0.5.4",
Expand Down
24 changes: 8 additions & 16 deletions apps/fabric-website/src/components/DOIcon/DOIcon.scss

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ $od-Navigation-columnPadding: 30px;
background-color: $ms-color-black;
vertical-align: top;

.ms-Icon {
height: auto;
position: relative;
top: -4px;
}

&.is-open {
.od-Navigation-link {
background-color: $ms-color-neutralPrimaryAlt;
Expand Down Expand Up @@ -67,7 +73,7 @@ $od-Navigation-columnPadding: 30px;

@media (min-width: $od-Header-bannerWidth) {
position: fixed;
top: 50px;
top: $od-Header-height;
left: 0;
height: 404px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export class DONavigation extends React.Component<IDONavigationProps, IDONavigat
<div className='od-Navigation-subMenuItems'>
<div className='ms-Grid'>
<div className='ms-Grid-row'>
<div className='ms-Grid-col ms-u-xl3 ms-sm12 od-Navigation-menuFirstColumn'>
<div className='ms-Grid-col ms-xl3 ms-sm12 od-Navigation-menuFirstColumn'>
{ this._getLinks(links.exploreLinks.firstMenuColumn) }
</div>
<div className='ms-Grid-col ms-xl3 ms-sm12 od-Navigation-menuSecondColumn'>
Expand Down
62 changes: 37 additions & 25 deletions apps/fabric-website/src/data/DONavigationLinkData.json
Original file line number Diff line number Diff line change
@@ -1,107 +1,119 @@
{
"exploreLinks": {
"firstMenuColumn": [
"firstMenuColumn": [
{
"label": "Why Office?",
"href": "http://dev.office.com/opportunity"
"href": "https://dev.office.com/opportunity"
},
{
"label": "Office UI Fabric",
"href": "http://dev.office.com/fabric"
"href": "https://dev.office.com/fabric"
},
{
"label": "Microsoft Graph",
"href": "http://graph.microsoft.io/"
"href": "https://developer.microsoft.com/graph"
},
{
"label": "Better with Office",
"href": "http://betterwith.office.com/"
"href": "https://betterwith.office.com/"
},
{
"label": "Go To Market",
"href": "https://dev.office.com/go-to-market"
},
{
"label": "Industry Verticals",
"href": "https://dev.office.com/industry-verticals"
},
{
"label": "Business Platform",
"href": "https://businessplatform.microsoft.com/"
}
],
"secondMenuColumn": [
{
"label": "Word",
"href": "http://dev.office.com/word",
"href": "https://dev.office.com/word",
"icon": {
"iconClass": "word",
"bgColor": "blue"
}
},
{
"label": "Excel",
"href": "http://dev.office.com/excel",
"href": "https://dev.office.com/excel",
"icon": {
"iconClass": "excel",
"bgColor": "green"
}
},
{
"label": "PowerPoint",
"href": "http://dev.office.com/powerpoint",
"href": "https://dev.office.com/powerpoint",
"icon": {
"iconClass": "powerpoint",
"bgColor": "orangeLight"
}
},
{
"label": "Outlook",
"href": "http://dev.outlook.com/",
"href": "https://dev.outlook.com/",
"icon": {
"iconClass": "outlook",
"bgColor": "blue"
}
},
{
"label": "OneDrive",
"href": "http://dev.onedrive.com/",
"href": "https://dev.onedrive.com/",
"icon": {
"iconClass": "onedrive",
"bgColor": "blue"
}
},
{
"label": "OneNote",
"href": "http://dev.onenote.com/",
"href": "https://dev.onenote.com/",
"icon": {
"iconClass": "onenote",
"bgColor": "magenta"
}
},
{
"label": "SharePoint",
"href": "https://msdn.microsoft.com/en-us/library/office/dn833469.aspx",
"href": "https://dev.office.com/sharepoint",
"icon": {
"iconClass": "sharepoint",
"bgColor": "blueLight"
}
},
{
"label": "Skype",
"href": "http://dev.office.com/skype",
"href": "https://dev.office.com/skype",
"icon": {
"iconClass": "skype",
"bgColor": "blueLight"
}
},
{
"label": "Access",
"href": "https://msdn.microsoft.com/en-us/library/office/dn605890.aspx",
"href": "https://msdn.microsoft.com/en-us/library/office/fp179695.aspx",
"icon": {
"iconClass": "access",
"bgColor": "redDark"
}
},
{
"label": "Project",
"href": "https://msdn.microsoft.com/en-us/library/office/ms512767.aspx",
"href": "https://dev.office.com/project",
"icon": {
"iconClass": "project",
"bgColor": "teal"
}
},
{
"label": "Yammer",
"href": "http://dev.yammer.com/",
"href": "https://dev.yammer.com/",
"icon": {
"iconClass": "yammer",
"bgColor": "blue"
Expand All @@ -112,64 +124,64 @@
"href": "https://dev.office.com/microsoft-teams",
"icon": {
"iconClass": "microsoftTeams",
"bgColor": ""
"bgColor": "blue"
}
}
],
"thirdMenuColumn": [
{
"label": "Android",
"href": "http://dev.office.com/android",
"href": "https://dev.office.com/android",
"icon": {
"iconClass": "android"
}
},
{
"label": "ASP .NET",
"href": "http://dev.office.com/asp-dot-net",
"href": "https://dev.office.com/asp-dot-net",
"icon": {
"iconClass": "aspnet"
}
},
{
"label": "iOS",
"href": "http://dev.office.com/ios",
"href": "https://dev.office.com/ios",
"icon": {
"iconClass": "ios",
"bgColor": ""
}
},
{
"label": "JavaScript",
"href": "http://dev.office.com/js",
"href": "https://dev.office.com/js",
"icon": {
"iconClass": "javascript"
}
},
{
"label": "Node.js",
"href": "http://dev.office.com/node",
"href": "https://dev.office.com/node",
"icon": {
"iconClass": "node"
}
},
{
"label": "PHP (coming soon)",
"href": "https://graph.microsoft.io/getting-started",
"href": "https://developer.microsoft.com/graph/quick-start",
"icon": {
"iconClass": "php"
}
},
{
"label": "Python (coming soon)",
"href": "https://graph.microsoft.io/getting-started",
"href": "https://developer.microsoft.com/graph/quick-start",
"icon": {
"iconClass": "python"
}
},
{
"label": "Ruby (coming soon)",
"href": "https://graph.microsoft.io/getting-started",
"href": "https://developer.microsoft.com/graph/quick-start",
"icon": {
"iconClass": "ruby"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/fabric-website/src/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,4 @@ function addCSSToHeader(fileName) {
linkEl.href = fileName
headEl.appendChild(linkEl)
}
addCSSToHeader('https://static2.sharepointonline.com/files/fabric/office-ui-fabric-core/5.1.0/css/fabric.min.css')
addCSSToHeader('https://static2.sharepointonline.com/files/fabric/office-ui-fabric-core/7.1.0/css/fabric.min.css')
4 changes: 1 addition & 3 deletions apps/ssr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"name": "ssr-tests",
"version": "1.0.2",
"description": "Reusable React components for building experiences for Office 365.",
"main": "lib/index.js",
"private": true,
"typings": "lib/index.d.ts",
"repository": {
"type": "git",
"url": "https://github.com/OfficeDev/office-ui-fabric-react"
Expand All @@ -25,7 +23,7 @@
"@types/mocha": "^2.2.39",
"@types/webpack-env": "^1.13.0",
"mocha": "~3.3.0",
"office-ui-fabric-react": ">=4.4.1 <5.0.0",
"office-ui-fabric-react": ">=4.5.0 <5.0.0",
"raw-loader": "^0.5.1",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/test-bundle-button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"react": "^0.14 || ^15.0.1-0 || ^16.0.0-0",
"react-dom": "^0.14 || ^15.0.1-0 || ^16.0.0-0",
"office-ui-fabric-react": ">=4.4.1 <5.0.0",
"office-ui-fabric-react": ">=4.5.0 <5.0.0",
"tslib": "^1.6.0"
}
}
2 changes: 1 addition & 1 deletion apps/todo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"es6-promise": "^4.1.0",
"immutability-helper": "^2.0.0",
"office-ui-fabric-core": ">=7.0.0 <8.0.0",
"office-ui-fabric-react": ">=4.4.1 <5.0.0",
"office-ui-fabric-react": ">=4.5.0 <5.0.0",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"typescript": "2.2.2",
Expand Down

This file was deleted.

This file was deleted.

Loading