Skip to content

Same as #16, but with correct file permissions. (Not line endings.) #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Same as #16, but with correct file permissions. (Not line endings.) #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<library-path file="${LIBS_DIR}/as3corelib.swc" />
<library-path file="${LIBS_DIR}/blooddy_crypto.swc" />
<library-path file="${LIBS_DIR}/grabcut.swc" />

<library-path file="${FLEX_HOME}/frameworks/libs/framework.swc" />
<static-link-runtime-shared-libraries>true</static-link-runtime-shared-libraries>
<default-size width="800" height="600" />
Expand All @@ -42,12 +43,13 @@

<!-- Build for Flash Player 11.6 -->
<target name="compile-11.6" depends="info">
<mxmlc file="${SRC_DIR}/Scratch.as" output="${DEPLOY_DIR}/Scratch.swf"
<mxmlc file="${SRC_DIR}/Scratch.as" output="${DEPLOY_DIR}/Blue.swf"
target-player="11.6" swf-version="19" debug="false">
<source-path path-element="${SRC_DIR}" />
<library-path file="${LIBS_DIR}/as3corelib.swc" />
<library-path file="${LIBS_DIR}/blooddy_crypto.swc" />
<library-path file="${LIBS_DIR}/grabcut.swc" />

<library-path file="${FLEX_HOME}/frameworks/libs/framework.swc" />
<static-link-runtime-shared-libraries>true</static-link-runtime-shared-libraries>
<default-size width="800" height="600" />
Expand Down
Binary file modified build/11.6/Scratch.swf
View file
Open in desktop
Binary file not shown.
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion scratch.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def scratchFlashCommitID = getCommitID(commonDir)
println "Commit ID for scratch-flash is: ${scratchFlashCommitID}"

dependencies {
flexSDK group: 'org.apache', name: 'apache-flex-sdk', version: '4.10.0', ext: 'zip'
flexSDK group: 'org.apache', name: 'apache-flex-sdk', version: '4.14.0', ext: 'zip'
external group: 'macromedia.com', name: 'playerglobal', version: playerVersion.replace('.', '_'), ext: 'swc'
merged files(
"${commonDir}/libs/as3corelib.swc",
Expand Down
9 changes: 6 additions & 3 deletions src/CSS.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@ public class CSS {

// Colors
public static const white:int = 0xFFFFFF;
public static const grey100:int = 0xF5F5F5;
public static const grey50:int = 0xFAFAFA;
public static const backgroundColor_default:int = white;
public static const topBarColor_default:int = 0x9C9EA2;
public static const tabColor:int = 0xE6E8E8;
public static const panelColor:int = 0xF2F2F2;
public static const itemSelectedColor:int = 0xD0D0D0;
public static const borderColor:int = 0xD0D1D2;
public static const textColor:int = 0x5C5D5F; // 0x6C6D6F
public static const borderColor:int =0xF5F5F5;// 0xD0D1D2;
public static const seamColor:int=CSS.borderColor - 0x141414;
public static const textColor:int = 0x424242; // 0x6C6D6F
public static const buttonLabelColor:int = textColor;
public static const buttonLabelOverColor:int = 0xFBA939;
public static const offColor:int = 0x8F9193; // 0x9FA1A3
Expand All @@ -52,7 +55,7 @@ public class CSS {
public static const arrowColor:int = 0xA6A8AC;

// Fonts
public static const font:String = Resources.chooseFont(['Arial', 'Verdana', 'DejaVu Sans']);
public static const font:String = Resources.chooseFont(['NotoSans','Arial', 'Verdana', 'DejaVu Sans']);
public static const menuFontSize:int = 12;
public static const normalTextFormat:TextFormat = new TextFormat(font, 12, textColor);
public static const topBarButtonFormat:TextFormat = new TextFormat(font, 12, white, true);
Expand Down
Loading