ソースを参照

Add a close button in the new layout dialog

master
Chris Smith 12年前
コミット
d3054284b4
4個のファイルの変更38行の追加15行の削除
  1. 18
    13
      index.html
  2. バイナリ
      res/images/close.png
  3. 2
    1
      res/js/viewer.js
  4. 18
    1
      res/style.css

+ 18
- 13
index.html ファイルの表示

@@ -37,24 +37,29 @@
37 37
   <div id="layoutcontainer" class="initiallyhidden">
38 38
    <div id="layoutmask" class="mask"></div>
39 39
    <div id="layoutpicker" class="dialog">
40
-    <h2>Select a level</h2>
40
+    <button id="layoutclose" class="close">Cancel</button>
41
+    <div class="container">
42
+     <h2>Select a level</h2>
43
+    </div>
41 44
    </div>
42 45
   </div>
43 46
   <div id="savecontainer" class="initiallyhidden">
44 47
    <div id="savemask" class="mask"></div>
45 48
    <div id="savedialog" class="dialog">
46
-    <div id="save_inprogress">
47
-     <h2 style="margin-bottom: 50px;">Saving...</h2>
48
-     <p style="margin-bottom: 50px;"><img src="res/images/loading.gif" alt="Loading indicator"></p>
49
-     <p id="save_error" class="initiallyhidden error"></p>
50
-    </div>
51
-    <div id="save_done" class="initiallyhidden">
52
-     <h2>Saved</h2>
53
-     <p>
54
-      Your layout has been saved.
55
-      Share this link:
56
-     </p>
57
-     <p id="link"></p>
49
+    <div class="container">
50
+     <div id="save_inprogress">
51
+      <h2 style="margin-bottom: 50px;">Saving...</h2>
52
+      <p style="margin-bottom: 50px;"><img src="res/images/loading.gif" alt="Loading indicator"></p>
53
+      <p id="save_error" class="initiallyhidden error"></p>
54
+     </div>
55
+     <div id="save_done" class="initiallyhidden">
56
+      <h2>Saved</h2>
57
+      <p>
58
+       Your layout has been saved.
59
+       Share this link:
60
+      </p>
61
+      <p id="link"></p>
62
+     </div>
58 63
     </div>
59 64
    </div>
60 65
   </div>

バイナリ
res/images/close.png ファイルの表示


+ 2
- 1
res/js/viewer.js ファイルの表示

@@ -150,7 +150,7 @@ $(function() {
150 150
     updateLayout({level: key + 1, towers:[]});
151 151
     closePicker();
152 152
    })
153
-   .appendTo($('#layoutpicker'));
153
+   .appendTo($('#layoutpicker .container'));
154 154
  });
155 155
 
156 156
  function showPicker() {
@@ -188,6 +188,7 @@ $(function() {
188 188
 
189 189
  $('#createlayout').click(showPicker);
190 190
  $('#layoutmask').click(closePicker);
191
+ $('#layoutclose').click(closePicker);
191 192
  $('#savelayout').click(saveLayout);
192 193
 
193 194
  function updateLayout(data) {

+ 18
- 1
res/style.css ファイルの表示

@@ -129,6 +129,10 @@ body .tower.ui-draggable-dragging { z-index: 101; }
129 129
  z-index: 201;
130 130
  overflow: auto;
131 131
  text-align: center;
132
+ padding: 0;
133
+}
134
+
135
+.dialog .container {
132 136
  padding: 50px;
133 137
 }
134 138
 
@@ -147,7 +151,7 @@ body .tower.ui-draggable-dragging { z-index: 101; }
147 151
  margin-left: -250px;
148 152
 }
149 153
 
150
-#layoutpicker button {
154
+#layoutpicker .container button {
151 155
  margin: 30px;
152 156
 }
153 157
 
@@ -169,3 +173,16 @@ body .tower.ui-draggable-dragging { z-index: 101; }
169 173
  color: red;
170 174
  font-weight: bold;
171 175
 }
176
+
177
+.dialog .close {
178
+ float: right;
179
+ margin: 0;
180
+ background: white url('images/close.png') no-repeat left center;
181
+ padding: 10px 10px 10px 25px;
182
+ border: 0;
183
+ cursor: pointer;
184
+}
185
+
186
+.dialog .close:hover {
187
+ text-decoration: underline;
188
+}

読み込み中…
キャンセル
保存