Permalink
Browse files

Merge branch 'master' of github.com:dongkang/Dot

  • Loading branch information...
2 parents 6ab6b30 + 5be50da commit 708ce276c3d1ff10aa5479a4929a26cde0817188 @chorr chorr committed Feb 19, 2012
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -8,28 +8,26 @@
</head>
<body>
<div class="menu menu-top">
- <div class="ico-pen item"></div>
- <div class="ico-pen item"></div>
- <div class="ico-pen item"></div>
- <div class="ico-pen item"></div>
- <div class="ico-pen item"></div>
- <div class="ico-pen item"></div>
- <div class="ico-pen item"></div>
-</div>
-<div class="stage">
- <canvas></canvas>
+ <div class="ico-minus item"></div>
+ <div class="item item-slider"></div>
+ <div class="ico-plus item"></div>
+ <div class="item item-spacer"></div>
+ <div class="item item-spacer"></div>
+ <div class="ico-config item"></div>
</div>
+<div class="stage"></div>
<div class="menu menu-bottom">
- <div class="ico-pen item item-selected"></div>
+ <div class="ico-pen item" style="display:none;"></div>
<div class="ico-move item"></div>
<div class="ico-color item"><span><span style="background-color:#fff;"></span></span></div>
+ <div class="item item-spacer"></div>
<div class="ico-undo item"></div>
<div class="ico-redo item"></div>
+ <div class="item item-spacer"></div>
<div class="ico-clear item"></div>
- <div class="ico-save item"></div>
<div class="ico-export item"></div>
</div>
-<div class="menu menu-bottom">
+<div class="menu menu-bottom" style="display:none;">
<div class="ico-color item"><span><span style="background-color:#fff;"></span></span></div>
<div class="ico-color item"><span><span style="background-color:#fff;"></span></span></div>
<div class="ico-color item"><span><span style="background-color:#fff;"></span></span></div>
@@ -39,16 +37,10 @@
<div class="ico-color item"><span><span style="background-color:#fff;"></span></span></div>
<div class="ico-color item"><span><span style="background-color:#fff;"></span></span></div>
</div>
-
<script src="./lib/jquery.js" type="text/javascript"></script>
<script src="./lib/underscore.js" type="text/javascript"></script>
<script src="./lib/backbone.js" type="text/javascript"></script>
<script src="./static/dot.app.js" type="text/javascript"></script>
<script src="./static/dot.canvas.js" type="text/javascript"></script>
-<script type="text/javascript">
-$(document).ready(function(){
- window.dot.initialize();
-});
-</script>
</body>
</html>
View
@@ -5,9 +5,14 @@ html{color:#000;background:#FFF}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre
.ico-clear {background:url('../images/btn_clear.png') no-repeat center center;}
+.ico-cloud {background:url('../images/btn_cloud.png') no-repeat center center;}
+.ico-config {background:url('../images/btn_config.png') no-repeat center center;}
.ico-export {background:url('../images/btn_export.png') no-repeat center center;}
+.ico-eye {background:url('../images/btn_eye.png') no-repeat center center;}
+.ico-minus {background:url('../images/btn_minus.png') no-repeat center center;}
.ico-move {background:url('../images/btn_move.png') no-repeat center center;}
.ico-pen {background:url('../images/btn_pen.png') no-repeat center center;}
+.ico-plus {background:url('../images/btn_plus.png') no-repeat center center;}
.ico-redo {background:url('../images/btn_redo.png') no-repeat center center;}
.ico-save {background:url('../images/btn_save.png') no-repeat center center;}
.ico-undo {background:url('../images/btn_undo.png') no-repeat center center;}
@@ -22,27 +27,55 @@ html{color:#000;background:#FFF}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre
.menu-bottom {border-top:1px solid #abaca7;}
.item {display:inline-block;overflow:hidden;width:85px;height:85px;cursor:pointer;}
.item-selected {background-color:#b8b9b3;}
+.item-spacer {width:42px;cursor:default;}
+.item-slider {width:255px;}
/* low resolution phone */
@media
only screen and (min-device-width : 320px) and (max-device-width : 480px) {
-.ico-clear, .ico-export, .ico-move, .ico-pen, .ico-redo, .ico-save, .ico-undo {background-size:16px 16px}
+.ico-clear {background-size:16px 16px;}
+.ico-cloud {background-size:16px 16px;}
+.ico-config {background-size:16px 16px;}
+.ico-export {background-size:16px 16px;}
+.ico-eye {background-size:16px 12px;}
+.ico-minus {background-size:16px 4px;}
+.ico-move {background-size:16px 16px;}
+.ico-pen {background-size:16px 16px;}
+.ico-plus {background-size:16px 16px;}
+.ico-redo {background-size:16px 16px;}
+.ico-save {background-size:16px 16px;}
+.ico-undo {background-size:16px 16px;}
.ico-color span {left:13px;top:13px;width:16px;height:16px;}
.ico-color span span {left:2px;top:2px;width:12px;height:12px;}
.menu {height:42px;padding:0 11px;}
.item {width:42px;height:42px;}
+.item-spacer {width:21px;}
+.item-slider {width:126px;}
}
/* high resolution phone */
@media
only screen and (-webkit-min-device-pixel-ratio : 1.5),
only screen and (min-device-pixel-ratio : 1.5) {
-.ico-clear, .ico-export, .ico-move, .ico-pen, .ico-redo, .ico-save, .ico-undo {background-size:24px 24px}
-.ico-color span {left:19px;top:19px;width:24px;height:24px;}
-.ico-color span span {left:3px;top:3px;width:18px;height:18px;}
-.menu {height:63px;padding:0 16px;}
-.item {width:63px;height:63px;}
+.ico-clear {background-size:16px 16px;}
+.ico-cloud {background-size:16px 16px;}
+.ico-config {background-size:16px 16px;}
+.ico-export {background-size:16px 16px;}
+.ico-eye {background-size:16px 12px;}
+.ico-minus {background-size:16px 4px;}
+.ico-move {background-size:16px 16px;}
+.ico-pen {background-size:16px 16px;}
+.ico-plus {background-size:16px 16px;}
+.ico-redo {background-size:16px 16px;}
+.ico-save {background-size:16px 16px;}
+.ico-undo {background-size:16px 16px;}
+.ico-color span {left:13px;top:13px;width:16px;height:16px;}
+.ico-color span span {left:2px;top:2px;width:12px;height:12px;}
+.menu {height:42px;padding:0 11px;}
+.item {width:42px;height:42px;}
+.item-spacer {width:21px;}
+.item-slider {width:126px;}
}
/* pad */

0 comments on commit 708ce27

Please sign in to comment.