Skip to content

Commit 23c815b

Browse files
Same as #16, but with correct file permissions. (Not line endings.)
FIXED VERSION
1 parent 102428b commit 23c815b

File tree

175 files changed

+35002
-228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+35002
-228
lines changed

build.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<library-path file="${LIBS_DIR}/as3corelib.swc" />
3333
<library-path file="${LIBS_DIR}/blooddy_crypto.swc" />
3434
<library-path file="${LIBS_DIR}/grabcut.swc" />
35+
3536
<library-path file="${FLEX_HOME}/frameworks/libs/framework.swc" />
3637
<static-link-runtime-shared-libraries>true</static-link-runtime-shared-libraries>
3738
<default-size width="800" height="600" />
@@ -42,12 +43,13 @@
4243

4344
<!-- Build for Flash Player 11.6 -->
4445
<target name="compile-11.6" depends="info">
45-
<mxmlc file="${SRC_DIR}/Scratch.as" output="${DEPLOY_DIR}/Scratch.swf"
46+
<mxmlc file="${SRC_DIR}/Scratch.as" output="${DEPLOY_DIR}/Blue.swf"
4647
target-player="11.6" swf-version="19" debug="false">
4748
<source-path path-element="${SRC_DIR}" />
4849
<library-path file="${LIBS_DIR}/as3corelib.swc" />
4950
<library-path file="${LIBS_DIR}/blooddy_crypto.swc" />
5051
<library-path file="${LIBS_DIR}/grabcut.swc" />
52+
5153
<library-path file="${FLEX_HOME}/frameworks/libs/framework.swc" />
5254
<static-link-runtime-shared-libraries>true</static-link-runtime-shared-libraries>
5355
<default-size width="800" height="600" />

build/11.6/Scratch.swf

380 KB
Binary file not shown.

gradlew

100644100755
File mode changed.

scratch.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def scratchFlashCommitID = getCommitID(commonDir)
4242
println "Commit ID for scratch-flash is: ${scratchFlashCommitID}"
4343

4444
dependencies {
45-
flexSDK group: 'org.apache', name: 'apache-flex-sdk', version: '4.10.0', ext: 'zip'
45+
flexSDK group: 'org.apache', name: 'apache-flex-sdk', version: '4.14.0', ext: 'zip'
4646
external group: 'macromedia.com', name: 'playerglobal', version: playerVersion.replace('.', '_'), ext: 'swc'
4747
merged files(
4848
"${commonDir}/libs/as3corelib.swc",

src/CSS.as

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@ public class CSS {
3737

3838
// Colors
3939
public static const white:int = 0xFFFFFF;
40+
public static const grey100:int = 0xF5F5F5;
41+
public static const grey50:int = 0xFAFAFA;
4042
public static const backgroundColor_default:int = white;
4143
public static const topBarColor_default:int = 0x9C9EA2;
4244
public static const tabColor:int = 0xE6E8E8;
4345
public static const panelColor:int = 0xF2F2F2;
4446
public static const itemSelectedColor:int = 0xD0D0D0;
45-
public static const borderColor:int = 0xD0D1D2;
46-
public static const textColor:int = 0x5C5D5F; // 0x6C6D6F
47+
public static const borderColor:int =0xF5F5F5;// 0xD0D1D2;
48+
public static const seamColor:int=CSS.borderColor - 0x141414;
49+
public static const textColor:int = 0x424242; // 0x6C6D6F
4750
public static const buttonLabelColor:int = textColor;
4851
public static const buttonLabelOverColor:int = 0xFBA939;
4952
public static const offColor:int = 0x8F9193; // 0x9FA1A3
@@ -52,7 +55,7 @@ public class CSS {
5255
public static const arrowColor:int = 0xA6A8AC;
5356

5457
// Fonts
55-
public static const font:String = Resources.chooseFont(['Arial', 'Verdana', 'DejaVu Sans']);
58+
public static const font:String = Resources.chooseFont(['NotoSans','Arial', 'Verdana', 'DejaVu Sans']);
5659
public static const menuFontSize:int = 12;
5760
public static const normalTextFormat:TextFormat = new TextFormat(font, 12, textColor);
5861
public static const topBarButtonFormat:TextFormat = new TextFormat(font, 12, white, true);

0 commit comments

Comments
 (0)