John McLear
c1fdd7ff79
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-12-01 15:10:17 +00:00
John McLear
c539cc7d6b
styling of global view colum
2014-12-01 15:10:03 +00:00
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
