Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
c4e4caa
Added new image assets for game submission
yangshun Mar 22, 2014
47f41dc
Realigned required labels
yangshun Mar 22, 2014
b674dfd
HTML for Video preview section done
yangshun Mar 22, 2014
c7adae5
Load video iframe upon blur of video URL
yangshun Mar 22, 2014
bb2b7ec
Clean up video submission
yangshun Mar 22, 2014
045cb7f
Icons HTML for upload done
yangshun Mar 22, 2014
fa2999f
Screenshots HTML for upload done
yangshun Mar 22, 2014
65a1965
Handle deletion of icon
yangshun Mar 22, 2014
d3fe8ac
Fixed CSS bug with video iframes being hidden upon load
yangshun Mar 22, 2014
4df31a5
Remove redundant HTML for screenshots
yangshun Mar 22, 2014
d969667
Drag and drop upload works for icon-128
yangshun Mar 23, 2014
8d5e6d1
File upload enabled for screenshots
yangshun Mar 24, 2014
b7cd961
Show add button for screenshots
yangshun Mar 24, 2014
35a2f6e
Use macro to render screenshots
yangshun Mar 24, 2014
ecd20ac
Fixed bug with modification of existing screenshots
yangshun Mar 24, 2014
63ca8b2
Able to delete screenshots
yangshun Mar 24, 2014
564afae
Changed button type to button
yangshun Mar 25, 2014
0d1d7fa
Wrapped media icons in media-list tag
yangshun Mar 25, 2014
517cb9a
CRUD for screenshots done
yangshun Mar 25, 2014
912005d
Existing icons will be shown upon game load
yangshun Mar 25, 2014
d46d03a
Added crosshatch background for media-previews
yangshun Mar 25, 2014
73004d1
Refactored media CSS and HTML
yangshun Mar 26, 2014
00c2611
Made 16:9 screenshot column consistent with 4:3
yangshun Mar 27, 2014
8ed9479
Site style improvements
yangshun Mar 28, 2014
f3ebe40
Fixed bug with video preview
yangshun Apr 4, 2014
8962f4e
Cache the $this variable in event listeners
yangshun Apr 6, 2014
4072d02
Fixed merge conflict remnants
yangshun Apr 18, 2014
f29ee4f
Reposition "Required" label for Number of Players
yangshun Apr 19, 2014
d7a58af
Use video-utils in game submission
yangshun Apr 20, 2014
6005cbc
Update game detail page to show screenshots of the new format
yangshun Apr 21, 2014
9a54633
Game form renders both resolutions of screenshots
yangshun Apr 21, 2014
360f51b
Resize for 16:9 done
yangshun Apr 21, 2014
213b7a0
Load Vimeo thumbnails
yangshun Apr 21, 2014
477f1cb
Removed legacy code
yangshun Apr 21, 2014
3e11614
Drag and drop does not affect video preview container
yangshun Apr 21, 2014
5925936
Made media-input event listeners more readable
yangshun Apr 21, 2014
498666b
Apply drag hover style on icon
yangshun Apr 21, 2014
102f7b6
Can submit media
yangshun Apr 21, 2014
f6b9fcd
Change <br/> to <br> in multiple descriptions
birkanu May 6, 2014
3a94835
Add missing ']' to the selector
birkanu May 6, 2014
9676594
Add missing = sign to the if statement. Use cached .
birkanu May 6, 2014
b8a7880
Use forEach instead of for loop. Remove checking if files[0] exists
birkanu May 6, 2014
deebe26
Change mediaPreviewBackgroundColor hex
birkanu May 6, 2014
c435ae0
Simplify background size
birkanu May 6, 2014
d159d44
Remove implied repeat
birkanu May 6, 2014
f44f8f2
Fix fry
birkanu May 6, 2014
eb0facd
Missing closing ] for input video selector
yangshun May 7, 2014
01648e6
Revert "Use forEach instead of for loop. Remove checking if files[0] …
yangshun May 7, 2014
112cfa0
Refactor use of flex grid for icons
yangshun May 7, 2014
ec9efdf
Changed css display to inherit
yangshun May 7, 2014
c59f8b3
Add comment for cross symbol
yangshun May 7, 2014
f7a9f6b
Shifted video util URLs into settings file
yangshun May 8, 2014
fd17b72
Modified site's main css margin
yangshun May 8, 2014
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
13 changes: 8 additions & 5 deletions src/media/css/forms.styl
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,11 @@ label {
}

::-webkit-input-placeholder {
color: $gray;
color: $colorGrayLightest;
}

:-moz-placeholder {
color: $gray;
color: $colorGrayLightest;
text-overflow: ellipsis; // Firefox 18 and below
}

Expand Down Expand Up @@ -336,7 +336,7 @@ form {
margin-top: 15px;
}
textarea[name=description].focused + .toggle-preview-container {
display: initial;
display: inherit;
}
.toggle-preview-container {
background-color: rgba(0,255,0,0.25);
Expand Down Expand Up @@ -386,7 +386,8 @@ form {
color: #999;
}
.grid > .grid-flex-grow-two {
padding-right: 50px;
margin-right: 50px;
position: relative;
}
input.large ~ .req:after {
bottom: 10px;
Expand Down Expand Up @@ -423,7 +424,9 @@ form {
}

.l {
font-size: 10px;
color: $colorGray;
font-size: 12px;
margin-bottom: 5px;
}
[placeholder] {
~ .l {
Expand Down
7 changes: 0 additions & 7 deletions src/media/css/friends.styl
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
@import 'lib';

[data-page-type~="leaf"] .page {
h1 {
color: $flamin-hot-cheetos-orange;
line-height: 1;
}
}

[data-page-type~="profile"] .page {
h1 .avatar {
margin-right: 10px;
Expand Down
253 changes: 224 additions & 29 deletions src/media/css/media.styl
Original file line number Diff line number Diff line change
@@ -1,44 +1,239 @@
@import 'lib';

.media-preview {
cursor: pointer;
display: block;
.media {
.form-help {
margin-bottom: 5px;
margin-right: 50px;
}
.req:after {
bottom: auto;
top: 5px;
}
.media-left,
.media-right {
padding-right: 80px;
}
.media-size {
border: 1px solid $colorGrayLightest;
border-radius: 2px;
color: $colorGrayLighter;
display: inline-block;
font-size: 10px;
margin-top: 15px;
padding: 1px 3px;
.inner {
color: $colorGrayLightest;
}
}
input {
font-size: 12px;
}
input[type=file] {
display: none;
}
.media-item {
margin-bottom: 10px;
&.media-item-template {
display: none;
&:first-child {
display: block;
}
&:not(:first-child) + .add-button {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

combine with the selector above

display: block;
}
}
&.add-item {
display: inherit;
}
}
.add-button {
display: none;
i {
margin-right: 3px;
}
}
}

.media-preview {
display: none;
margin-top: 5px;
max-height: 150px;
max-width: 200px;
.media-item {
.media-preview-container {
background-color: $mediaPreviewBackgroundColor;
border: $mediaPreviewBorder;
border-radius: 2px;
cursor: pointer;
display: block;
margin: 5px 0;
max-width: 100%;
position: relative;

img, iframe {
height: 100%;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🍟

position: relative;
width: 100%;
z-index: 1;
}
.media-preview {
display: none;
}
&:before {
background: url('../img/game-submission/upload-blue.png') 50% 0 no-repeat;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should sprite these images and just use background-position to make it blue vs. black.

content: "";
display: block;
position: absolute;
width: 100%;
}
&:after {
color: $colorLightBlue;
content: attr(data-message);
display: block;
position: absolute;
text-align: center;
}
}
&.processed {
.media-preview-container {
background: #fff url('../img/game-submission/crosshatch.png');
border: 1px solid $colorGray;
.media-preview {
display: inherit;
}
.media-delete {
background-color: rgba(217,21,24,0.75);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what colour is this? seems arbitrary

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The red colour for the delete button

border: 1px solid #d91518;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what colour is this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The red colour border for the delete button

border-radius: 5px;
bottom: 5px;
color: #fff;
cursor: pointer;
display: none;
height: 30px;
position: absolute;
width: 30px;
right: 5px;
text-align: center;
z-index: 2;
&:before {
content: "\00d7"; /* Cross symbol */
font-size: 24px;
font-weight: 600;
line-height: 30px;
}
}
&:hover {
.media-delete {
display: inherit;
}
}
&:before {
background-image: none;
}
&:after {
content: "";
}
}
.media-input {
display: none;
}
}
}

.icons .media-preview {
max-height: 128px;
max-width: 128px;
}
.icons {
.icons-dimensions {
border: 1px solid $colorGrayLighter;
border-radius: 2px;
color: $colorGrayLighter;
display: inline-block;
font-size: 10px
padding: 1px 3px;
}

.videos .media-preview {
max-height: 150px;
max-width: 200px;
.media-preview-container {
height: 128px;
width: 128px;
&:before {
background-size: 50px;
height: 50px;
top: 25px;
}
&:after {
bottom: 17px;
font-size: 12px;
margin-left: 20%;
width: 60%;
}
&.icons-64 {
height: 64px;
width: 64px;
&:before {
background-size: 25px;
top: 20px;
}
&:after {
content: "";
}
}
}
}

.media-size {
color: $colorGrayLight;
font-size: 10px;
margin-top: 15px;
.screenshots {
.media-preview-container {
height: 210px;
&:before {
background-size: 80px;
height: 80px;
top: 50px;
}
&:after {
bottom: 35px;
margin-left: 32%;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why 32%? seems like a magic number

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because the width is 36%. This is obtained through trial and error with comparison to the mockups. 36 + 32 + 32 = 100%

width: 36%;
}
&.screenshots-16-9 {
height: 157px;
&:before {
top: 20px;
}
&:after {
bottom: 15px;
}
}
}
}

input[type=url].media {
margin-bottom: 5px;
.icons,
.screenshots {
.media-preview-container.dragenter {
background-color: #efefef;
border-color: $colorGray;
&:before {
background-image: url('../img/game-submission/upload.png');
}
&:after {
color: $colorGray;
}
}
}

.media {
.form-help {
margin-bottom: 5px;
margin-right: 50px;
}
.req:after {
bottom: auto;
top: 5px;
.videos {
.media-preview-container {
cursor: default;
height: 210px;
&:before {
background: url('../img/game-submission/preview-blue.png') 53% 0 no-repeat;
background-size: 80px;
height: 80px;
top: 60px;
}
&:after {
bottom: 55px;
content: attr(data-message);
width: 100%;
}
.media-iframe {
height: 100%;
width: 100%;
}
}
}

input[type=url].media {
margin-bottom: 5px;
}
2 changes: 1 addition & 1 deletion src/media/css/modal.styl
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ body.overlayed {
}
.form-close {
color: $colorGrayDark;
display: initial;
display: inherit;
font-size: 24px;
position: absolute;
right: 10px;
Expand Down
4 changes: 2 additions & 2 deletions src/media/css/site.styl
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ body {
}

main {
margin: 0 auto;
margin: 0 auto 40px;
width: 1200px;
}

Expand Down Expand Up @@ -101,7 +101,7 @@ main {
margin-bottom: 6px;
padding: 40px 35px;
h1 {
color: $colorGray;
color: $colorBlack;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does full black actually look better?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was following the h1 color as shown in the mockups.

}
h2 {
color: $colorGrayDark;
Expand Down
7 changes: 6 additions & 1 deletion src/media/css/variables.styl
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@ $colorGrayDark = #555;
$colorGray = #777;
$colorGrayLight = #999;
$colorGrayUltraLight = #bbb;
$colorGrayLighter = #9d9d9d;
$colorGrayLightest = #d4d4d4;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is kind of a silly name lol

$colorWhite = #fff;
$colorRed = #da3e5a;
$colorGreen = #18a011;
$colorLightGreen = #7CCD2F;
$colorLightGreen = #7ccd2f;
$colorLightBlue = #98bada;

// ButtonColor
$buttonColorTeal = #40dfc2;
Expand All @@ -80,6 +83,7 @@ $mainBackgroundColor = #f7f7f7;
$mainFooterColor = rgba(45,57,74,0.9);
$mainFooterHoverColor = rgba(255,255,255,.1);
$cloakBackgroundColor = rgba(0,0,0,.9);
$mediaPreviewBackgroundColor = #eff;

// Legacy colors
$flamin-hot-cheetos-orange = #ff9500;
Expand All @@ -100,6 +104,7 @@ $light-gray = #ccc
$cellBorder = 1px solid #eee;
$cellBorderDark = 1px solid #ddd;
$fieldsetBorder = 1px solid #ddd;
$mediaPreviewBorder = 1px solid #3892e3;

// Modal
$modalBackgroundColor = #d8d8d8;
Expand Down
Binary file added src/media/img/game-submission/crosshatch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/media/img/game-submission/preview-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/media/img/game-submission/preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/media/img/game-submission/upload-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/media/img/game-submission/upload.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading