Changeset bafff7e in orbit for iOS

Timestamp:

08/29/13 03:06:50 (6 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo, Tab_Interface, pyramid

Children:

4a56cfb

Parents:

b9c0cef

Message:

Tutorial:

• updated icon set
• added simulated attention bar to main page
• button colors set

Location:

iOS/Orbit

Files:

• .DS_Store (modified) (previous)
• orbit.xcodeproj/project.pbxproj (modified) (4 diffs)
• orbit.xcodeproj/project.xcworkspace/xcuserdata/sc.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)
• tutorial/.DS_Store (modified) (previous)
• tutorial/images/welcome-icons.png (added)
• tutorial/index.html (modified) (1 diff)
• tutorial/style.css (modified) (2 diffs)

iOS/Orbit/orbit.xcodeproj/project.pbxproj

@@ -56 +56 @@
                 5270752F17CE777300476875 /* step08-3.html in Resources */ = {isa = PBXBuildFile; fileRef = 5270752D17CE777200476875 /* step08-3.html */; };
                 5270753017CE777300476875 /* step08-5.html in Resources */ = {isa = PBXBuildFile; fileRef = 5270752E17CE777300476875 /* step08-5.html */; };
+                5270753217CEB76300476875 /* welcome-icons.png in Resources */ = {isa = PBXBuildFile; fileRef = 5270753117CEB76300476875 /* welcome-icons.png */; };
                 5286861517CAA8E800956FA9 /* step05-2.html in Resources */ = {isa = PBXBuildFile; fileRef = 5286861417CAA8E800956FA9 /* step05-2.html */; };
                 5286861B17CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */; };
@@ -168 +169 @@
                 5270752D17CE777200476875 /* step08-3.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step08-3.html"; path = "tutorial/step08-3.html"; sourceTree = "<group>"; };
                 5270752E17CE777300476875 /* step08-5.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step08-5.html"; path = "tutorial/step08-5.html"; sourceTree = "<group>"; };
+                5270753117CEB76300476875 /* welcome-icons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "welcome-icons.png"; path = "tutorial/images/welcome-icons.png"; sourceTree = "<group>"; };
                 5286861417CAA8E800956FA9 /* step05-2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step05-2.html"; path = "tutorial/step05-2.html"; sourceTree = "<group>"; };
                 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tutorial-02-charging-usb-lit.jpg"; sourceTree = "<group>"; };
@@ -459 +461 @@
                                 2843FE871790205900C79D56 /* status_4.png */,
                                 2843FE881790205900C79D56 /* status_4@2x.png */,
+                                5270753117CEB76300476875 /* welcome-icons.png */,
                         );
                         name = Images;
@@ -704 +707 @@
                                 5270752F17CE777300476875 /* step08-3.html in Resources */,
                                 5270753017CE777300476875 /* step08-5.html in Resources */,
+                                5270753217CEB76300476875 /* welcome-icons.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

iOS/Orbit/tutorial/index.html

@@ -13 +13 @@
          
       Welcome to Puzzlebox Orbit
-      
-      <p><img src="status_0@2x.png" height="160"><p>
+
+      <p><img src="welcome-icons.png" width="100%"><p>
+            
+      <p><img src="tutorial-08-meters-attention.gif" width="100%"><p>
          
       <p>Press the arrow button to begin the tutorial</p>

iOS/Orbit/tutorial/style.css

@@ -4 +4 @@
     font-size: 1.6em;
     color: #000;
+    background-color:#aeaeae;
     font-weight: bold;
     text-decoration: none;
@@ -17 +18 @@
     font-size: 1.6em;
     color: #000;
+    background-color:#eaeaea;
     font-weight: bold;
     text-decoration: none;