Permalink
Browse files

modify label position, label color, label style

  • Loading branch information...
1 parent c1d198c commit 89e636fef8be41a5e60c5cc55e16c0a62ba04f7b @vestige committed Oct 10, 2012
Showing with 51,611 additions and 1,672 deletions.
  1. +17 −16 Resources/app.js
  2. +17 −16 build/mobileweb/app.js
  3. +17,894 −457 build/mobileweb/index.html
  4. +594 −1 build/mobileweb/titanium.css
  5. +17,299 −456 build/mobileweb/titanium.js
  6. +419 −12 build/mobileweb/titanium/Ti.js
  7. +43 −2 build/mobileweb/titanium/Ti/API.js
  8. +34 −1 build/mobileweb/titanium/Ti/Accelerometer.js
  9. +35 −1 build/mobileweb/titanium/Ti/Analytics.js
  10. +26 −1 build/mobileweb/titanium/Ti/App.js
  11. +85 −2 build/mobileweb/titanium/Ti/App/Properties.js
  12. +50 −2 build/mobileweb/titanium/Ti/Blob.js
  13. +5 −1 build/mobileweb/titanium/Ti/BlobStream.js
  14. +98 −3 build/mobileweb/titanium/Ti/Buffer.js
  15. +5 −1 build/mobileweb/titanium/Ti/BufferStream.js
  16. +68 −3 build/mobileweb/titanium/Ti/Codec.js
  17. +208 −5 build/mobileweb/titanium/Ti/Facebook.js
  18. +66 −3 build/mobileweb/titanium/Ti/Facebook/LoginButton.js
  19. +88 −3 build/mobileweb/titanium/Ti/Filesystem.js
  20. +7 −1 build/mobileweb/titanium/Ti/Filesystem/File.js
  21. +5 −1 build/mobileweb/titanium/Ti/Filesystem/FileStream.js
  22. +219 −5 build/mobileweb/titanium/Ti/Geolocation.js
  23. +92 −3 build/mobileweb/titanium/Ti/Gesture.js
  24. +47 −2 build/mobileweb/titanium/Ti/IOStream.js
  25. +82 −3 build/mobileweb/titanium/Ti/Locale.js
  26. +27 −1 build/mobileweb/titanium/Ti/Map.js
  27. +51 −2 build/mobileweb/titanium/Ti/Map/Annotation.js
  28. +7 −1 build/mobileweb/titanium/Ti/Map/View.js
  29. +58 −2 build/mobileweb/titanium/Ti/Media.js
  30. +6 −1 build/mobileweb/titanium/Ti/Media/AudioPlayer.js
  31. +6 −1 build/mobileweb/titanium/Ti/Media/Sound.js
  32. +301 −11 build/mobileweb/titanium/Ti/Media/VideoPlayer.js
  33. +82 −3 build/mobileweb/titanium/Ti/Network.js
  34. +176 −7 build/mobileweb/titanium/Ti/Network/HTTPClient.js
  35. +115 −4 build/mobileweb/titanium/Ti/Platform.js
  36. +27 −1 build/mobileweb/titanium/Ti/Platform/DisplayCaps.js
  37. +393 −12 build/mobileweb/titanium/Ti/UI.js
  38. +96 −3 build/mobileweb/titanium/Ti/UI/2DMatrix.js
  39. +156 −5 build/mobileweb/titanium/Ti/UI/ActivityIndicator.js
  40. +12 −1 build/mobileweb/titanium/Ti/UI/ActivityIndicatorStyle.js
  41. +111 −3 build/mobileweb/titanium/Ti/UI/AlertDialog.js
  42. +36 −1 build/mobileweb/titanium/Ti/UI/Animation.js
  43. +151 −6 build/mobileweb/titanium/Ti/UI/Button.js
  44. +69 −2 build/mobileweb/titanium/Ti/UI/Clipboard.js
  45. +58 −2 build/mobileweb/titanium/Ti/UI/EmailDialog.js
  46. +259 −7 build/mobileweb/titanium/Ti/UI/ImageView.js
  47. +155 −5 build/mobileweb/titanium/Ti/UI/Label.js
  48. +10 −1 build/mobileweb/titanium/Ti/UI/MobileWeb.js
  49. +227 −7 build/mobileweb/titanium/Ti/UI/MobileWeb/NavigationGroup.js
  50. +10 −1 build/mobileweb/titanium/Ti/UI/MobileWeb/TableViewSeparatorStyle.js
  51. +102 −3 build/mobileweb/titanium/Ti/UI/OptionDialog.js
  52. +279 −8 build/mobileweb/titanium/Ti/UI/Picker.js
  53. +305 −9 build/mobileweb/titanium/Ti/UI/PickerColumn.js
  54. +24 −1 build/mobileweb/titanium/Ti/UI/PickerRow.js
  55. +117 −4 build/mobileweb/titanium/Ti/UI/ProgressBar.js
  56. +179 −5 build/mobileweb/titanium/Ti/UI/ScrollView.js
  57. +390 −11 build/mobileweb/titanium/Ti/UI/ScrollableView.js
  58. +141 −5 build/mobileweb/titanium/Ti/UI/Slider.js
  59. +172 −6 build/mobileweb/titanium/Ti/UI/Switch.js
  60. +126 −4 build/mobileweb/titanium/Ti/UI/Tab.js
  61. +342 −9 build/mobileweb/titanium/Ti/UI/TabGroup.js
  62. +384 −12 build/mobileweb/titanium/Ti/UI/TableView.js
  63. +163 −5 build/mobileweb/titanium/Ti/UI/TableViewRow.js
  64. +205 −7 build/mobileweb/titanium/Ti/UI/TableViewSection.js
  65. +40 −2 build/mobileweb/titanium/Ti/UI/TextArea.js
  66. +131 −4 build/mobileweb/titanium/Ti/UI/TextField.js
  67. +83 −2 build/mobileweb/titanium/Ti/UI/View.js
  68. +247 −7 build/mobileweb/titanium/Ti/UI/WebView.js
  69. +96 −3 build/mobileweb/titanium/Ti/UI/Window.js
  70. +302 −12 build/mobileweb/titanium/Ti/Utils.js
  71. +64 −3 build/mobileweb/titanium/Ti/XML.js
  72. +27 −1 build/mobileweb/titanium/Ti/Yahoo.js
  73. +47 −2 build/mobileweb/titanium/Ti/_.js
  74. +65 −2 build/mobileweb/titanium/Ti/_/Evented.js
  75. +523 −16 build/mobileweb/titanium/Ti/_/Filesystem/Local.js
  76. +70 −3 build/mobileweb/titanium/Ti/_/Gestures/DoubleTap.js
  77. +81 −4 build/mobileweb/titanium/Ti/_/Gestures/Dragging.js
  78. +70 −2 build/mobileweb/titanium/Ti/_/Gestures/GestureRecognizer.js
  79. +59 −3 build/mobileweb/titanium/Ti/_/Gestures/LongPress.js
  80. +101 −4 build/mobileweb/titanium/Ti/_/Gestures/Pinch.js
  81. +61 −2 build/mobileweb/titanium/Ti/_/Gestures/SingleTap.js
  82. +77 −3 build/mobileweb/titanium/Ti/_/Gestures/Swipe.js
  83. +21 −1 build/mobileweb/titanium/Ti/_/Gestures/TouchCancel.js
  84. +25 −1 build/mobileweb/titanium/Ti/_/Gestures/TouchEnd.js
  85. +25 −1 build/mobileweb/titanium/Ti/_/Gestures/TouchMove.js
  86. +25 −1 build/mobileweb/titanium/Ti/_/Gestures/TouchStart.js
  87. +133 −6 build/mobileweb/titanium/Ti/_/Gestures/TwoFingerTap.js
  88. +15 −1 build/mobileweb/titanium/Ti/_/Layouts.js
  89. +94 −4 build/mobileweb/titanium/Ti/_/Layouts/Base.js
  90. +447 −11 build/mobileweb/titanium/Ti/_/Layouts/Composite.js
  91. +432 −11 build/mobileweb/titanium/Ti/_/Layouts/ConstrainingHorizontal.js
  92. +433 −11 build/mobileweb/titanium/Ti/_/Layouts/ConstrainingVertical.js
  93. +389 −10 build/mobileweb/titanium/Ti/_/Layouts/Horizontal.js
  94. +369 −9 build/mobileweb/titanium/Ti/_/Layouts/Vertical.js
  95. +442 −16 build/mobileweb/titanium/Ti/_/Map/Google.js
  96. +101 −3 build/mobileweb/titanium/Ti/_/Promise.js
  97. +977 −27 build/mobileweb/titanium/Ti/_/UI/Element.js
  98. +90 −3 build/mobileweb/titanium/Ti/_/UI/FontWidget.js
  99. +446 −15 build/mobileweb/titanium/Ti/_/UI/KineticScrollView.js
  100. +62 −2 build/mobileweb/titanium/Ti/_/UI/SuperView.js
  101. +147 −4 build/mobileweb/titanium/Ti/_/UI/TextBox.js
  102. +28 −1 build/mobileweb/titanium/Ti/_/UI/WebViewBridge.js
  103. +6 −1 build/mobileweb/titanium/Ti/_/UI/Widget.js
  104. +175 −5 build/mobileweb/titanium/Ti/_/analytics.js
  105. +6 −1 build/mobileweb/titanium/Ti/_/browser.js
  106. +32 −1 build/mobileweb/titanium/Ti/_/css.js
  107. +299 −6 build/mobileweb/titanium/Ti/_/declare.js
  108. +160 −4 build/mobileweb/titanium/Ti/_/dom.js
  109. +62 −2 build/mobileweb/titanium/Ti/_/encoding.js
  110. +18 −1 build/mobileweb/titanium/Ti/_/event.js
  111. +55 −1 build/mobileweb/titanium/Ti/_/has.js
  112. +17 −1 build/mobileweb/titanium/Ti/_/image.js
  113. +54 −2 build/mobileweb/titanium/Ti/_/include.js
  114. +202 −6 build/mobileweb/titanium/Ti/_/lang.js
  115. +64 −2 build/mobileweb/titanium/Ti/_/ready.js
  116. +361 −10 build/mobileweb/titanium/Ti/_/string.js
  117. +74 −2 build/mobileweb/titanium/Ti/_/style.js
  118. +33 −1 build/mobileweb/titanium/Ti/_/text.js
  119. +117 −233 build/mobileweb/titanium/filesystem.registry
View
@@ -1,7 +1,7 @@
Titanium.UI.setBackgroundColor('#000');
WebFontConfig = {
- google: { families: [ 'Montserrat+Subrayada::latin', 'Ewert::latin'] }
+ google: { families: [ 'Expletus+Sans::latin'] }
};
(function() {
var wf = document.createElement('script');
@@ -26,7 +26,7 @@ var caption = Ti.UI.createLabel({
textAlign: 'center',
color: '#ddd',
width: '100%',
- font:{fontSize: '100%', fontFamily: 'Montserrat Subrayada'},
+ font:{fontSize: '100%', fontFamily: 'Expletus Sans'},
})
var contents = Ti.UI.createView({
@@ -35,18 +35,18 @@ var contents = Ti.UI.createView({
layout: 'vertical',
});
-var qa = Ti.UI.createLabel({
- text: '',
- color: 'white',
- top: 10,
- font:{fontSize: '70%', fontFamily:'Ewert'},
-});
-
var count = Ti.UI.createLabel({
text: '00:00',
- color: '#444',
- top: 30,
- font:{fontSize: '250%', fontFamily: 'sans-serif'},
+ color: '#99ff99',
+ top: 80,
+ font:{fontSize: '250%'},
+});
+
+var qa = Ti.UI.createLabel({
+ text: ' ',
+ color: 'white',
+ top: 5,
+ font:{fontSize: '70%', fontFamily:'Expletus Sans'},
});
var footer = Ti.UI.createView({
@@ -107,7 +107,7 @@ function update () {
counting -= 1;
if (counting < 0) {
qa.color = '#FFFF00';
- qa.font = {fontSize: '100%', fontFamily:'Ewert'};
+ qa.font = {fontSize: '120%', fontFamily: 'Expletus Sans'};
qa.text = 'Finish!';
count.text = "88888888";
stop.fireEvent('click');
@@ -139,9 +139,10 @@ function timerClear(){
counting = 15 * 60;
}
remain = 5 * 60;
-
+
count.text = date_format(counting);
- qa.text = '';
+ qa.text = ' ';
+ qa.font = {fontSize: '70%', fontFamily: 'Expletus Sans'};
contents.backgroundColor = '#000';
pause = 0;
};
@@ -167,8 +168,8 @@ stop.addEventListener('click', function () {
});
top.add(caption);
-contents.add(qa);
contents.add(count);
+contents.add(qa);
toolview.add(start);
toolview.add(stop);
View
@@ -1,7 +1,7 @@
Titanium.UI.setBackgroundColor('#000');
WebFontConfig = {
- google: { families: [ 'Montserrat+Subrayada::latin', 'Ewert::latin'] }
+ google: { families: [ 'Expletus+Sans::latin'] }
};
(function() {
var wf = document.createElement('script');
@@ -26,7 +26,7 @@ var caption = Ti.UI.createLabel({
textAlign: 'center',
color: '#ddd',
width: '100%',
- font:{fontSize: '100%', fontFamily: 'Montserrat Subrayada'},
+ font:{fontSize: '100%', fontFamily: 'Expletus Sans'},
})
var contents = Ti.UI.createView({
@@ -35,18 +35,18 @@ var contents = Ti.UI.createView({
layout: 'vertical',
});
-var qa = Ti.UI.createLabel({
- text: '',
- color: 'white',
- top: 10,
- font:{fontSize: '70%', fontFamily:'Ewert'},
-});
-
var count = Ti.UI.createLabel({
text: '00:00',
- color: '#444',
- top: 30,
- font:{fontSize: '250%', fontFamily: 'sans-serif'},
+ color: '#99ff99',
+ top: 80,
+ font:{fontSize: '250%'},
+});
+
+var qa = Ti.UI.createLabel({
+ text: ' ',
+ color: 'white',
+ top: 5,
+ font:{fontSize: '70%', fontFamily:'Expletus Sans'},
});
var footer = Ti.UI.createView({
@@ -107,7 +107,7 @@ function update () {
counting -= 1;
if (counting < 0) {
qa.color = '#FFFF00';
- qa.font = {fontSize: '100%', fontFamily:'Ewert'};
+ qa.font = {fontSize: '120%', fontFamily: 'Expletus Sans'};
qa.text = 'Finish!';
count.text = "88888888";
stop.fireEvent('click');
@@ -139,9 +139,10 @@ function timerClear(){
counting = 15 * 60;
}
remain = 5 * 60;
-
+
count.text = date_format(counting);
- qa.text = '';
+ qa.text = ' ';
+ qa.font = {fontSize: '70%', fontFamily: 'Expletus Sans'};
contents.backgroundColor = '#000';
pause = 0;
};
@@ -167,8 +168,8 @@ stop.addEventListener('click', function () {
});
top.add(caption);
-contents.add(qa);
contents.add(count);
+contents.add(qa);
toolview.add(start);
toolview.add(stop);
View

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 89e636f

Please sign in to comment.