Skip to content

Commit

Permalink
Merge pull request #1309 from lencioni/favicon
Browse files Browse the repository at this point in the history
Use favicon in static runner pages
  • Loading branch information
dignifiedquire committed May 29, 2015
2 parents 87e7c10 + 6cded4f commit 35bc997
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
4 changes: 1 addition & 3 deletions static/client.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<head>
%X_UA_COMPATIBLE%
<title>Karma</title>
<!-- TOOD(vojta): create simple favicon and cache it -->
<link href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" rel="icon" type="image/x-icon">
<link href="favicon.ico" rel="icon" type="image/x-icon">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css">
iframe {
Expand All @@ -31,7 +30,6 @@

.online {
background: #6C4;

}

.idle {
Expand Down
2 changes: 1 addition & 1 deletion static/context.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
This is the execution context.
Loaded within the iframe.
Realoaded before every execution run.
Reloaded before every execution run.
-->
<html>
<head>
Expand Down
5 changes: 2 additions & 3 deletions static/debug.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<!doctype html>
<!--
This file is almost the same as context.html - loads all source files,
but it's purpose is to be loaded in the main frame (not within an iframe),
but its purpose is to be loaded in the main frame (not within an iframe),
just for immediate execution, without reporting to Karma server.
-->
<html>
<head>
%X_UA_COMPATIBLE%
<title>Karma DEBUG RUNNER</title>
<!-- TOOD(vojta): create simple favicon and cache it -->
<link href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" rel="icon" type="image/x-icon" />
<link href="favicon.ico" rel="icon" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<body>
Expand Down
Binary file added static/favicon.ico
Binary file not shown.

0 comments on commit 35bc997

Please sign in to comment.