chrisgarrity
|
47f71c2758
|
Fix confict resolution error
I missed one of the changes when resolving conflicts.
|
2018-10-09 10:24:02 -04:00 |
|
chrisgarrity
|
7af2c8a80a
|
Merge branch 'develop' into 2133/move-media-queries-to-frameless
|
2018-10-09 09:12:58 -04:00 |
|
Ray Schamp
|
ab08aa4281
|
Merge pull request #2152 from LiFaytheGoblin/2133/subactions-share-date-as-prop
[new project page] share date is passed as a prop to subactions component
|
2018-10-08 21:35:38 +01:00 |
|
Ray Schamp
|
3f5f224a76
|
Merge pull request #2107 from LiFaytheGoblin/responsive-project-page/container-width
Make container smaller for mobile to allow for space left and right
|
2018-10-08 18:13:40 +01:00 |
|
Linda
|
14741e1cb8
|
if the report or add to studio modals are open, don't switch to fulls… (#2145)
* if the report or add to studio modals are open, don't switch to fullscreen on orientationchange landscape
* fix linting errors
|
2018-10-05 18:00:52 -04:00 |
|
Linda
|
d358c45482
|
media queries used in responsive project page have been moved to frameless.css
|
2018-10-05 10:25:56 -04:00 |
|
Linda
|
8db5216f17
|
share date is passed as a prop to subactions
|
2018-10-05 09:15:09 -04:00 |
|
Linda
|
bf3977821a
|
fixed linting errors
|
2018-10-04 10:51:26 -04:00 |
|
Linda
|
ad1531aff3
|
fixes to spacing around page content and a few other fixes
|
2018-10-04 10:41:10 -04:00 |
|
Linda
|
502ead072f
|
Merge branch 'develop' into responsive-project-page/container-width
|
2018-10-04 10:25:48 -04:00 |
|
Linda
|
79afc55f26
|
Merge pull request #2108 from LiFaytheGoblin/responsive-project-page/modals
Make modals responsive
|
2018-10-04 10:23:35 -04:00 |
|
Linda
|
8476cd3152
|
solution from before was not working if combined with current develop branch
|
2018-10-04 09:47:28 -04:00 |
|
Paul Kaplan
|
24e1c92b74
|
Merge pull request #2141 from paulkaplan/comment-delete
Add comment deleting for project owners on preview
|
2018-10-03 16:26:50 -04:00 |
|
Linda
|
27d7a3bf59
|
Merge pull request #2135 from LiFaytheGoblin/responsive-project-page/header
Make header of new project page look good on mobile
|
2018-10-03 15:41:03 -04:00 |
|
Linda
|
1aa30fb10b
|
Merge pull request #2136 from LiFaytheGoblin/responsive-project-page/see-inside-remix-buttons
New project page: See inside and remix buttons disappear on mobile
|
2018-10-03 15:40:47 -04:00 |
|
Linda
|
62498a0c69
|
Merge pull request #2138 from LiFaytheGoblin/2132/positioning-remix-credit-text
Positioning remix credit text correctly
|
2018-10-03 14:30:15 -04:00 |
|
Paul Kaplan
|
a3f1ccc132
|
Fix sass-lint
|
2018-10-03 14:00:56 -04:00 |
|
Paul Kaplan
|
24b456873b
|
Add comment deleting for project owners
|
2018-10-03 13:31:54 -04:00 |
|
Linda
|
fc57218066
|
fix linting errors
|
2018-10-03 11:12:56 -04:00 |
|
Linda
|
a3df002b49
|
resolve mergin issues
|
2018-10-03 11:03:18 -04:00 |
|
Linda
|
437334b872
|
resolve merging conflicts
|
2018-10-03 10:54:53 -04:00 |
|
Linda
|
193a4ac70a
|
Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons
|
2018-10-03 10:45:10 -04:00 |
|
Linda
|
38b8e2e97e
|
on mobile, remix credit is still a flex row
|
2018-10-03 10:32:12 -04:00 |
|
Linda
|
f11d338d65
|
text gets vertically centered
|
2018-10-03 10:29:45 -04:00 |
|
Linda
|
9b94849de6
|
Merge pull request #2109 from LiFaytheGoblin/responsive-project-page/stats-and-subactions
Stats and subactions are responsive and separate components
|
2018-10-03 10:23:02 -04:00 |
|
Linda
|
57e147e110
|
remove commented out css
|
2018-10-03 10:09:44 -04:00 |
|
Linda
|
8009978c06
|
fixed linting errors
|
2018-10-03 10:09:44 -04:00 |
|
Linda
|
6f5b5c3278
|
extract css for new components and make some fixes to validation in report modal
|
2018-10-03 10:09:44 -04:00 |
|
Linda
|
5832969912
|
fixed linting errors
|
2018-10-03 10:09:44 -04:00 |
|
Linda
|
0895719f36
|
subactions getting own component
|
2018-10-03 10:09:44 -04:00 |
|
Linda
|
d85ca5d755
|
subactions getting their own component
|
2018-10-03 10:05:21 -04:00 |
|
Linda
|
b4a4ded822
|
share date positioning on small screens
|
2018-10-03 09:59:15 -04:00 |
|
Linda
|
8b10f3cba4
|
made project stats and action buttons responsive
|
2018-10-03 09:58:01 -04:00 |
|
Linda
|
2408568dda
|
Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons
|
2018-10-02 17:03:18 -04:00 |
|
Linda
|
a525e09cf6
|
Merge branch 'develop' into responsive-project-page/header
|
2018-10-02 16:59:01 -04:00 |
|
Linda
|
d0257ae43d
|
Merge pull request #2105 from LiFaytheGoblin/responsive-project-page/landscape-player
If in landscape format on mobile, switch to fullscreen mode
|
2018-10-02 16:38:57 -04:00 |
|
Linda
|
f55dd02665
|
never mind screen.orientation
|
2018-10-02 15:42:29 -04:00 |
|
Linda
|
06bb9c60c4
|
fixed problem where sometimes there would be two scrollbars
|
2018-10-02 15:33:15 -04:00 |
|
Linda
|
b03bd51f79
|
fixed linting error
|
2018-10-02 13:57:41 -04:00 |
|
Linda
|
7c8fdbfcc3
|
fixed height of studio buttons scrolling container to fill all modal
|
2018-10-02 13:49:56 -04:00 |
|
Linda
|
a0b190aa87
|
Merge pull request #2118 from LiFaytheGoblin/responsive-project-page/notes-section
Made project notes look better on mobile
|
2018-10-01 19:30:36 -04:00 |
|
Linda
|
3432d95cdb
|
Merge pull request #2117 from LiFaytheGoblin/responsive-project-page/comments
Made comments look better on mobile
|
2018-10-01 19:30:25 -04:00 |
|
Linda
|
ef1b7d8f9f
|
checking for landscape browser proof
|
2018-10-01 16:58:05 -04:00 |
|
Linda
|
d5641daae6
|
improve solution for spacing in container and used desktop variable instead of hardcoded value
|
2018-10-01 13:56:11 -04:00 |
|
Linda
|
f1738ca384
|
improved the code stylewise
|
2018-10-01 09:52:50 -04:00 |
|
Linda
|
3010db684d
|
Merge pull request #2116 from LiFaytheGoblin/responsive-project-page/thumbnailcolumns
Thumbnailcolumns appear at bottom on mobile
|
2018-09-28 13:57:24 -04:00 |
|
Linda
|
ec067778f2
|
Merge pull request #2099 from LiFaytheGoblin/2067/project-page/comments-fade-out-safari
Made comments fade out look nice in Safari too
|
2018-09-28 13:57:11 -04:00 |
|
Ray Schamp
|
5278e77e0c
|
Merge pull request #2098 from chen-robert/gh1930-teacher-register-year
Fix gh-1930: Teacher registration dates
|
2018-09-28 10:58:26 -04:00 |
|
Linda
|
50c7eb9bfd
|
added todo
|
2018-09-27 10:31:32 -04:00 |
|
Ray Schamp
|
3f9de0cab2
|
Merge pull request #2120 from rschamp/enable-share
Add placeholder share handler
|
2018-09-26 21:49:38 -04:00 |
|