Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
Conflicts:
	css/site.css
	index.html
  • Loading branch information
Snesha committed Feb 22, 2016
2 parents 926f613 + 5a5b60a commit f30264e
Show file tree
Hide file tree
Showing 11 changed files with 589 additions and 519 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Gemfile.lock
_site
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'github-pages'
32 changes: 22 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,45 @@ How to contribute?
List of Microsoft Organizations on GitHub
=========================================

- https://github.com/aspnet
- https://github.com/Azure
- https://github.com/AzureAD
- https://github.com/AzureADSamples
- https://github.com/AzureFederal
- https://github.com/Azure-Readiness
- https://github.com/Azure-Samples
- https://github.com/bitstadium
- https://github.com/DynamicsCRM
- https://github.com/fuselabs
- https://github.com/liveservices
- https://github.com/liveservices
- https://github.com/LIS
- https://github.com/Microsoft
- https://github.com/ManifoldJS
- https://github.com/Microsoft
- https://github.com/Microsoft-CISL
- https://github.com/MicrosoftDX
- https://github.com/MicrosoftEdge
- https://github.com/MicrosoftGenomics
- https://github.com/microsoft-hsg
- https://github.com/MicrosoftHPC
- https://github.com/MicrosoftResearch
- https://github.com/MicrosoftResearch
- https://github.com/MSOpenTech
- https://github.com/ms-iot
- https://github.com/mspnp
- https://github.com/nokia-developer
- https://github.com/nuget
- https://github.com/OfficeDev
- https://github.com/microsoft-mobile
- https://github.com/OData
- https://github.com/OfficeDev
- https://github.com/OneDrive
- https://github.com/OSTC
- https://github.com/OneGet
- https://github.com/OneNoteDev
- https://github.com/OSTC
- https://github.com/PowerBI
- https://github.com/PowerShell
- https://github.com/Reactive-Extensions
- https://github.com/SignalR
- https://github.com/Azure-Samples
- https://github.com/SimpleCloudManagerProject
- https://github.com/thaliproject
- https://github.com/winjs
- https://github.com/yammer
- https://github.com/Z3Prover


Note, if the Microsoft Open Source project you are looking for is not in one of these organizations
then we have several other projects hosted on CodePlex here:
Expand Down
4 changes: 3 additions & 1 deletion css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@
overflow:hidden;
text-wrap: none;
white-space: nowrap;
vertical-align: middle;
line-height: 100%;
-ms-text-overflow:ellipsis;
text-overflow:ellipsis;
}
Expand Down Expand Up @@ -164,4 +166,4 @@
.organizations .row .orglink {
color: #FFF;
font-size: 13px;
}
}
36 changes: 9 additions & 27 deletions css/mscom.css
Original file line number Diff line number Diff line change
Expand Up @@ -2712,9 +2712,6 @@ body {
.CMSvNextComp a:link {
text-decoration: none;
}
.CMSvNextComp a:visited {
text-decoration: none;
}
.CMSvNextComp a:hover {
text-decoration: underline;
}
Expand Down Expand Up @@ -3022,7 +3019,7 @@ a.mscom-siteIdentity:link {
color: rgb(51, 51, 51); font-size: 30px; text-decoration: none;
}
a.mscom-siteIdentity:visited {
color: rgb(51, 51, 51); font-size: 30px; text-decoration: none;
color: rgb(51, 51, 51);
}
a.mscom-siteIdentity:active {
color: rgb(51, 51, 51); font-size: 30px; text-decoration: none;
Expand All @@ -3035,9 +3032,6 @@ a.mscom-siteIdentity:hover {
a.mscom-siteIdentity:link {
font-size: 20px;
}
a.mscom-siteIdentity:visited {
font-size: 20px;
}
a.mscom-siteIdentity:active {
font-size: 20px;
}
Expand Down Expand Up @@ -3409,7 +3403,7 @@ a.mscom-account-text {
padding: 0px 5px; color: rgb(0, 114, 198); font-size: 13px; text-decoration: none;
}
.mscom-account-text a:visited {
padding: 0px 5px; color: rgb(0, 114, 198); font-size: 13px; text-decoration: none;
color: rgb(0, 114, 198);
}
.mscom-account-text a:active {
padding: 0px 5px; color: rgb(0, 114, 198); font-size: 13px; text-decoration: none;
Expand All @@ -3424,7 +3418,7 @@ a.mscom-account-text:link {
padding: 0px 5px; color: rgb(0, 114, 198); font-size: 13px; text-decoration: none;
}
a.mscom-account-text:visited {
padding: 0px 5px; color: rgb(0, 114, 198); font-size: 13px; text-decoration: none;
color: rgb(0, 114, 198);
}
a.mscom-account-text:active {
padding: 0px 5px; color: rgb(0, 114, 198); font-size: 13px; text-decoration: none;
Expand Down Expand Up @@ -4591,7 +4585,7 @@ html[dir='rtl'].iem7 .grid-row .grid-unit {
color: inherit; cursor: pointer; pointer-events: auto;
}
.box a:visited {
color: inherit; cursor: pointer; pointer-events: auto;
color: inherit;
}
.box a:hover {
color: inherit; cursor: pointer; pointer-events: auto;
Expand Down Expand Up @@ -5857,7 +5851,7 @@ a:link {
color: rgb(21, 112, 166); text-decoration: none;
}
a:visited {
color: rgb(21, 112, 166); text-decoration: none;
color: rgb(21, 112, 166);
}
a:hover {
color: rgb(21, 112, 166); text-decoration: underline;
Expand Down Expand Up @@ -6158,9 +6152,6 @@ div.overlay-container {
.CSPvNext .row-fluid .PopularDownloadInHomePage a:link {
font-size: 123%;
}
.CSPvNext .row-fluid .PopularDownloadInHomePage a:visited {
font-size: 123%;
}
.CSPvNext .row-fluid .PopularDownloadInHomePage a:hover {
font-size: 123%;
}
Expand Down Expand Up @@ -6691,7 +6682,7 @@ div.moreinfo-scrollable .download-main-article .mscom-accordion-item-container .
color: rgb(21, 112, 166); line-height: 1.4em; font-family: wf_segoe-ui_normal,"Segoe UI",Segoe,"Segoe WP",Tahoma,Verdana,Arial,sans-serif; font-size: 81.25%;
}
.prodOffer a:visited {
color: rgb(21, 112, 166); line-height: 1.4em; font-family: wf_segoe-ui_normal,"Segoe UI",Segoe,"Segoe WP",Tahoma,Verdana,Arial,sans-serif; font-size: 81.25%;
color: rgb(21, 112, 166);
}
.prodOffer a.product-offer-title-link {
font-weight: bold;
Expand Down Expand Up @@ -6802,7 +6793,7 @@ div.installDlm-warn div.moreinfo-desc {
color: rgb(21, 112, 166); font-size: 100%; text-decoration: none;
}
.other-system-note a.change-system:visited {
color: rgb(21, 112, 166); font-size: 100%; text-decoration: none;
color: rgb(21, 112, 166);
}
.other-system-note .osnames {
font-weight: bold; margin-left: 10px;
Expand Down Expand Up @@ -6847,7 +6838,7 @@ div.installDlm-warn div.moreinfo-desc {
color: rgb(255, 255, 255); text-decoration: none;
}
.changebits-overlay a:visited {
color: rgb(255, 255, 255); text-decoration: none;
color: rgb(255, 255, 255);
}
.changebits-overlay .disabled {
border: 1px solid gray; border-image: none; cursor: default; background-color: gray;
Expand Down Expand Up @@ -7329,9 +7320,6 @@ div.regsys-opt h2 {
.confirm-instructions a:link {
text-decoration: none;
}
.confirm-instructions a:visited {
text-decoration: none;
}
.confirm-instructions a:hover {
text-decoration: none;
}
Expand Down Expand Up @@ -7771,7 +7759,7 @@ p.new-line-span {
color: inherit; cursor: pointer; pointer-events: auto;
}
.box a:visited {
color: inherit; cursor: pointer; pointer-events: auto;
color: inherit;
}
.box a:hover {
color: inherit; cursor: pointer; pointer-events: auto;
Expand Down Expand Up @@ -8622,9 +8610,6 @@ div .pager a.page_next:hover {
.msstore_clip_desc a:link {
text-decoration: none;
}
.msstore_clip_desc a:visited {
text-decoration: none;
}
.msstore_clip_desc a:active {
text-decoration: none;
}
Expand Down Expand Up @@ -8661,9 +8646,6 @@ div .pager a.page_next:hover {
.msstore_seemore a:link {
text-decoration: none;
}
.msstore_seemore a:visited {
text-decoration: none;
}
.msstore_seemore a:active {
text-decoration: none;
}
Expand Down
21 changes: 19 additions & 2 deletions css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pre {
overflow:auto;
}

#file-viewer-pre
#file-viewer-pre
{
background-color: white !important;
}
Expand Down Expand Up @@ -94,6 +94,12 @@ div.jstree-wholerow-clicked {
}

.mscom-footer3 a
.mscom-footer2{
background-color:white !important;
color:black !important;
}
.mscom-footer2 a

{
color: black !important;
}
Expand All @@ -118,6 +124,7 @@ ul.toulist{
ul.toulist li{
font-family: wf_segoe-ui_light;
}

div.metric-value {
text-align:right;
margin-right:0px;
Expand All @@ -127,4 +134,14 @@ div.metric-value {
div.metric-label {
text-align:left;
margin-left:0px;
}
}

div.metric-value {
text-align:right;
margin-right:0px;
padding-right:0px;
}
div.metric-label {
text-align:left;
margin-left:0px;
}
4 changes: 2 additions & 2 deletions data/featured.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[
"corefx", "TypeScript", "Home"
]
"vscode", "Office-UI-Fabric", "winjs"
]
Loading

0 comments on commit f30264e

Please sign in to comment.