Skip to content
This repository has been archived by the owner on Nov 11, 2021. It is now read-only.

Commit

Permalink
resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
@ststimac
ststimac committed Jan 10, 2017
1 parent b4ff3f1 commit d1de8e6
Show file tree
Hide file tree
Showing 25 changed files with 243 additions and 92 deletions.
2 changes: 1 addition & 1 deletion betafish/Default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
<script src="../../includes/script/TestDriveCommon.js"></script>
<script src="https://msedgecdn.azurewebsites.net/scripts/demo-header.js"></script>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion blobbuilder/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,4 +304,4 @@ <h1>Blob Bop</h1>
<script src="scripts/demo.js"></script>
</body>

</html>
</html>
19 changes: 19 additions & 0 deletions chalkboard/Default.html
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<<<<<<< HEAD
=======
<meta charset="utf-8">
>>>>>>> MicrosoftEdge/master
<!-- Copyright © Microsoft Corporation. All Rights Reserved. -->
<!-- Demo Author: Jason Weber, Microsoft Corporation -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<title>Chalkboard HTML5 Benchmark</title>
<<<<<<< HEAD
<meta name="description" content="HTML5 and SVG Performance Benchmark" />
<link rel="stylesheet" type="text/css" href="Chalkboard.css" />
<meta name="t_omni_demopage" content="1" />
</head>
<body onload="Initialize()">
<div id="DemoScreenreaderText">Thanks for checking out this Internet Explorer 10 Test Drive demo. This demo uses animation techniques to move (pan, zoom, and scale) an image around on the screen. The faster your browser and the smoother the chalkboard will feel.</div>
=======
<meta name="description" content="HTML5 and SVG Performance Benchmark" />
<link rel="stylesheet" href="Chalkboard.css" />
<meta name="t_omni_demopage" content="1" />
</head>
<body onload="Initialize()">
<div id="DemoScreenreaderText">Thanks for checking out this Internet Explorer 10 Test Drive demo. This demo uses animation techniques to move (pan, zoom, and scale) an image around on the screen. The faster your browser and the smoother the chalkboard will feel.</div>
>>>>>>> MicrosoftEdge/master
<img id="EmptyChalkboard" src="Images/EmptyChalkboard.svg" />
<img id="Chalkboard" src="Images/Chalkboard.svg" />
<div id="Intro">
Expand All @@ -27,9 +39,16 @@
</div>
</div>
<audio id="Audio" src="Audio/Whoosh2.mp3"></audio>
<<<<<<< HEAD
<script type="text/javascript" src="Script/Benchmark.js"></script>
<script type="text/javascript" src="../Includes/Script/FeatureDetectAudio.js"></script>
<script type="text/javascript" src="../includes/script/TestDriveCommon.js"></script>
<script type="text/javascript" src="https://msedgecdn.azurewebsites.net/scripts/demo-header.js"></script>
=======
<script src="Script/Benchmark.js"></script>
<script src="../Includes/Script/FeatureDetectAudio.js"></script>
<script src="../includes/script/TestDriveCommon.js"></script>
<script src="https://msedgecdn.azurewebsites.net/scripts/demo-header.js"></script>
>>>>>>> MicrosoftEdge/master
</body>
</html>
2 changes: 1 addition & 1 deletion chess/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,4 @@ <h4>Not Optimized</h4>
<script src="scripts/match.js"></script>
<script src="scripts/main.js"></script>
</body>
</html>
</html>
12 changes: 6 additions & 6 deletions css3filters/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@ <h2>What are CSS3 Filters?</h2>
<div class="subsection layout layout--basic--alt">
<div class="module module--primary">
<h3 class="subtitle">CSS</h3>
<pre><code>img {
<pre><code>img {
filter: grayscale(50%) opacity(10%);
}

@keyframes filter-animation {
0% {
@keyframes filter-animation {
0% {

filter: opacity(0);
}
}

50% {
filter: opacity(100%);
}

100% {
100% {
filter: opacity(0);
}
}</code></pre>
Expand Down Expand Up @@ -184,4 +184,4 @@ <h3 class="subtitle">Blur</h3>
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.3.min.js"></script>
<script src="scripts/demo.js"></script>
</body>
</html>
</html>
23 changes: 23 additions & 0 deletions fishbowlie/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<<<<<<< HEAD:fishbowlie/index.html
=======
<meta charset="utf-8">
>>>>>>> MicrosoftEdge/master:fishbowlie/index.html
<!-- Copyright © Microsoft Corporation. All Rights Reserved. -->
<!-- Demo Author: Jason Weber, Microsoft Corporation -->
<meta http-equiv="X-UA-Compatible" content="IE=10" />
<title>HTML5 Fish Bowl</title>

<meta name="description" content="Find your innner fish." />
<link rel="shortcut icon" href="../Includes/Image/FavIcon.ico" />
<<<<<<< HEAD:fishbowlie/index.html
<link rel="stylesheet" type="text/css" href="Fishbowl.css" />
=======
<link rel="stylesheet" href="Fishbowl.css" />
>>>>>>> MicrosoftEdge/master:fishbowlie/index.html
<meta name="t_omni_demopage" content="1" />
</head>
<body onload="Initialize()">
Expand Down Expand Up @@ -59,6 +66,21 @@
<div id="chkFPSMeter" class="Control Enabled" onclick="fpsMeter.ToggleVisibility();">FPS</a></div>
<div id="chkFPSNeedle" class="Control Enabled" onclick="fpsMeter.ToggleNeedleVisibility();">Needle</a></div>
</div>
<<<<<<< HEAD:fishbowlie/index.html
<script type="text/javascript" src="Script/Application.js"></script>
<script type="text/javascript" src="Script/LoadingCover.js"></script>
<script type="text/javascript" src="Script/Resources.js"></script>
<script type="text/javascript" src="Script/Water.js"></script>
<script type="text/javascript" src="Script/FishBowl.js"></script>
<script type="text/javascript" src="Script/Fish.js"></script>
<script type="text/javascript" src="Script/Frame.js"></script>
<script type="text/javascript" src="Script/Keyboard.js"></script>
<script type="text/javascript" src="Script/Logo.js"></script>
<script type="text/javascript" src="Script/FPSMeter.js"></script>
<script type="text/javascript" src="Script/Performance.js"></script>
<script type="text/javascript" src="../includes/script/TestDriveCommon.js"></script>
<script type="text/javascript" src="https://msedgecdn.azurewebsites.net/scripts/demo-header.js"></script>
=======
<script src="Script/Application.js"></script>
<script src="Script/LoadingCover.js"></script>
<script src="Script/Resources.js"></script>
Expand All @@ -72,6 +94,7 @@
<script src="Script/Performance.js"></script>
<script src="../includes/script/TestDriveCommon.js"></script>
<script src="https://msedgecdn.azurewebsites.net/scripts/demo-header.js"></script>
>>>>>>> MicrosoftEdge/master:fishbowlie/index.html
</body>

</html>
2 changes: 1 addition & 1 deletion letitsnow/Default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@
<script src="../../Includes/Script/TestDriveCommon.js"></script>
<script src="https://msedgecdn.azurewebsites.net/scripts/demo-header.js"></script>
</body>
</html>
</html>
3 changes: 3 additions & 0 deletions mazesolver/Default.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<<<<<<< HEAD
=======
<meta charset="utf-8">
>>>>>>> MicrosoftEdge/master
<!-- Copyright © Microsoft Corporation. All Rights Reserved. -->
<!-- Demo Author: Christian Stockwell, Microsoft Corporation -->
<title>CSS Layout Performance Test</title>
Expand Down
5 changes: 5 additions & 0 deletions microphone/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
<meta name="description" content=""/>
<meta name="keywords" content="Media, webaudio, getusermedia"/>
<meta name="author" content="jdsmith3000"/>
<<<<<<< HEAD
<link rel="stylesheet" type="text/css" href="https://edgeportal.blob.core.windows.net/media/demotemplate.css"/>
<link rel="stylesheet" type="text/css" href="styles/demo.css"/>
=======
<link rel="stylesheet" href="https://edgeportal.blob.core.windows.net/media/demotemplate.css"/>
<link rel="stylesheet" href="styles/demo.css"/>
>>>>>>> MicrosoftEdge/master
</head>

<body>
Expand Down
6 changes: 6 additions & 0 deletions particleacceleration/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,14 @@
</div>
<canvas id="performance-canvas"></canvas>
</div>
<<<<<<< HEAD
<script type="text/javascript" src="scripts/demo.js"></script>
<script type="text/javascript" src="scripts/performance.js"></script>
<script type="text/javascript" src="https://msedgecdn.azurewebsites.net/scripts/demo-header.js"></script>
=======
<script src="scripts/demo.js"></script>
<script src="scripts/performance.js"></script>
<script src="https://msedgecdn.azurewebsites.net/scripts/demo-header.js"></script>
>>>>>>> MicrosoftEdge/master
</body>
</html>
46 changes: 46 additions & 0 deletions penguinmark/PenguinMark.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
/* Base Styles ------------------------------------------------------------------------ */
=======
/* Base Styles ------------------------------------------------------------------------ */
>>>>>>> MicrosoftEdge/master

@font-face {
font-family: 'Cookies';
Expand Down Expand Up @@ -102,6 +106,24 @@ a:hover, a:visited:hover {
text-align: right;
}

<<<<<<< HEAD
#StartButton {
font-family: Cookies;
position: absolute;
padding: 12px 18px 10px 18px;
margin: 0px 20px 0px 0px;
border-radius: 4px;
right: 0px;
background-color: orange;
font-size: 14pt;
}

#StartButton:hover {
background-color: #ffc300;
cursor: pointer;
}

=======

.btn {
background-color: orange;
Expand All @@ -122,6 +144,7 @@ a:hover, a:visited:hover {
position: absolute;
right: 0;
}
>>>>>>> MicrosoftEdge/master


/* Welcome & Results Penguins --------------------------------------------------------- */
Expand Down Expand Up @@ -209,7 +232,10 @@ a:hover, a:visited:hover {
float: right;
width: 360px;
padding-top: 40px;
<<<<<<< HEAD
=======
text-align: center;
>>>>>>> MicrosoftEdge/master
}

#ResultsHeading {
Expand All @@ -228,11 +254,31 @@ a:hover, a:visited:hover {
}

#ResetButton {
<<<<<<< HEAD
width: 140px;
text-align: center;
padding: 12px 18px 10px 18px;
margin: 30px 0px 0px 90px;
border-radius: 4px;
bottom: 0px;
right: 0px;
background-color: orange;
font-size: 14pt;
}

#ResetButton:hover {
background-color: #ffc300;
cursor: pointer;
}


=======
margin: 30px auto;
padding: 12px 18px 10px 18px;
width: 176px;
}

>>>>>>> MicrosoftEdge/master


/* Penguin Container ------------------------------------------------------------------------ */
Expand Down
2 changes: 1 addition & 1 deletion penguinmark/Script/Application.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ function ShowResults() {

function ResetDemo() {
window.location.reload();
}
}
Loading

0 comments on commit d1de8e6

Please sign in to comment.