libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-21 06:52:46 +01:00
Code Issues Projects Releases Wiki Activity
6427 commits 207 branches 105 tags 123 MiB
Commit graph

319 commits

Author SHA1 Message Date
John McLear
d7e980cd47 yet more minor css polish 2014-11-29 02:24:19 +00:00
John McLear
ee585f0457 color picker on mobile actually shows on screen 2014-11-29 00:32:37 +00:00
John McLear
34f7625739 a little more polish 2014-11-29 00:30:13 +00:00
John McLear
53887db872 mobile ui polish 2014-11-29 00:26:25 +00:00
John McLear
a642deaa72 gritter css fix 2014-11-28 02:25:21 +00:00
John McLear
488d6890f9 minor styling 2014-11-21 00:15:55 +00:00
John McLear
ff9a2a687f whoops fix animation not to look broken 2014-11-19 18:27:55 +00:00
John McLear
28c7b666c1 correct file links 2014-11-19 00:24:14 +00:00
John McLear
9aea689438 move tiny bit of font awesome we actually use into pad.css 2014-11-19 00:16:08 +00:00
John McLear
e821cb13fa more polish 2014-11-18 22:47:20 +00:00
John McLear
95cb721914 clean up 2014-11-18 22:41:00 +00:00
John McLear
09b08e5a72 working pause 2014-11-18 22:29:46 +00:00
John McLear
e2410e41b0 more polish 2014-11-18 22:24:16 +00:00
John McLear
a06f01c04a some timeslider styling but this wont be completed by me 2014-11-18 22:21:36 +00:00
John McLear
4a12eec3e0 a font lookup file 2014-11-18 21:10:40 +00:00
John McLear
9b5ee93bce spinning loading icons 2014-11-18 19:13:51 +00:00
John McLear
21ce9b4dd3 correct font stuff 2014-11-18 18:44:45 +00:00
John McLear
c14e1696b3 remove stuff, new files 2014-11-18 18:09:29 +00:00
John McLear
8d2fa35b3f Merge pull request #2298 from ether/reflow-toolbar-properly 
Reflow toolbar properly
 2014-11-15 15:37:28 +00:00
John McLear
07d29a5d7a Merge pull request #2219 from Gared/fix_css 
Fix position of import/export popup in timeslider
 2014-11-12 15:18:25 +00:00
John McLear
d13b6162f0 this looks way better 2014-11-06 15:50:55 +00:00
John McLear
0685e563ed working on resize 2014-11-06 15:43:21 +00:00
John McLear
7d04d7309f reflow buttons based on browser size, much better 2014-11-06 14:32:20 +00:00
Prateek Saxena
ca32ac89b6 Add a subset of FontAwesome icons using Fontello 
Most of the code here has been taken from @LaKing's #2554.

Only icons required for etherpad have been added. Here is a
list of the code points that are being used:

 0xe800 0xe801 0xe802 0xe803
 0xe804 0xe805 0xe806 0xe807
 0xe808 0xe809 0xe80a 0xe80b
 0xe80c 0xe80d 0xe80e 0xe80f
 0xe810 0xe811 0xe812 0xe813
 0xe814 0xe815 0xe816 0xe817

Their related icon names can be seen in:
/src/static/css/fontawesome-etherpad.css

Even though this patch *adds* all the required icons it only
uses them in the in toolbar. The switch to using only FontAwesome
icons and the removal of old PNG files will only happen after the
timeslider interface has been updated.

This is the first step for #2253
 2014-10-14 09:16:44 +05:30
John McLear
fb940897ee Merge pull request #2257 from 0ip/fix/user-count 
Fix broken user count
 2014-10-05 12:42:52 +01:00
0ip
29f8f13423 Prevent selection on buttons 2014-10-05 13:35:20 +02:00
0ip
5008ad10c6 Fix user count 
Still dirty, but really works.
 2014-10-05 13:14:07 +02:00
0ip
ee68d43932 Fix import/export popup margin @ timeslider 2014-10-03 17:39:15 +02:00
0ip
12c1d3b05a Fix active button ui 2014-10-03 17:35:48 +02:00
Stefan
0d95c8d1ec Revert change on position of imp/exp overlay 2014-09-14 20:26:35 +02:00
Stefan
287a7805c9 Fix position of import/export popup in timeslider 2014-08-09 14:05:04 +02:00
John McLear
2ee4e9e7fd change to line 73 2014-06-28 15:19:28 +01:00
John McLear
b657676bdd gah can only do 1/2 a fix 2014-06-24 19:02:40 +01:00
John McLear
25ace65374 don't lose comment 2014-06-24 18:46:41 +01:00
John McLear
db045c6ffd CSS fix for pasting plain-text in chrome, needs thorough testing 2014-06-24 18:45:54 +01:00
Marcel Klehr
6054cda473 Create a customizable timeslider toolbar 2014-03-30 13:02:41 +02:00
John McLear
24e96c4f8b Merge pull request #2028 from webzwo0i/remove-deadcode 
Remove deadcode
 2013-12-09 10:49:57 -08:00
John McLear
505dc70df5 Merge pull request #2013 from ether/getAttributeOnSelection 
getAttributeOnSelection function
 2013-12-09 09:46:57 -08:00
webzwo0i
020bd3915c remove empty&unused overlaysdiv 2013-12-08 17:24:12 +01:00
Luc Didry
3d8452b143 Replace tabs indentation with spaces indentation 
Some files are obviously external libraries, I didn't touch them
 2013-12-05 08:41:29 +01:00
John McLear
e9f7583793 some nice css to that reflect when a button is active 2013-11-28 17:44:37 +00:00
Marcel Klehr
5d803a0523 Fix walking caret bug 
white-space css prop must be set to pre-wrap to keep trailing spaces
fixes #1766
 2013-11-22 17:18:30 +01:00
John McLear
e35c45e9b5 make export clearly seperated from import 2013-09-21 16:22:43 +01:00
John McLear
ca680a32b6 fix padding so export icons show properly 2013-09-21 16:17:19 +01:00
John McLear
05a8ae7acc padding on import now button 2013-09-21 16:15:59 +01:00
Guillaume AMAT
96adb4d626 The #importsubmitinput button was too small and hidden its value 2013-09-21 12:39:45 +02:00
Guillaume AMAT
6de3a400e1 The import/export columns were not displayed correctly 2013-09-21 12:38:26 +02:00
daniel tygel
1cfde05139 fix .popup CSS to fit in small spaces, like thin iframe 2013-09-17 11:26:11 -06:00
Marcel Klehr
2b46bc40a1 Beautify infinite scroll 2013-09-12 16:37:37 +02:00
j@mailb.org
a554552bed Simpify CSS for sticky chat 2013-06-17 14:47:28 +02:00
John McLear
9581097dc7 remove cruft 2013-04-11 16:39:25 +01:00
John McLear
1fc906017c final css 2013-04-11 16:38:41 +01:00
John McLear
e712f7665d working solution props to dmitryu for making me not be scared of modifying div clases 2013-04-11 16:33:03 +01:00
John McLear
90c5b26e89 keep integrity on paste and better styling but new lists dont reset counter 2013-04-09 14:29:55 +01:00
John McLear
2e76bd4e50 working but then create a second list, it will be stupid, SIGH 2013-04-09 01:22:09 +01:00
John McLear
bfa233ba04 kudos to quenenni for some working CSS 2013-04-09 00:46:13 +01:00
John McLear
70a25964b6 make sure elements are supported, still doesn't assign numbers properly 2013-04-08 23:32:04 +01:00
John McLear
49cff88a48 semi working 2013-04-08 23:03:19 +01:00
John McLear
883be3d48d begin by adding some template css 2013-04-05 02:21:56 +01:00
John McLear
09b32ea694 Merge pull request #1672 from ether/feature/admin-plugins-revamp 
/admin/plugins revamp
 2013-03-27 12:05:00 -07:00
Marcel Klehr
c4d9a71156 /admin/plugins: Fix update check 2013-03-27 12:02:19 +01:00
Marcel Klehr
d01a209cbf /admin/plugins: Dry up displaying of info messages 2013-03-26 21:04:21 +01:00
Marcel Klehr
76c879bb47 /admin/plugins: Fix for smaller screens 2013-03-26 20:41:24 +01:00
Marcel Klehr
2393dcd652 Disable search until registry is loaded and fix sorting by version 
... and always display a scrollbar.
 2013-03-26 19:22:04 +01:00
Marcel Klehr
f75a839cd0 Remove plugin prefix in pluin lists and make links to plugins more clear 2013-03-26 18:39:46 +01:00
Marcel Klehr
7edfff7574 /admin/plugins: Show some text if nothing is display otherwise 2013-03-26 16:23:47 +01:00
Marcel Klehr
638cea5fd6 Install and uninstall plugins with style 
- Don't block the whole page when installing a plugin
- allow people to search and install other plugins meanwhile

Why? http://i.imgur.com/XoX6uYS.jpg
 2013-03-26 15:11:30 +01:00
Marcel Klehr
e8bae61cf5 /admin/plugins: Add progress indicators and report errors 2013-03-26 11:19:36 +01:00
Marcel Klehr
773293991b admin/plugins: Allow people to sort search results 2013-03-25 23:09:03 +01:00
John McLear
2e7a9796de option to show sticky chat on screen, note i use a literal string, how am i supposed to add a l10n title? 2013-03-24 01:12:01 +00:00
Sahil Amoli
23abafb3cb Issue #1648 - Long lines without any spaces don't wrap on Firefox, the text ends up going off screen 2013-03-20 15:48:11 -07:00
John McLear
693b9b9b94 better mobile support for gritter messages, before it was awful 2013-03-17 01:23:31 +00:00
John McLear
1e94eaa06c fix safari rtl dissapearing pad 2013-03-06 14:50:08 +00:00
John McLear
93d58b93be Update src/static/css/iframe_editor.css 2013-02-17 17:13:02 +00:00
John McLear
2f20461445 a comment 2013-02-12 00:13:47 +00:00
John McLear
5f73a5ec30 very simple fix that might break other things but stops the caret focus being moved to the end of new lines when a long string without spaces is pasted into a pad 2013-02-12 00:08:44 +00:00
0ip
8a6b3c90e2 Fix loader styling 2013-02-09 21:29:11 +01:00
0ip
8fb8f0d3b6 Change settings layout 2013-02-09 21:22:23 +01:00
0ip
40734e6776 Fix table CSS 2013-02-09 20:58:57 +01:00
0ip
b04e99bddc Tweak admin-UI 2013-02-09 17:54:39 +01:00
0ip
ef0a6ce5ff Remove top-border 2013-02-09 17:39:08 +01:00
Swen
1f348d911f Merge branch 'develop' into admin-index-plugable 2013-01-30 20:16:51 +01:00
John McLear
1c7810783c gritter now implemented 2013-01-29 01:55:36 +00:00
spcsser
80333d8e0a Added ability to add menu entries for admin pages. 2013-01-27 23:02:27 +01:00
John McLear
e811037300 Merge pull request #1411 from ether/feature/plugin-update-checker 
plugin update checker
 2013-01-26 13:36:11 -08:00
Marcel Klehr
541aeb3a98 /admin/plugins: Display an update button for all plugins that are outdated 2013-01-26 22:15:19 +01:00
John McLear
1290fa36c3 typo fix 2013-01-26 20:05:37 +00:00
John McLear
9d0672c1c8 not a perfect css fix but stops the overflow when screen is less than 1000px 2013-01-26 20:04:33 +00:00
Marcel Klehr
3e793b8a63 [/admin/plugins] remove progress history 2013-01-24 23:00:56 +01:00
Marcel Klehr
fa55cd4759 [/admin/plugins] Add real-time on keypress search 
also, I reduced the size of the activity indicator
 2013-01-24 22:39:52 +01:00
Marcel Klehr
2eccaa2afd Add a uniform menu to all admin pages 2013-01-24 18:46:15 +01:00
Marcel Klehr
3719ce7c5d [admin] Make links prettier 2013-01-24 13:50:49 +01:00
John McLear
33e0ec2097 Merge pull request #1334 from mluto/load-more-chat-messages 
Load more than 100 chat messages using a 'load more'-link
 2013-01-13 10:31:45 -08:00
John McLear
730266256c fix #1341 by adding css to stop highlighting 2013-01-10 15:14:10 +00:00
mluto
bc05f9eb0a converted load-more-link to button, added loading-gif, fixed typo 2013-01-07 19:15:55 +01:00
mluto
5f81daed0a Added link to load more chat-messages using new GET_CHAT_MESSAGES 2013-01-07 17:36:03 +01:00
0ip
8d0ef88baf Adjust select width 
looks better :)
 2012-12-05 12:55:48 +01:00
John McLear
bef25b40f8 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password 2012-12-03 11:37:01 +00:00
Iván Eixarch
657322db91 fixed git merge confict 2012-12-03 01:39:59 +01:00
John McLear
a74defdab7 Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password 2012-12-02 17:07:23 +00:00
John McLear
c9a5e55654 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password 2012-12-02 17:06:33 +00:00
root
3cdf66c2f7 first effort to move into templates but javascript is broken so dont pull 2012-12-02 17:03:56 +00:00
John McLear
c445197e7f Update src/static/css/pad.css 2012-11-27 15:10:36 +00:00
John McLear
f880473360 remember the styling for the pasword prompt 2012-11-26 20:54:28 +00:00
Wikinaut
a49bab5dae fix timeslider rightstep button position 2012-11-26 08:54:13 +01:00
Iván Eixarch
d7cca602df Added message translatable about features importing without abiword 2012-11-26 03:18:47 +01:00
0ip
6b6315ca3c Tidy up settings 2012-11-14 14:26:49 +01:00
0ip
b28afe4c47 Adjust border-color of #sidediv 2012-11-13 12:42:52 +01:00
John McLear
7febd3ff5c Resolve #583 
This kinda resolves the issue but not in a very graceful way.  It means any numbered items > 99 will still be cropped.

The problem is due to no padding/margin and then needing to specify margin.

you can replicate this bug with

```
<body style="padding:0; margin:0">
<style type="text/css">
li:nth-child(n+10){
  margin-left:1.6em;
}
</style>
<ol style="list-style-type: decimal;margin-left:1.5em;padding:0;">
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>




</ol>
</body>
```
 2012-11-06 12:37:35 +00:00
johnyma22
1d055f2cd4 make stuff work 2012-11-02 15:15:13 +00:00
johnyma22
f6fa897a4e actually using text area is a lot less stupid 2012-11-02 14:31:52 +00:00
johnyma22
89e38ed4c2 Start putting file system together for admin settings, no where near complete 2012-11-02 13:16:15 +00:00
johnyma22
d30bb6d892 fixes a tiny css bug #1077 2012-10-30 21:57:15 +00:00
johnyma22
4f85bf09cc make anything less than 400px span 2 lines on toolbar and make popups appear below this 2012-10-29 19:20:02 +00:00
Marcel Klehr
eb6be84150 Fix html/css 2012-07-15 16:03:12 +02:00
Marcel Klehr
4901adeac7 Fix timeslider. 2012-07-14 15:54:44 +02:00
Marcel Klehr
1466fa03a4 Fix some minor mistakes. 2012-07-14 15:54:20 +02:00
Marcel Klehr
8ab12ee69e Only disable toolbar. 
Make content available and allow scrolling
 2012-07-14 14:46:02 +02:00
Marcel Klehr
6da6a7f0d8 Use nice editbar popups for connection status instead of srceen-blocking modals. 2012-07-13 08:23:22 +02:00
Egil Moeller
15a7d24450 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
 2012-05-29 21:26:12 +02:00
0ip
d4b4ca0a5c Center user icon and fix overlapping chat 2012-05-23 20:40:24 +03:00
0ip
185a3bface Add def. bg to <select> and remove useless style 2012-05-20 20:19:16 +03:00
0ip
fe0ea23299 Fix userlist now showing up 2012-05-20 16:02:51 +02:00
0ip
caa56dd32a Add non-floating popups 2012-05-20 15:59:51 +02:00
0ip
19cf43d0a3 Style select (useful for plugins) 2012-05-20 15:38:12 +02:00
0ip
750b9d44df Style selected text 2012-05-20 15:37:03 +02:00
0ip
fbee7dabcf Add grouped buttons 2012-05-20 15:29:10 +02:00
0ip
afe060e2b8 Remove even more old code 2012-05-20 14:53:30 +02:00
0ip
0d68cd23ba Remove old CSS code 2012-05-20 14:48:02 +02:00
John McLear
fbc2cb32b3 Merge pull request #705 from johnyma22/removeWordle 
Remove wordle
 2012-05-19 05:58:38 -07:00
John McLear
53bfc380af Merge pull request #703 from cweider/remove-onclick 
Remove onclick
 2012-05-19 05:41:49 -07:00
Egil Moeller
fc946ffc33 Hide editing buttons when in readonly mode 2012-05-17 12:03:38 +02:00
Chad Weider
9942c577dc Patch tablet styling. 2012-05-13 15:33:22 -07:00
Chad Weider
5d0c853889 Remove unnecessary styles. 2012-05-13 15:33:22 -07:00
Chad Weider
f802a79da6 Make styles less restrictive. 2012-05-13 15:33:22 -07:00
Chad Weider
818c3ef40d Shift button appearance onto anchor. 2012-05-13 15:33:22 -07:00
Chad Weider
089e0227fd Shift editbar styles around. 2012-05-13 15:33:22 -07:00
Chad Weider
1ea889bfab Anchors are not icons 2012-05-13 15:33:22 -07:00
Chad Weider
ab8b2cae21 Remove nonsense styles. 2012-05-13 15:33:22 -07:00
John McLear
def904dbed remove wordle 2012-05-13 20:20:18 +01:00
John McLear
c70d88eedc Merge pull request #667 from fourplusone/feature/cleaner_code 
Removing unused code - All looks good, some minor tweeks are probably worthwhile  in the future.
 2012-05-13 06:51:58 -07:00
0ip
64db697558 Fixed typos 2012-04-30 16:54:19 +02:00
0ip
23cdb2a5c6 Removed QR-Code 2012-04-30 15:54:21 +02:00
0ip
96eb8ac004 100% is not needed here http://ragefac.es/416 2012-04-29 21:19:34 +03:00
0ip
2525f20ff4 Tidied up highlighting for currently opened module 2 2012-04-29 02:48:47 +02:00
0ip
4b272fe2e1 Tidied up highlighting for currently opened module 2012-04-29 01:00:31 +02:00
Matthias Bartelmeß
07ee836946 set view zoom is unused 2012-04-20 12:19:09 +02:00
Matthias Bartelmeß
e661f653b1 sharebox and Feedback are not used. Removing them 2012-04-20 12:15:09 +02:00
0ip
ef88d2798e Restore overwritten plugin manager UI 2012-04-19 17:00:29 +02:00
Egil Moeller
f80f9fc59f Merge commit 'd5120c9' into pita 2012-04-17 22:34:45 +02:00
0ip
8fa54e2402 admin interface styling and sensibility 2012-04-11 19:44:18 +02:00
0ip
50c79df272 prefixed css files containing css3 attributes due to recently removed prefixfree.js 2012-04-09 17:52:43 +02:00
John McLear
f9d8cea114 Merge pull request #612 from levu42/bug-user-scroll 
Userlists now scrolls if there are too many users
 2012-04-09 06:37:03 -07:00
0ip
c3095bbd1b improved userlist ux (prevent overlapping of objects) 2012-04-09 15:16:40 +02:00
levu
9e063341ce fix for bug 'userlist not scrolling' 2012-04-08 16:22:00 +02:00
Matthias Bartelmeß
151f1a0d71 Merge branch 'develop' into timeslider_authors 2012-04-05 21:54:26 +02:00
Matthias Bartelmeß
404ce9e452 css fixes 2012-04-05 21:53:04 +02:00
Matthias Bartelmeß
9e042ee942 Merge branch 'develop' into timeslider_authors 
Conflicts:
	src/static/css/pad.css
	src/templates/timeslider.html
 2012-04-05 21:47:59 +02:00
johnyma22
d5120c98d0 very quick admin interface styling and sensibility 2012-04-05 18:22:53 +01:00
johnyma22
66fdacf9cf move css out of html 2012-04-05 18:04:17 +01:00
Egil Moeller
ba00144bcd Button styling bugfix 2012-04-01 15:20:51 +02:00
Egil Moeller
08cc3e128f Bugfix for timeslider styling 2012-04-01 14:33:39 +02:00
Egil Moeller
33c53e61c2 Merge branch 'johnyma22' 
Conflicts:
	node/utils/Minify.js
	src/static/js/pad.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_savedrevs.js
	static/css/timeslider.css
	static/pad.html
 2012-04-01 13:27:38 +02:00
Egil Moeller
b74447aa3c Styling generalization - use classes instead of id:s where applicable 2012-03-28 19:20:07 +02:00
Matthias Bartelmeß
e463273901 added UI to for unnamed authors 2012-03-25 15:48:31 +02:00
Matthias Bartelmeß
94a9795a04 CSS candy 2012-03-25 00:29:03 +01:00
Matthias Bartelmeß
371aee2e19 Added timeslider author UI 2012-03-24 20:35:45 +01:00
Egil Moeller
ce5d2d8685 Merge branch 'pita' 
Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js
 2012-03-02 22:00:20 +01:00
Egil Moeller
1239ce7f28 The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00