Commit Graph

532 Commits

Author SHA1 Message Date
JC Brand
6785eff4a7 Merge branch 'master' into converse-omemo 2018-07-01 11:44:04 +02:00
JC Brand
81ed773baa Updated css and fix some niggles in the Makefile 2018-06-14 10:22:16 +02:00
JC Brand
3dac4ae45c Add support for logging in with OAuth 2018-06-13 18:39:51 +02:00
JC Brand
0575ca485a Specify controlbox size for lg breakpoint 2018-06-07 06:58:37 +02:00
JC Brand
d32e9322ce Only show rooms-list icons upon hover.
updates #1068
2018-06-04 21:48:19 +02:00
JC Brand
ab6a4560e2 Make sure chats cover whole page in responsive mode 2018-06-04 21:42:21 +02:00
JC Brand
78d6d493d6 Add info icon in room header and show room details in modal 2018-06-04 19:54:11 +02:00
JC Brand
8948be1d3d In mobile view, add arrows to chat headings
so that you can navigate "back" to the controlbox.
2018-06-01 14:57:19 +02:00
JC Brand
b00567a0ea Fix styles for mobile view 2018-06-01 12:49:45 +02:00
JC Brand
5e97db95f9 Add a close button on the occupants sidebar 2018-05-30 16:55:28 +02:00
JC Brand
74ee896ee6 Add new sponsor and some website style improvements 2018-05-24 16:18:47 +02:00
JC Brand
fa849b3dfa fixes #1091
We no longer need inverse.css
2018-05-24 14:38:17 +02:00
JC Brand
f582fdad30 Remove sass/inverse/_chatbox.scss
updates #1091
2018-05-24 14:28:09 +02:00
JC Brand
082b1fea7c Remove converse-specific sass files
updates #1091
2018-05-24 14:19:53 +02:00
JC Brand
251bea2137 Put all Sass variables into one file.
updates #1091
2018-05-24 13:17:26 +02:00
JC Brand
539234fa79 Move _minimized_chats.scss into parent dir
updates #1091
2018-05-24 12:55:48 +02:00
JC Brand
be5b235798 Combine _core.scss from inverse/converse
updates #1091
2018-05-24 12:52:32 +02:00
JC Brand
a85401627c Combine inverse/converse chatrooms css
updates #1091
2018-05-24 12:45:10 +02:00
JC Brand
6042c233bc Add test that the OMEMO toolbar button renders
Fix and improve accordingly. updates #497
2018-05-23 12:51:01 +02:00
JC Brand
e82112715d Update padding of controlbox elements
Instead of padding the container, pad individual elements that need it.
This enables us to have highlighting (e.g. on hover) that spans the full
width of the controlbox.

updates #1069
2018-05-18 15:44:42 +02:00
JC Brand
59535656b6 Add checkbox to indicate whether this is a trusted device 2018-05-18 15:44:42 +02:00
JC Brand
d4a33656d8 Move form specific styles to _forms.scss 2018-05-18 15:44:42 +02:00
JC Brand
5e17d6b117 Update fonts for better Linux support 2018-05-15 15:49:52 +02:00
JC Brand
3cd5d9f8ca Tweak chatroom heading and description margins 2018-05-15 11:38:33 +02:00
JC Brand
37ce3fb737 Add a button to refresh a contact's vcard 2018-05-15 10:11:13 +02:00
JC Brand
28bc3a2252 Use future for headings 2018-05-14 13:49:04 +02:00
JC Brand
73807959d3 updates #1068
- For roster contacts, only show remove icons on hover.
- Show light background color when hovering over an item in the
controlbox.

Ideally this background color will be 100% of the controlbox width, but
I'm not opening that can of worms now...
2018-05-11 10:19:14 +02:00
JC Brand
d871392039 updates #1094
Update the occupants list when occupants are added/removed from the
member lists.
2018-05-11 00:17:44 +02:00
JC Brand
09db3eddb0 Add tests for contact removal via modal 2018-05-10 22:15:23 +02:00
JC Brand
d16bb315aa Add the ability to remove a contact via the details modal 2018-05-10 18:04:17 +02:00
JC Brand
9bc21741fc Update mockup and CSS accordingly 2018-05-09 12:57:50 +02:00
JC Brand
859bc0616e Fixes #1094
- Show users who are registered on the different members lists
- Show badges indicating user's roles and affiliations
2018-05-09 12:28:34 +02:00
JC Brand
28ec15094e Add alert modal and close profile modal on save 2018-05-09 10:09:42 +02:00
JC Brand
708b1dbe99 fixes #337
It's now possible to set your VCard via the UI and via the API
2018-05-08 18:14:56 +02:00
JC Brand
2d2dcd4a6d css fixes 2018-05-08 14:44:59 +02:00
JC Brand
9eb89758e0 Darken text slightly 2018-05-03 18:19:28 +02:00
JC Brand
df948a8dd6 Also allow a single-user chat to be embedded into the page 2018-05-03 17:01:17 +02:00
JC Brand
6495378a19 Chatroom form fixes 2018-05-03 14:19:11 +02:00
JC Brand
7eb6b13f10 Don't mark /me messages are followup messages. 2018-05-02 14:55:10 +02:00
JC Brand
cbc48629f1 Clear canvas before redrawing 2018-05-01 19:55:26 +02:00
JC Brand
58ca4a5664 Tweak message padding 2018-04-30 15:37:37 +02:00
JC Brand
93af6f4d0d In overlayed mode, don't pad followup messages 2018-04-30 15:37:37 +02:00
JC Brand
d316445fa0 Try to more intelligently break up long messages.
Use break-word in long URLs but not otherwise.
2018-04-30 15:37:37 +02:00
JC Brand
876a07b3de Fix the failing tests 2018-04-30 15:37:37 +02:00
JC Brand
ab09379a51 Move common Sass variables into a single file
Part of slowly trying to bring all styles into a single CSS file.
2018-04-30 15:37:36 +02:00
JC Brand
36ccb4618f Tweak chatroom headings 2018-04-30 15:37:36 +02:00
JC Brand
56e4e8b8ee Fix rendering of headline messages.
Also, add urijs to more intelligently handle URIs
2018-04-30 15:37:36 +02:00
JC Brand
f913ee86f0 Fix chat-image styling. Add spoiler margin 2018-04-30 15:37:36 +02:00
JC Brand
afcb808127 Mockup: Add "Announcements" section, update markup and styles for user-panel 2018-04-30 15:37:36 +02:00
JC Brand
57f7e31aa1 Add a spoiler message to the mockups 2018-04-30 15:37:36 +02:00
JC Brand
aa6a739cfa Initial work on showing avatars in messages.
- Update the mockups to show avatars.
2018-04-30 15:37:36 +02:00
JC Brand
ee46b0ccad CSS fixes to embedded chat
* Don't change styling based on media queries
* Fix offsets so that an embedded chat fits properly inside container element
2018-04-25 18:04:04 +02:00
JC Brand
e487fe4e54 Update mockups and tweak margin for chatroom in responsive mode 2018-04-24 18:22:44 +02:00
JC Brand
d0387a65ca Let an embedded MUC expand to fill its containing element 2018-04-24 17:31:44 +02:00
JC Brand
07ac8d4a3e Various HTML/CSS fixes for the demos, particularly embedded MUC 2018-04-24 14:46:09 +02:00
JC Brand
a15c9e54d0 Also test for when XEP-0363 is not supported
Updates #161
2018-04-22 17:47:34 +02:00
JC Brand
a19e7aeffe Add support for XEP-0066 Out of band data 2018-04-18 16:58:52 +02:00
JC Brand
463b0e6abe Fix height for minimized chats toggle
Also tweak progress indicator margin
2018-04-18 11:49:28 +02:00
JC Brand
95e648e79f Tweak margin and padding for messages 2018-04-18 08:53:54 +02:00
JC Brand
b889637f8d Fix height for chatroom forms 2018-04-17 15:21:16 +02:00
JC Brand
0a757a25e7 Fixes #1059 Remove bottom borders, uppercase titles and tweak padding 2018-04-10 21:23:32 +02:00
JC Brand
eddc359a64 Fix height and padding for minimized chats toggle 2018-04-10 20:55:47 +02:00
JC Brand
9528d81c00 Move various MUC methods onto the Backbone.Model
To more cleanly separate views and models and to make MUC in headless
mode more viable.

Refs #1032
2018-04-10 18:59:02 +02:00
JC Brand
9a526d4194 Refactoring of the XEP-0085 Chat State Notifications code
* Distinguish between CSN messages and other types of messages
* Properly clear previous notifications
* Better handling of notifications from multiple users (in MUC)
* Rename methods to make clarify intent
2018-04-06 17:02:28 +02:00
JC Brand
e21f14f4bd Don't let .converse-chatboxes expand and cover other elements. 2018-03-30 14:22:51 +02:00
JC Brand
95406a149d Re-add xhr_user_search_url and autocomplete when adding contacts 2018-03-30 14:22:51 +02:00
JC Brand
7a254a56e0 Pad the toggle and rename to "Chat Contacts"
to make it clearer that this toggle relates to chatting.
2018-03-30 14:16:07 +02:00
JC Brand
1d5b6839b1 Rename inlcuded FontAwesome font to ConverseFontAwesome
to avoid name clashes
2018-03-30 14:16:07 +02:00
JC Brand
ea4337da51 Set column width for chatbox buttons in the sass file 2018-03-30 14:16:07 +02:00
JC Brand
4d8fdb9990 More changes to emoji toolbar (based on tests in Plone) 2018-03-30 14:16:06 +02:00
JC Brand
245ea22df3 Styling of emoji picker in the overlay view 2018-03-30 14:16:06 +02:00
JC Brand
3f1602ddf2 Set z-index for .converse-chatboxes 2018-03-30 14:16:06 +02:00
JC Brand
11788bb7a1 Bundle font-awesome in the css 2018-03-30 14:16:05 +02:00
JC Brand
03bda96e4d Tweak line-height for requesting contacts 2018-03-30 14:16:05 +02:00
JC Brand
f90ca8f7f4 Remove unused class 2018-03-30 14:16:04 +02:00
JC Brand
aa2f0d8d2d Tweak unread messages indicator 2018-03-17 17:07:43 +00:00
JC Brand
f0ae8c44ff Show caret for room, bookmark and group toggles 2018-03-17 11:42:17 +00:00
JC Brand
14de16f728 Tweak .button-on css 2018-03-16 19:41:00 +00:00
JC Brand
1565decfc0 Add identifiable class name 2018-03-14 18:25:33 +00:00
JC Brand
ca141401a0 Fix failing tests 2018-03-13 13:42:00 +01:00
JC Brand
7f2143edb5 Fix spinner 2018-03-12 14:52:11 +01:00
JC Brand
bfc3081874 Update css for mobile view of overlay mode. 2018-03-11 12:04:27 +01:00
JC Brand
d7de739001 Add close button for controlbox in overlay view mode 2018-03-09 23:53:05 +01:00
JC Brand
a1145140c3 Various small tweaks
- Style room invite
- Remove old border-radius
- Show close icon for minimized chats
2018-03-09 23:27:12 +01:00
JC Brand
c10a2596e3 Eagerly render emoji picker and avoid overflow in overlay view 2018-03-09 23:16:53 +01:00
JC Brand
392a7e8ab3 Don't use the bootstrap responsive grid for chats in overlay mode 2018-03-09 23:06:41 +01:00
JC Brand
849d6b2612 Update the minimized chats widget 2018-03-09 18:14:18 +01:00
JC Brand
9c0b7c71cd Render OTR menu as a bootstrap dropdown 2018-03-09 17:30:42 +01:00
JC Brand
9825d6e777 Use bootstrap dropdown to render the emoji picker 2018-03-09 14:51:24 +01:00
JC Brand
40f4555419 Only show controlbox head when logging in, in overlayed view mode 2018-03-09 11:46:23 +01:00
JC Brand
914a55707d Replace col- classes with Sass mixins 2018-03-09 10:12:05 +01:00
JC Brand
db44a4f44d Update the login form for the overlayed view mode 2018-03-07 21:40:55 +01:00
JC Brand
d72463c939 Make more semantic by putting login/register column info in css 2018-03-07 18:06:02 +01:00
JC Brand
b3f2fafeea Various smaller fixes and improvements 2018-03-07 14:36:19 +01:00
JC Brand
2db4550b13 Update chat events markup. 2018-03-07 11:02:12 +01:00
JC Brand
b154d6d534 Render chat head, content and message form as flex items. 2018-03-07 10:10:22 +01:00
JC Brand
d04a7df295 Update room features markup to use font awesome 2018-03-06 18:33:59 +01:00
JC Brand
181b1836b0 Update and further style toolbars 2018-03-06 15:26:05 +01:00
JC Brand
95645413c4 Darken modal overlay 2018-03-05 18:43:43 +01:00
JC Brand
2f2e687a18 Use flex column for occupant sidebar 2018-03-05 18:38:00 +01:00
JC Brand
d4d3d4c838 Merge branch 'split-muc' into bootstrap4 2018-03-05 16:51:33 +01:00
JC Brand
860befcab9 Fixes #1025
Rename icon to avoid confusion. Add back the OTR status text.
2018-03-02 12:11:47 +01:00
JC Brand
877b5ca082 Tweak roster contacts spacing 2018-02-25 17:54:55 +01:00
JC Brand
c655781bc9 More login form improvements and also update registration form 2018-02-24 19:59:25 +01:00
JC Brand
e1d1bac790 Update the login form with markup from bootstrap mockup 2018-02-24 18:43:32 +01:00
JC Brand
3b22f918fa More work on the user profile modal 2018-02-23 23:10:46 +01:00
JC Brand
66e6ae2eed Increase fade transition, to work around timing bug
in bootstrap.native.

https://github.com/thednp/bootstrap.native/issues/192
2018-02-23 16:33:10 +01:00
JC Brand
7e6cc86c94 CSS tweaks 2018-02-22 17:47:18 +01:00
JC Brand
4e508cfe88 Add a modal to list rooms 2018-02-22 17:40:01 +01:00
JC Brand
e143c88475 More work on the "add chatroom" modal. Working now. 2018-02-22 15:58:23 +01:00
JC Brand
d9709af7cf Initial work on the new chatroom modal 2018-02-21 16:59:16 +01:00
JC Brand
b5812e257d Work on the status modal 2018-02-21 16:17:57 +01:00
JC Brand
21556832f8 Update chatbox headers and buttons 2018-02-20 16:48:01 +01:00
JC Brand
2b935fa57b Show subdued grey for icons (and darker when hovering) 2018-02-20 15:57:01 +01:00
JC Brand
5e6860754f Update chatbox head with new markup 2018-02-19 22:36:37 +01:00
JC Brand
c4367e7a0a Show own avatar 2018-02-19 22:12:50 +01:00
JC Brand
658c27730c Fix showing of room info in rooms list 2018-02-19 18:11:02 +01:00
JC Brand
6cdaa47493 Fix roster filter functionality 2018-02-19 17:37:47 +01:00
JC Brand
493ecb2e4f Update markup for the roster filter 2018-02-19 16:08:54 +01:00
JC Brand
2fa8304945 Improve and update roster markup 2018-02-19 15:01:02 +01:00
JC Brand
650ed22da7 Update requesting contacts and tweak bookmark icons 2018-02-16 15:24:17 +01:00
JC Brand
c4a99c7f29 Render rooms and bookmarks lists according to mockups 2018-02-16 15:08:16 +01:00
JC Brand
ede21e7c32 Remove controlbox tabs and show rooms and contacts panels together 2018-02-16 14:16:55 +01:00
JC Brand
5401998558 Don't put #chatrooms inside #converse-roster and remove users id 2018-02-15 15:49:16 +01:00
JC Brand
1405884c59 Reset user agent styles. Fix login form margin and height 2018-02-15 14:38:10 +01:00
JC Brand
617019af0e Merge remote-tracking branch 'origin' into bootstrap4 2018-02-15 14:15:04 +01:00
JC Brand
4742e66b69 Fix linting errors and failing tests 2018-02-07 14:21:46 +01:00
JC Brand
0031938b97 Make the toolbar a little lighter 2018-02-07 13:16:34 +01:00
JC Brand
e34fa5d635 Style the spoiler 2018-02-07 10:30:06 +01:00
JC Brand
f6db2a9167 Use template to render the spoiler message. 2018-02-06 18:58:06 +01:00
JC Brand
19d9e281ae Update css and keep input and textarea values across toggles 2018-02-06 18:05:12 +01:00
JC Brand
400bdf775d More refactoring of spoilers code 2018-02-06 18:05:12 +01:00
JC Brand
2c8c872a65 Fixes #959 2018-01-29 15:06:27 +01:00
JC Brand
f724f49087 Add ability to run tests for transpiled code 2018-01-29 14:14:56 +01:00
JC Brand
0436a36169 Various smaller css fixes 2018-01-27 11:18:06 +01:00
JC Brand
c385674665 For some reason everything is 0.5em to the right 2018-01-26 21:05:04 +01:00
JC Brand
53adebb780 Fix sidebar in responsive mode 2018-01-26 20:50:11 +01:00
JC Brand
b5a43f8177 Fix issues around chatroom textarea height and responsiveness 2018-01-26 20:25:38 +01:00
JC Brand
d1b1433e69 Don't set min width since the chatbox is now reponsive 2018-01-26 19:52:32 +01:00
JC Brand
5a9fd6c28d Minor improvements on the minimized chat toggle. 2018-01-26 19:34:24 +01:00
JC Brand
24afd73842 Various tweaks (margins and otherwise) around responsiveness 2018-01-26 15:32:31 +01:00
JC Brand
808155bc3c Place chat boxes inside bootstrap rows
instead of the other way around.
2018-01-26 14:41:50 +01:00
JC Brand
7f8b42faf0 Some work on bundling bootstrap within the css files.
Will likely later have to create versions which exclude bootstrap
2018-01-25 16:52:01 +01:00
JC Brand
799b53c098 Fix chatbox width for narrower viewports 2018-01-25 16:33:08 +01:00
JC Brand
3cee6a5650 mockup.css is no more. 2018-01-25 16:11:48 +01:00
JC Brand
97e3199508 Start moving media queries to sass files 2018-01-25 12:28:24 +01:00
JC Brand
6914ec61dd Move fullscreen styles from mockup.css to sass files 2018-01-25 12:14:20 +01:00
JC Brand
5568ac5a30 Remove pure.css 2018-01-23 20:55:00 +01:00
JC Brand
221693b2b5 Take .fullscreen class into consideration in css 2018-01-23 20:50:28 +01:00
JC Brand
e6d5631452 Start moving css from mockup.css into the core sass files 2018-01-23 14:34:05 +01:00