Commit graph

38 commits

Author SHA1 Message Date
Ray Schamp
590f505a61 Revert "Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade"
This reverts commit 1b1b396e92, reversing
changes made to a144bab0e6.
2018-01-30 11:53:12 -05:00
Ray Schamp
46511e1253
Revert "[Develop] Upgrade to ES6" 2018-01-30 09:54:45 -05:00
Matthew Taylor
6d1f2fbccd initial es6 commit 2018-01-19 14:06:26 -05:00
Matthew Taylor
02da6f62a6 fall back to default image if thumb not found
This incorporates a fallback image into the thumbnail component for all of project, studio and avatar thumbnails using the `onerror` property of img elements (which is supported across all browsers).

/cc @thisandagain @rschamp
2017-11-29 08:03:48 -05:00
Ray Schamp
d6093f19b0 Fix React key warnings
The number of warnings was locking up my browser, making it hard to test things out.
2017-02-20 11:04:41 -05:00
Technoboy10
f27e99f1a4 move card styling to grid.scss, use card as default grid style 2016-08-23 09:26:22 -06:00
Technoboy10
3fa6fa95fd add card display to grid and thumbnail components 2016-08-23 09:26:21 -06:00
Technoboy10
55163d2c86 more work on user avatar in thumbnail 2016-08-23 09:26:21 -06:00
Technoboy10
432b621079 wip 2016-08-23 09:24:44 -06:00
Technoboy10
f883ecfbae commit changes 2016-08-23 09:24:44 -06:00
Matthew Taylor
41a0ef73ba Add missing strings for translation
1. Explore page header
2. “by” in the project thumbnail
2016-08-16 08:55:32 -04:00
Matthew Taylor
0894724dfd Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn
* 'develop' of https://github.com/rthorn/scratch-www:
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  Changed path of search page to allow for studio tabs
  Changes to path for search results
  Removed unnecessary files
  Search page functions
  Starting mock of search page
  Fixed problem with loading
  Load button and tabs functioning
  Merge remote-tracking branch 'LLK/develop' into develop
  Early Explore Page

# Conflicts:
#	src/components/navigation/www/navigation.jsx
2016-06-07 09:06:01 -04:00
Matthew Taylor
74ac6e52bb conference formatting tweaks for mobile
thanks @carljbowman!
2016-05-27 15:55:27 -04:00
Rachel Thornton
d7c9057cbd Refactoring, new grid component
Significant refactoring of Explore and Search pages, including new grid
component for displaying projects
2016-05-10 00:54:46 -04:00
Rachel Thornton
dfa7b9e582 Starting mock of search page 2016-04-18 16:51:45 -04:00
Rachel Thornton
bfd3fac6a0 Merge remote-tracking branch 'LLK/develop' into develop
# Conflicts:
#	src/components/navigation/navigation.jsx
2016-03-26 21:15:36 -04:00
Ray Schamp
78649b69e2 Merge pull request #353 from morantsur/feature/microworlds
Moving Microworlds pages to scratch-www & adding arts
2016-03-25 15:43:10 -04:00
Ray Schamp
19f469db48 Upgrade and quiet sass-linter
These warnings were annoying me because the noise makes it easy to miss real issues.

The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks.  When the next release happens we should put that back.

https://github.com/sasstools/sass-lint/issues/307

Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors.
https://github.com/sasstools/sass-lint/issues/575

Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names.  It's a useful rule to keep class names consistent though.  Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70
2016-03-23 18:34:54 -04:00
morant
2e5a0e1439 Merge remote-tracking branch 'upstream/develop' into feature/microworlds
* Removed microwords from server/routes for now.

# Conflicts:
#	server/routes.json
#	src/components/thumbnail/thumbnail.jsx
2016-03-11 21:14:27 -05:00
morant
d735d38d91 * Fix aligning of thumbnails inside a NestedCarousel
* Remove links from thumbnail image
* Fix vertical aligning when a thumbnail has more than one line of text
2016-03-11 18:17:34 -05:00
morant
c7cc1b626f Revert "Revert "Fix review comments, and organize code a bit.""
This reverts commit e9cb08d273.
2016-02-19 15:11:23 -05:00
morant
e9cb08d273 Revert "Fix review comments, and organize code a bit."
This reverts commit 3d9d280bb9.
2016-02-19 14:39:43 -05:00
morant
3d9d280bb9 Fix review comments, and organize code a bit.
The only visible change should be that the tips thumbnails are no longer links.
2016-02-19 14:30:07 -05:00
Matthew Taylor
01975b7e4d Add alt attribute to image tags
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02
2016-01-12 13:27:09 -05:00
Ray Schamp
717ede8afd Fix #102: Add remix and love icons 2015-10-23 17:07:40 -04:00
Matthew Taylor
438401bde0 display title and extras differently
So that the creator username appear on the same line as other text, but so that studio titles still get cut off properly
2015-10-23 09:01:01 -04:00
Matthew Taylor
a40915c60a use ellipsis if text overflows and urlify username
fixes #103 and #113
2015-10-21 15:22:59 -04:00
Andrew Sliwinski
2553c69653 Set 'black' default props for thumbnails and carousel 2015-10-20 21:33:00 -04:00
Ray Schamp
6259cb5b97 Pull homepage rows from the API
Not localized yet
2015-10-20 14:49:25 -04:00
Ray Schamp
da9174c520 Make app more transparent to Selenium 2015-10-09 14:16:37 -06:00
Ray Schamp
2affa1b77e Name all the exports for easier debugging 2015-10-08 14:25:18 -06:00
Ray Schamp
f811cf82af Add real content for homepage rows
Also update the thumbnail and carousel components to account for the new API spec
2015-10-02 13:08:57 -04:00
carljbowman
41e4b3b990 Add Global Colors and Updated SCSS / Linter
Created a new global style sheet to manage colors and converted all the current SCSS to match the new color scheme.
2015-09-29 11:22:48 -04:00
Ray Schamp
fd546296c2 Lint everything but color literals 2015-09-24 19:27:50 -04:00
Ray Schamp
e36bef3bce Use consistent quote style 2015-09-14 16:14:40 -04:00
Ray Schamp
b4147a8d53 Resolve feedback from PR, fix stylistic issues 2015-09-09 10:01:10 -04:00
Ray Schamp
730e440ee6 Add example feature content to splash 2015-09-08 18:15:02 -04:00
Ray Schamp
a02c73ddf2 Add carousel component 2015-09-08 14:56:54 -04:00