Commit graph

585 commits

Author SHA1 Message Date
Paulo Reis
bf5aa5e253 Fix review panel toolbar in flex contexts. 2016-11-23 17:04:55 +00:00
Paulo Reis
1148b00c9a Add review header item. 2016-11-23 16:53:13 +00:00
Paulo Reis
8d933d9b5f Toggler style adjustments. 2016-11-23 16:10:35 +00:00
Paulo Reis
f61aac0bb3 Make toggler label clickable. 2016-11-23 14:44:04 +00:00
Paulo Reis
aba6c90524 Add styling for toggler. 2016-11-23 14:34:40 +00:00
Paulo Reis
ba5118d02a Merge branch 'master' into ja-review-panel 2016-11-23 10:41:20 +00:00
Paulo Reis
0bc52412ea Hide header labels in XS resolutions (i.e. up to 768px). 2016-11-22 10:59:20 +00:00
Paulo Reis
decaaab7ea Fix CSS property typo. 2016-11-22 10:36:13 +00:00
Paulo Reis
f7d2fa9382 Avoid avatar resizing in flexbox contexts. 2016-11-22 09:03:52 +00:00
Paulo Reis
a84e52bc92 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-21 17:14:08 +00:00
James Allen
db93bc8cff Grey out and add extra info to resolved comments 2016-11-21 17:13:17 +00:00
Paulo Reis
319217f61e Revert "Basic support for buttons in overview panel."
This reverts commit c76e73489ac989dc0e90f65312b737831850af96.
2016-11-21 16:40:31 +00:00
Paulo Reis
80049f4e9c Basic support for buttons in overview panel. 2016-11-21 15:20:58 +00:00
Paulo Reis
5158c6c16d Fix padding in overview panel. 2016-11-21 15:05:18 +00:00
Paulo Reis
cc8fdf6b8d Add a buttons mixin. 2016-11-21 11:16:13 +00:00
Paulo Reis
f029c7a7b2 Control click behaviour on comments; relayout when toggling panels. 2016-11-18 15:08:16 +00:00
Paulo Reis
caefc196a4 Style comments in Overview panel. 2016-11-18 14:27:49 +00:00
Paulo Reis
60b5087763 Basic styling in the overview panel. 2016-11-18 12:16:24 +00:00
Paulo Reis
dd0c578924 Put the entries in a layer above the scrollbar. 2016-11-17 17:18:24 +00:00
Paulo Reis
a007da0466 Increase hit area for hovering in the mini review panel. 2016-11-17 16:53:59 +00:00
Paulo Reis
68c254a432 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 15:55:26 +00:00
Paulo Reis
b1f73963b9 Fix invisible hover. 2016-11-17 15:41:55 +00:00
James Allen
dcb4bd0dc8 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 15:33:42 +00:00
James Allen
d1a3ff4b73 Refactor callout and background styles and don't show in overview 2016-11-17 15:33:34 +00:00
Paulo Reis
94bdad7eae Use triangles mixin instead of characters. 2016-11-17 15:29:33 +00:00
James Allen
77400b000b Focus on box when adding a comment 2016-11-17 15:20:25 +00:00
James Allen
15d8f6c661 Sort out scroll bar positions and scroll position transitions 2016-11-17 14:29:35 +00:00
James Allen
52ca272ae8 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 12:09:10 +00:00
James Allen
e2f21a67d2 Sort of positioning and scrolling of overview panel 2016-11-17 12:09:07 +00:00
Paulo Reis
fe43f60b3d Offset review panel when Ace scrollbar is visibl.e 2016-11-17 12:02:45 +00:00
James Allen
1e8f2a89a1 Refactor layout and CSS to be more manageable with overview classes 2016-11-17 11:47:20 +00:00
James Allen
a87ed88a53 Use cleaner scrolling system that doesn't involve hiding a scroll bar 2016-11-17 10:24:48 +00:00
James Allen
a4b9bcb37e Don't let focused change overlap nav panel 2016-11-16 16:07:07 +00:00
James Allen
51afd49780 Bring scroll bar into editor when just mini review panel 2016-11-16 15:27:33 +00:00
James Allen
379afe4aa5 Refactor scroll handling into directive 2016-11-16 15:23:29 +00:00
James Allen
711f282575 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 13:26:33 +00:00
Paulo Reis
f640c17d4d Add review panel substate toggling. 2016-11-16 12:31:47 +00:00
James Allen
b443c5d7dc Make mini review panel entries scroll and stack like main panel 2016-11-15 17:07:06 +00:00
Paulo Reis
562d8626e4 Fix overflowing entries. 2016-11-15 16:20:06 +00:00
Paulo Reis
8a11c8c3ca Show add comment button when review panel is off. 2016-11-15 16:02:12 +00:00
Paulo Reis
f25e144a15 Update font awesome to v4.7. 2016-11-15 16:02:03 +00:00
Paulo Reis
7bf55823b2 Hide review panel when there are no entries. 2016-11-15 15:04:29 +00:00
Paulo Reis
d0f451df2e Improve hover behaviour on review entries. 2016-11-15 12:23:39 +00:00
Paulo Reis
b181115277 Basic review minimized state. 2016-11-15 10:34:39 +00:00
James Allen
c89579e1df Focus on the focused change 2016-11-14 12:47:46 +00:00
Paulo Reis
7201bde2a3 Add comment UI. 2016-11-14 11:19:00 +00:00
Paulo Reis
d04d7f834e Adjustments in the threaded comments, mocked comments responses. 2016-11-11 16:10:26 +00:00
Paulo Reis
6c5c1549b6 Add comment replies via enter keypress. 2016-11-11 10:51:32 +00:00
Paulo Reis
78e409593b Threaded comments. 2016-11-10 17:19:41 +00:00
Paulo Reis
c5e6ca5200 More entry styling. 2016-11-10 15:08:41 +00:00
Paulo Reis
997addf355 More entry header styling + entry body. 2016-11-10 12:35:35 +00:00
Paulo Reis
950fc0179c Basic support for action icons. 2016-11-10 10:19:52 +00:00
James Allen
f62d95dd8c Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-09 17:11:02 +00:00
James Allen
2e719fc450 Start adding callouts in review panel 2016-11-09 17:10:58 +00:00
Paulo Reis
013df17192 Entry header layout. 2016-11-09 17:09:57 +00:00
Paulo Reis
341a092231 Merge + basic layout for entries. 2016-11-09 16:36:06 +00:00
Paulo Reis
e0fbb45844 Add colored borders. 2016-11-09 16:00:02 +00:00
Paulo Reis
19241e571f Distinguish between inserts and deletes in the entries repeater. 2016-11-09 15:58:03 +00:00
Paulo Reis
74ddd33bd9 Add colors to LESS file. 2016-11-09 15:39:01 +00:00
James Allen
084838926d Add in dashed line callouts for changes and comments 2016-11-08 17:31:08 +00:00
James Allen
064ae1945a Toggle review panel and track changes with ui elements 2016-11-08 16:43:01 +00:00
James Allen
8c65cb5835 Track and highlight comment ranges 2016-11-08 15:12:25 +00:00
Brian Gough
307f08e6bb Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down
lock editor when connection down
2016-11-04 11:04:30 +00:00
Paulo Reis
cd0a9d922e Generalize and improve teaser styles. 2016-11-03 16:14:13 +00:00
Brian Gough
49a06f8489 modal for lost connection 2016-11-03 12:37:44 +00:00
James Allen
091eb7e462 Merge branch 'master' into ja-review-panel
Conflicts:
	public/coffee/ide.coffee
	public/stylesheets/app/editor.less
2016-11-03 10:07:37 +00:00
Paulo Reis
140748d466 Remove text-shadow, use stricter box-shadow syntax. 2016-11-02 14:38:26 +00:00
Paulo Reis
c18114bfeb Different strategy for highlighting the code-check setting. 2016-11-01 17:30:27 +00:00
Paulo Reis
a91de6c3a5 Fix animation for compatibility with display: flex. 2016-11-01 15:27:05 +00:00
Paulo Reis
4c94c027b8 Styles for better accomodating smaller resolutions. Vertically centering. 2016-11-01 14:52:10 +00:00
Paulo Reis
06629e05d4 Include teaser media and do some style adjustments. 2016-11-01 11:36:21 +00:00
Paulo Reis
31697bd1e2 Add lightbox shadows. 2016-10-31 20:17:58 +00:00
James Allen
8368577867 Merge branch 'master' into ja-review-panel
Conflicts:
	app/views/project/editor/editor.jade
	public/coffee/ide.coffee
	public/coffee/ide/editor/directives/aceEditor.coffee
2016-10-31 16:42:55 +00:00
Paulo Reis
97b92928dc Merge branch 'master' into pr-latex-linter-onboarding 2016-10-28 16:36:10 +01:00
Shane Kilkelly
5c8cdd22cc Merge branch 'sk-account-delete-pass' 2016-10-28 11:02:41 +01:00
Paulo Reis
5a82cebcff Make the history teaser message look like a modal. 2016-10-27 11:12:22 +01:00
Paulo Reis
04f8b3adfa Adapt mark-up to history teaser, add some styles. 2016-10-27 10:30:10 +01:00
Paulo Reis
702f0aa39b Generalize teaser style. 2016-10-27 10:29:38 +01:00
Paulo Reis
70c7880639 Style adjustments. 2016-10-26 11:12:34 +01:00
Shane Kilkelly
1c8721ceab Functioning account deletion with password 2016-10-25 16:23:50 +01:00
Paulo Reis
f4849201aa Merge branch 'master' into pr-latex-linter-onboarding 2016-10-25 15:00:26 +01:00
Paulo Reis
4e62e5c4c5 Prevent overflowing project names. 2016-10-24 17:08:46 +01:00
Paulo Reis
9dd06df839 More style adjustments. 2016-10-21 15:00:26 +01:00
Paulo Reis
777b28b443 Add animation and other styling items. Small refactor with Less vars. 2016-10-21 12:02:53 +01:00
Paulo Reis
ac07ba035b Navigation in onboarding UI. 2016-10-20 16:39:43 +01:00
James Allen
60a81beb11 Try out different styling for highlights 2016-10-20 15:18:45 +01:00
Paulo Reis
e60f67dacb Bootstrapping. 2016-10-20 12:24:07 +01:00
James Allen
52f3fe7303 Show different users changes in different colours 2016-10-20 12:15:22 +01:00
James Allen
09195882f4 Add scrollbar todo note 2016-10-13 14:25:46 +01:00
James Allen
7a4bebd785 Allow review panel to be toggled 2016-10-13 14:22:23 +01:00
James Allen
fc782581ea Change review panel to feel like part of ace 2016-10-12 17:27:20 +01:00
James Allen
4ac55c7671 Merge branch 'ja-track-changes' into ja-review-panel 2016-10-11 14:24:51 +01:00
James Allen
e9c8fc7c20 Add in review panel layout 2016-10-11 14:24:01 +01:00
James Allen
0995ba5ee6 Add basic change tracking into editor behind a feature flag 2016-10-10 17:06:46 +01:00
James Allen
1c9abd35f8 Rename track-changes -> history on the client
Conflicts:
	app/views/project/editor/history.jade
2016-10-10 16:59:25 +01:00
Paulo Reis
3925ba9364 Add assets for animated dropbox teaser. 2016-10-04 11:58:19 +01:00
Paulo Reis
ea8277ef78 Add assets for focused dropbox teaser. 2016-10-04 11:57:42 +01:00
Paulo Reis
cdd873a1cf Small style adjustments in the labels AB test. 2016-09-28 09:31:59 +01:00
Paulo Reis
270bf81667 Cleanup. 2016-09-27 16:12:45 +01:00
Paulo Reis
d97313d22c Horizontal layout. 2016-09-26 16:09:27 +01:00
Paulo Reis
23671c7b18 Label styling. 2016-09-26 15:03:04 +01:00
Paulo Reis
2885164748 Isolate create project dropdown styles, to avoid influencing other dropdowns. 2016-08-30 15:32:23 +01:00
Brian Gough
16e4577ffa Merge pull request #306 from sharelatex/compile-check
Compile check
2016-08-30 11:58:04 +01:00
Brian Gough
74bc157e7c added force recompile option 2016-08-24 16:48:37 +01:00
Paulo Reis
ba71ed2a3d Merge branch 'master' into pr-ab-subscription-form 2016-08-23 14:10:19 +01:00
Paulo Reis
23ed1e2aa3 Add form validation. 2016-08-22 17:03:29 +01:00
Paulo Reis
861022aff0 Make scrollbar only visible when needed. 2016-08-22 16:32:59 +01:00
Paulo Reis
2f93a102fd Fix layout to support scrollable messages. 2016-08-22 16:12:29 +01:00
Paulo Reis
452abe94be Add coupon code, VAT and pricing breakdown. Styling adjustments. 2016-08-19 14:51:07 +01:00
Paulo Reis
82a6cd82a6 Minor tweaks in the features list. 2016-08-18 16:56:36 +01:00
Paulo Reis
43b832965f Layout and styling for simple subscription form. 2016-08-18 16:56:23 +01:00
Paulo Reis
4814fc2606 Simple layout for subscription form. 2016-08-17 17:34:17 +01:00
Shane Kilkelly
c98e473bc3 Fix layout of notifications 2016-08-17 10:31:05 +01:00
Shane Kilkelly
158afbb157 Merge branch 'master' into pr-email-tokens
Conflicts:
	app/coffee/Features/Notifications/NotificationsBuilder.coffee
	public/coffee/ide/share/controllers/ShareController.coffee
2016-08-15 10:29:21 +01:00
Paulo Jorge Reis
60f8e577a8 Merge pull request #293 from sharelatex/pr-wrap-long-words-chat
Wrap long words chat
2016-08-03 16:32:36 +01:00
Paulo Reis
cf5c8e27e1 UI fix - do not allow multiple clicks to restore a deleted file. 2016-08-03 16:05:19 +01:00
Shane Kilkelly
e7251aab53 Small wording changes 2016-08-03 14:06:08 +01:00
Paulo Reis
01637386bd Use string split instead of regex. 2016-08-02 11:59:43 +01:00
Paulo Reis
ff62e50530 Integrate word wrapping filter in the chat component. 2016-08-01 16:42:54 +01:00
Shane Kilkelly
7b18f88145 Merge branch 'master' into pr-email-tokens 2016-07-28 14:53:36 +01:00
Shane Kilkelly
827629a74a Invalid-invite page, and re-jigg the share modal 2016-07-27 10:10:44 +01:00
Shane Kilkelly
2dede5f793 WIP: Working "accept invite" page 2016-07-26 11:46:41 +01:00
Shane Kilkelly
b3add65de1 Start integrating invites into share frontend 2016-07-25 14:27:02 +01:00
Paulo Reis
37eb6252d2 Rewording + animation when shown the feedback panel. 2016-07-22 16:33:19 +01:00
Paulo Reis
b6cd6c2d7d UI logic to show or hide the negative feedback panel. 2016-07-22 14:14:58 +01:00
Paulo Reis
54eadf3256 Add textarea for 'other' feedback + styles. 2016-07-22 12:20:26 +01:00
Paulo Reis
95db6ba934 Basic mark-up for the extra log hint feedback. 2016-07-22 11:56:45 +01:00
Paulo Reis
79d95cbf9f Merge branch 'master' into pr-highlight-biblio-search 2016-07-21 14:51:34 +01:00
Paulo Reis
2c857c0afa Minor adjustments to make both variants coexist without affecting each other. 2016-07-21 14:24:52 +01:00
Paulo Reis
5c6d6f0e74 Pull back existing styles and namespace them as the control variant. 2016-07-21 14:12:14 +01:00
Paulo Reis
c076d76c7d Namespace new variant. 2016-07-21 14:11:17 +01:00
Paulo Reis
b0c3a89a83 Style button and content. 2016-07-20 17:10:03 +01:00
Paulo Reis
2d3aa02eed Make info cell a button container. 2016-07-20 17:04:02 +01:00
Paulo Reis
49f603922b Highlight info cell. 2016-07-20 15:32:10 +01:00
Henry Oswald
a3e40adbaf Merge pull request #283 from sharelatex/ho-cdn
Ho cdn
2016-07-20 14:19:37 +01:00
Henry Oswald
6c78ab4ace got requirejs working nicely with cdn 2016-07-20 12:58:32 +01:00
Shane Kilkelly
57079fc986 fix styling of the import modal 2016-07-18 16:07:00 +01:00
Paulo Reis
02ba277473 Small styling fixes. 2016-07-11 16:21:35 +01:00
Paulo Reis
9ef78b4bc2 Merge branch 'master' into pr-contact-form-suggestions 2016-07-11 13:54:06 +01:00
Henry Oswald
6b2a11a4d4 use https for google fonts 2016-07-11 12:13:01 +01:00
Henry Oswald
94d760e32d import bootstrap font awseome via less not html 2016-07-10 11:10:43 +01:00
Paulo Reis
444120f8b1 Merge branch 'master' into pr-contact-form-suggestions 2016-07-08 13:55:08 +01:00
Paulo Reis
54ec75d36a Avoid line-breaks when showing the log icon. 2016-07-06 15:55:36 +01:00
Paulo Reis
b867c37d49 Merge branch 'master' into pr-log-dropdown 2016-07-06 15:35:28 +01:00
Paulo Reis
fac3698c40 Better namespacing of sprite CSS classes. 2016-07-05 11:08:58 +01:00
Paulo Reis
64a73b0356 Disable default 4px margin on grunt-sprity, also add the built files. 2016-07-01 16:02:40 +01:00
Paulo Reis
4f49a25639 Use a figure element instead of an img, as there is no src attribute. 2016-07-01 16:02:01 +01:00
Henry Oswald
6f4a7f4779 mvp for using sprites for flags, needs border removing 2016-07-01 15:04:39 +01:00
Paulo Reis
72d498c6c8 Merge branch 'master' into pr-contact-form-suggestions 2016-06-29 11:58:07 +01:00
Paulo Reis
d037cb93a9 Wiki styles clean-up. 2016-06-29 10:42:51 +01:00