Download as
Browse Code »

Commit 00f61b5c22f6df7ee14e9d4e12328b331d4c6ca7

Authored by David Guilherme
1 parent 5e735657
Exists in master

Drafting the messagebox

Showing 3 changed files with 51 additions and 43 deletions   Show diff stats
Gulpfile.js
  Diff comments   View file @00f61b5
... ... @@ -6,7 +6,8 @@ var playerFiles = [
6 6 'window.html',
7 7 'TemplateData/*',
8 8 'Release/*',
9   - 'vendors/**/*'
  9 + 'vendors/**/*',
  10 + 'js/*'
10 11 ];
11 12  
12 13 gulp.task('chrome', function() {
... ...
player/TemplateData/style.css
  Diff comments   View file @00f61b5
1 1  
2 2 /****************************************
3   - ==== RESETS
  3 + ==== Player Styling
4 4 ****************************************/
5 5  
6 6 html,body,div,canvas { margin: 0; padding: 0; }
... ... @@ -10,10 +10,6 @@ html,body,div,canvas { margin: 0; padding: 0; }
10 10 .clear { display: inline-table; clear: both; }
11 11 /* Hides from IE-mac \*/ * html .clear { height: 1%; } .clear { display: block; } /* End hide from IE-mac */
12 12  
13   -/****************************************
14   - ==== LAYOUT
15   -****************************************/
16   -
17 13 html, body { width: 100%; height: 100%; font-family: Helvetica, Verdana, Arial, sans-serif; }
18 14 body { }
19 15 p.header, p.footer { display: none; }
... ... @@ -26,3 +22,43 @@ div.title { height: 38px; line-height: 38px; padding: 0 10px; margin: 0 1px 0 0;
26 22 body.template { }
27 23 .template .template-wrap { }
28 24 .template .template-wrap canvas { }
  25 +
  26 +/****************************************
  27 + ==== Overriding
  28 +****************************************/
  29 +html, #canvas, .template, .template-wrap {
  30 + width: 100%;
  31 + height: 100%;
  32 + margin: 0;
  33 + overflow: hidden;
  34 +}
  35 +
  36 +#loading-screen {
  37 + position: absolute;
  38 + top: 0;
  39 + left: 0;
  40 + display: none;
  41 + width: 100%;
  42 + height: 100%;
  43 + z-index: 9999;
  44 +}
  45 +
  46 +.message {
  47 + position: fixed;
  48 + top: 0;
  49 + left: 0;
  50 + width: 100%;
  51 + padding: 1em 0.5em;
  52 +}
  53 +
  54 +.message .info {
  55 + background-color: #3b8bba;
  56 +}
  57 +
  58 +.message .hidden {
  59 + display: none;
  60 +}
  61 +
  62 +.message .warning {
  63 + background-color: #f08a24;
  64 +}
29 65 \ No newline at end of file
... ...
player/window.html
  Diff comments   View file @00f61b5
... ... @@ -9,49 +9,20 @@
9 9 <script src="TemplateData/UnityProgress.js"></script>
10 10  
11 11 <script src="vendors/qdclient/qdclient.js"></script>
12   - <script src="../main.js"></script>
13   -
14   - <style type="text/css">
15   - html, #canvas, .template, .template-wrap {
16   - width: 100%;
17   - height: 100%;
18   - margin: 0;
19   - overflow: hidden;
20   - }
21   -
22   - #loading-screen span {
23   - position: absolute;
24   - top: 5px;
25   - right: 40px;
26   - padding: 15px 10px;
27   - background: #000;
28   - color: #FFF;
  12 + <script src="js/message.js"></script>
  13 + <script src="js/loading.js"></script>
29 14  
30   - font-size: 1.2em;
31   - -webkit-border-radius: 20px;
32   - -moz-border-radius: 20px;
33   - border-radius: 20px;
34   - }
35   -
36   - #loading-screen {
37   - position: absolute;
38   - top: 0;
39   - left: 0;
40   - display: none;
41   - width: 100%;
42   - height: 100%;
43   - z-index: 9999;
44   - }
45   - </style>
  15 + <script src="../main.js"></script>
46 16 </head>
47 17 <body class="template">
48   - <div id="loading-screen"><span>Carregando...</span></div>
  18 + <div id="message"></div>
  19 + <div id="loading-screen"></div>
49 20 <div class="template-wrap clear">
50 21 <canvas class="emscripten" id="canvas"></canvas>
51 22 </div>
52 23 <script src="connect.js"></script>
53   -<script src="Release/UnityConfig.js"></script>
54   -<script src="Release/fileloader.js"></script>
55   -<script src="load.js"></script>
  24 + <script src="Release/UnityConfig.js"></script>
  25 + <script src="Release/fileloader.js"></script>
  26 + <script src="load.js"></script>
56 27 </body>
57 28 </html>
... ...