summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorjmedley <jmedley@chromium.org>2015-01-13 12:57:24 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-13 20:59:21 +0000
commit57691de83022b6acc4ba89a5366082972323b4cd (patch)
treed468b331fdeaadb28aca04ef4e35abe9cac46503 /native_client_sdk
parentfc43cba677b6756a397c1d3bf651c5d76df05af4 (diff)
downloadchromium_src-57691de83022b6acc4ba89a5366082972323b4cd.zip
chromium_src-57691de83022b6acc4ba89a5366082972323b4cd.tar.gz
chromium_src-57691de83022b6acc4ba89a5366082972323b4cd.tar.bz2
Make changes to the NaCl demos in prep for integrating them into developer.chrome.com:
* Style changes to make the content look more like said site. * Change the path to the css file to match said site so that pages may be duplicated with changing them. BUG= Review URL: https://codereview.chromium.org/844073002 Cr-Commit-Position: refs/heads/master@{#311322}
Diffstat (limited to 'native_client_sdk')
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/README3
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/bullet/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/css/out/icons.png (renamed from native_client_sdk/src/gonacl_appengine/static/styles/icons.png)bin19321 -> 19321 bytes
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/css/out/robot.png (renamed from native_client_sdk/src/gonacl_appengine/static/styles/robot.png)bin5396 -> 5396 bytes
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/css/out/site.css (renamed from native_client_sdk/src/gonacl_appengine/static/styles/style.css)8
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/css/out/wrench.png (renamed from native_client_sdk/src/gonacl_appengine/static/styles/wrench.png)bin6879 -> 6879 bytes
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/cube/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/earth/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/home/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/index.html4
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/life/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/lua/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/voronoi/index.html2
14 files changed, 17 insertions, 14 deletions
diff --git a/native_client_sdk/src/gonacl_appengine/static/README b/native_client_sdk/src/gonacl_appengine/static/README
new file mode 100644
index 0000000..6ca0ed5
--- /dev/null
+++ b/native_client_sdk/src/gonacl_appengine/static/README
@@ -0,0 +1,3 @@
+WHERE DID STYLE.CSS GO?
+
+The stylesheet for the demos was moved from static/style.css to css/out/site.css. This is so that the stylesheet path matches the one used on developer.chrome.com. This was done so that demo pages can be duplicated on that site without being edited. This also allows sharing of stylesheet rules between the two sites, which over time will bring the look of the sites closer together.
diff --git a/native_client_sdk/src/gonacl_appengine/static/bullet/index.html b/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
index 457a764..386b328 100644
--- a/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
@@ -11,7 +11,7 @@
<title>Bullet Physics</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link href="/static/css/out/site.css" rel="stylesheet">
<script type="text/javascript" src="NaClAM.js"></script>
diff --git a/native_client_sdk/src/gonacl_appengine/static/styles/icons.png b/native_client_sdk/src/gonacl_appengine/static/css/out/icons.png
index 13a6983..13a6983 100644
--- a/native_client_sdk/src/gonacl_appengine/static/styles/icons.png
+++ b/native_client_sdk/src/gonacl_appengine/static/css/out/icons.png
Binary files differ
diff --git a/native_client_sdk/src/gonacl_appengine/static/styles/robot.png b/native_client_sdk/src/gonacl_appengine/static/css/out/robot.png
index b16869c..b16869c 100644
--- a/native_client_sdk/src/gonacl_appengine/static/styles/robot.png
+++ b/native_client_sdk/src/gonacl_appengine/static/css/out/robot.png
Binary files differ
diff --git a/native_client_sdk/src/gonacl_appengine/static/styles/style.css b/native_client_sdk/src/gonacl_appengine/static/css/out/site.css
index 971028f..e5539c3 100644
--- a/native_client_sdk/src/gonacl_appengine/static/styles/style.css
+++ b/native_client_sdk/src/gonacl_appengine/static/css/out/site.css
@@ -15,7 +15,7 @@ html, body {
background: #FAFAFA;
font-family: 'Myriad Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
line-height: 1.35;
- color: #444;
+ color: #666;
}
body {
@@ -188,7 +188,7 @@ section iframe {
margin: 0;
font-family: 'Open Sans';
font-weight: 300;
- color: #666;
+ color: #000;
font-size: 62px;
letter-spacing: -0.05em;
}
@@ -234,7 +234,7 @@ section iframe {
}
.demo p {
- font-size: 20px;
+ font-size: 16px;
}
.demo a {
@@ -281,7 +281,7 @@ section iframe {
font-family: 'Open Sans';
font-weight: 700;
margin: 0 0 0.2em 0;
- color: #777;
+ color: #000;
letter-spacing: -0.06em;
}
diff --git a/native_client_sdk/src/gonacl_appengine/static/styles/wrench.png b/native_client_sdk/src/gonacl_appengine/static/css/out/wrench.png
index e31101c..e31101c 100644
--- a/native_client_sdk/src/gonacl_appengine/static/styles/wrench.png
+++ b/native_client_sdk/src/gonacl_appengine/static/css/out/wrench.png
Binary files differ
diff --git a/native_client_sdk/src/gonacl_appengine/static/cube/index.html b/native_client_sdk/src/gonacl_appengine/static/cube/index.html
index 909d8ed..51baa609 100644
--- a/native_client_sdk/src/gonacl_appengine/static/cube/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/cube/index.html
@@ -9,7 +9,7 @@ found in the LICENSE file.
<meta charset="UTF-8">
<title>Rotating Cube</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link href="/static/css/out/site.css" rel="stylesheet">
<script type="text/javascript" src="example.js"></script>
</head>
<body class="demo">
diff --git a/native_client_sdk/src/gonacl_appengine/static/earth/index.html b/native_client_sdk/src/gonacl_appengine/static/earth/index.html
index 7f5e505..83a7983 100644
--- a/native_client_sdk/src/gonacl_appengine/static/earth/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/earth/index.html
@@ -11,7 +11,7 @@
<title>Multi-Threaded Raycasted Earth</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link href="/static/css/out/site.css" rel="stylesheet">
<script type="text/javascript" src="example.js"></script>
diff --git a/native_client_sdk/src/gonacl_appengine/static/home/index.html b/native_client_sdk/src/gonacl_appengine/static/home/index.html
index fd2f252..07a30a2 100644
--- a/native_client_sdk/src/gonacl_appengine/static/home/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/home/index.html
@@ -11,7 +11,7 @@
<title>PNaCl Demos</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link href="/static/css/out/site.css" rel="stylesheet">
</head>
diff --git a/native_client_sdk/src/gonacl_appengine/static/index.html b/native_client_sdk/src/gonacl_appengine/static/index.html
index 9eea2ed..47a6487 100644
--- a/native_client_sdk/src/gonacl_appengine/static/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/index.html
@@ -8,8 +8,8 @@
<title>PNaCl Demos</title>
- <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
+ <link href="/static/css/out/site.css" rel="stylesheet">
</head>
<body>
<nav>
diff --git a/native_client_sdk/src/gonacl_appengine/static/life/index.html b/native_client_sdk/src/gonacl_appengine/static/life/index.html
index 7f2ca0a..6940f07 100644
--- a/native_client_sdk/src/gonacl_appengine/static/life/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/life/index.html
@@ -11,7 +11,7 @@
<title>The Game of Life</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link href="/static/css/out/site.css" rel="stylesheet">
<script type="text/javascript" src="example.js"></script>
diff --git a/native_client_sdk/src/gonacl_appengine/static/lua/index.html b/native_client_sdk/src/gonacl_appengine/static/lua/index.html
index 4bd8eb9..e77b0e5 100644
--- a/native_client_sdk/src/gonacl_appengine/static/lua/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/lua/index.html
@@ -11,7 +11,7 @@
<title>Lua Interpreter</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link href="/static/css/out/site.css" rel="stylesheet">
<script type="text/javascript" src="//storage.googleapis.com/gonacl/demos/publish/234230_dev/lua/hterm.concat.js"></script>
<script type="text/javascript" src="naclterm.js"></script>
diff --git a/native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html b/native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html
index 9067549..ecab175 100644
--- a/native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html
@@ -9,7 +9,7 @@ found in the LICENSE file.
<meta charset="UTF-8">
<title>SmoothLife</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link href="/static/css/out/site.css" rel="stylesheet">
<script type="text/javascript" src="example.js"></script>
</head>
<body class="demo">
diff --git a/native_client_sdk/src/gonacl_appengine/static/voronoi/index.html b/native_client_sdk/src/gonacl_appengine/static/voronoi/index.html
index f4fc599..4478e4b 100644
--- a/native_client_sdk/src/gonacl_appengine/static/voronoi/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/voronoi/index.html
@@ -11,7 +11,7 @@
<title>Voronoi</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
- <link href="/static/styles/style.css" rel="stylesheet">
+ <link href="/static/css/out/site.css" rel="stylesheet">
<script type="text/javascript" src="example.js"></script>