muxator
24abd9ca07
formatting: dos2unix on admin.css
...
In preparation for next commit. I was not able to find other non-vendorized
files that were in DOS format and legitimately needed to be converted.
No functional changes.
2019-10-20 02:50:01 +02:00
Tristram Gräbener
357780d573
Display the version in the web interface
...
In the settings drop-down this adds an “About” section that also shows
the commit if "exposeVersion" is set to true.
Fixes #2968
2019-04-15 23:17:34 +00:00
Tristram Gräbener
8453f07205
Chat bubble: by default hide in CSS
...
The current behaviour is to show the chat bubble and hide if chat is
disabled.
Because of this, the bubble appears wrongfully for a short time.
With this PR, by default it is hidden and displayed only if chat is
enabled.
Fixes : #3088
2019-04-15 23:14:47 +00:00
Sebastian Castro
d3d1fd21bb
fonts: add pencil, link and table icon
...
Preparatory work for introducing colibris skin
2018-11-08 21:56:13 +01:00
Sebastian Castro
e80f9a6f59
pad.css: group togheter three very similar rules.
...
a) these rules:
[class^="icon-"]:before
[class*=" icon-"]:before
b) were the same as this one:
[data-icon]:before
except the rules in b) had a "content: attr(data-icon)" rule, too.
This commit groups all of them together, and gets rid of the "attr(data-icon)".
The commit that introduced these rules in the first place, and that are now
partially reverted, was 9aea689438
(move tiny bit
of font awesome we actually use into pad.css) from 2014-11-19.
Preparatory work for introducing colibris skin
2018-11-08 21:56:11 +01:00
muxator
9daade0b95
fix: line numbers was not aligned with text
...
This change partially reverts 0a9d02562d
, which got released in 1.6.4
due to #3280 .
Text size and line alignment are now reverted back to their 1.6.3
appearance (thus stay non customizable, for now).
Fixes #3378
2018-04-13 18:32:39 +02:00
John McLear
b16e7ad25e
unbreak Safari iOS line wrapping
...
fixes f5810957b4 (diff-f639eb4efeaabf5624f3229daa1e88cd)
2018-04-07 18:11:24 +01:00
John McLear
fba2bf4df9
Update iframe_editor.css
2018-04-07 17:50:45 +01:00
John McLear
86ec963775
Fixes #3137
...
#3137
2018-04-06 13:52:04 +01:00
John McLear
f15c7d7186
Merge pull request #3280 from lmagniez/ImprovedReadibility
...
Improved readibility
2018-04-03 17:22:08 +01:00
John McLear
83ce73b77b
Merge pull request #3134 from psaavedra/develop
...
WA added in #1766 is not longer needed
2018-04-03 13:10:19 +01:00
Loïck Magniez
38cbff11a1
Adapted the padding due to the font-size modification
2017-11-23 16:24:08 +01:00
Loick Magniez
54e834194b
Changed the color palette and changed the pad's font size to 16px
2017-11-22 16:04:17 +01:00
Jan Holub
8bd8be97b9
Added support for the Montserrat Font as discussed in #3201 ( #3205 )
...
* Added support for the Montserrat Font as discussed in #3201
I chose a thin version of the Font (namely Montserrat Light) as the regular font and Montserrat Regular as the bold version. The thin fonts just look better in my opinion.
2017-07-12 12:21:48 -03:00
Luiza Pagliari
8c57c8d0d6
Merge pull request #3206 from 00SteinsGate00/RobotoMono
...
Added RobotoMono as a more modern and pretty monospaced font
2017-07-12 08:02:08 -03:00
Jan Holub
7029248a76
Added RobotoMono as a more modern and pretty monospaced font, addressing #3201
...
I added RobotoMono-Regular and RobotoMono-Bold as TrueTypeFont files and included them into the list. I tred to stay in alphabetical order where possible.
The author of #3201 was asking for a more modern monospaced font.
2017-06-21 23:44:23 +02:00
Luiza Pagliari
009cd31243
[feature] Create option to automatically reconnect after a few seconds
...
On some erros that display a modal with "Force reconnect" button, allow
Etherpad to automatically reload pad after a few seconds. Amount of
seconds is defined on settings.json.
Still need to create tests for this feature, and implement i18n.
2017-04-04 11:09:24 -03:00
Pablo Saavedra
f5810957b4
This WA is not longer required in the newest Chrome see comments in the issue: ether#2078
...
The hack is still necessary in Firefox 51
2017-02-02 13:53:32 +01:00
Dan Bornstein
0a9d02562d
Handle relative paths properly, when @import
ing.
2016-09-09 12:59:02 -07:00
Dan Bornstein
d7940cf8c5
Harmonize list- and indent-related CSS in the pad editor and timeslider.
...
* Add a new file `lists_and_indents.css` to hold the common CSS.
* Remove the corresponding CSS from `iframe_editor.css`, replacing it with
an `@import` of the new file.
* Remove the list/indent code from `timeslider.css`, which was _unlike_ the
corresponding editor CSS code, again replacing it with an `@import` of the
new file.
2016-09-09 12:33:46 -07:00
LokeshN
a8d5dc0693
Issue #2960 - deactivate settings.json
...
Deactivate settings.json in Admin dashboard
2016-05-22 21:12:21 +05:30
Brian Lim
aaa28640cf
CSS Default Font Colors for Issue 2853
2016-01-22 19:42:06 -05:00
Stefan
442f2a08f7
Merge pull request #2774 from ether/timeslider-fix
...
Timeslider: Fix "Return to pad" button
2015-09-16 16:07:37 +02:00
Robin Buse
04a26a3e24
Timeslider: Fix "Return to pad" button
...
Closes #2768
2015-09-03 23:04:40 +02:00
Luiza Pagliari
0677501d0b
Removing style that makes editor scroll to the top on iOS without any action from the user
2015-08-04 07:46:46 -07:00
Luiza Pagliari
8a0a1a65b1
Adding missing code to make toolbar be fixed on top/bottom of the screen for iOS devices.
...
This commit complements 9ccaeb5
.
2015-07-07 16:54:11 -03:00
Luiza Pagliari
47c4ca9c29
Fixing chat on bottom of the page for mobile devices
2015-07-03 18:38:46 -03:00
Luiza Pagliari
9ccaeb585b
Fixing toolbar on top of the page for mobile devices
2015-07-02 13:03:45 -07:00
Luiza Pagliari
6ed85b8787
Fixing @font-face src path to be able to use font icons on plugins when minify is on.
...
This is a commit similar to 56ce8e8
, which did the same for 'opendyslexic'.
2015-06-24 14:32:10 -03:00
0ip
9b85b8dc98
Fix popup border
2015-05-04 22:18:34 +02:00
John McLear
0a9c631410
better fix for #2625
2015-05-01 20:44:36 +01:00
John McLear
27aa71f3a4
IE list fixes
2015-04-11 13:16:45 +01:00
John McLear
7b86eb09bc
new fix for #1766
2015-04-08 09:24:19 +01:00
John McLear
7e99724fec
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
2015-04-06 13:19:42 +01:00
John McLear
e027083136
timeslider settings for fonts
2015-04-05 15:18:36 +01:00
John McLear
56ce8e80ac
hacky fix for opendyslexic
2015-04-05 14:50:53 +01:00
John McLear
41bb4ef094
support for open dyslexic font
2015-04-05 14:03:09 +01:00
John McLear
db0bcdd696
fix issue where focus on timeslider wouldnt work
2015-04-05 13:39:20 +01:00
John McLear
644536b27b
fix for #2574
2015-04-02 13:16:49 +01:00
John McLear
24e6e1728a
I came to bring the rain.. Let me get my coat... Fix focus on timeslider import export
2015-03-31 15:00:43 +01:00
John McLear
73073dcbc1
Timeslider accessibility and Bugfixes
2015-03-31 14:47:00 +01:00
John McLear
0f0a6c73ac
make user list a document so it's easy to navigate by screen readers
2015-03-31 14:11:49 +01:00
John McLear
ef38bcad9f
make buttons i18n friendly and a better experience
2015-03-31 13:57:18 +01:00
John McLear
f9071aebe6
fix issue with showControls false not working
2015-03-30 14:56:35 +01:00
John McLear
6b88c037b8
fix firefox button styling
2015-03-26 14:11:37 +00:00
John McLear
5761e998de
first semi working alt f9 functionality
2015-03-25 11:03:45 +00:00
John McLear
56dbad41ad
a should always have white space pre-wrap stops caret walking in chrome on them
2015-03-04 17:46:49 +00:00
John McLear
1c044588e6
mobile stylings for chat always on screen
2015-02-22 17:56:44 +00:00
John McLear
26ae375727
minor css polish for user input
2015-02-09 19:53:32 +00:00
John McLear
5245d2b797
and even mroe polish
2015-02-09 18:36:11 +00:00
John McLear
8c6507e78c
more styling stuff
2015-02-09 18:01:45 +00:00
John McLear
4af46921e1
better css
2015-02-09 17:37:20 +00:00
John McLear
036dea3d0f
styling
2015-01-21 17:25:06 +00:00
John McLear
17fa87552d
styling
2015-01-21 15:48:21 +00:00
John McLear
13eff60dfe
mheh I suck at css 0ip would do a way better job of this
2015-01-19 02:13:34 +00:00
John McLear
63c65f784b
semi working example
2015-01-19 01:45:49 +00:00
John McLear
230302b132
fix timeslider stars and frontend tests, needs css polish
2015-01-01 22:40:45 +00:00
John McLear
036b7d2890
Merge pull request #2418 from ether/etherpad-export-and-import
...
Full Pad portability (Export/Import)
2014-12-31 13:32:09 +00:00
John McLear
335bf3dc4a
more line polish
2014-12-31 01:46:53 +00:00
Stefan
5df638bfac
Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected
...
Notify user if cookies can't be created
2014-12-30 14:54:43 +01:00
John McLear
3773b6346b
semi working requires browser refresh
2014-12-29 20:57:58 +01:00
Gared
018821e98c
Use camel case
2014-12-28 22:20:09 +01:00
Gared
2307c6fbda
Notify user if cookies can't be created
2014-12-28 15:02:56 +01:00
John McLear
dd09f6144b
Merge pull request #2398 from ether/indentLevels
...
Indent levels
2014-12-27 23:27:11 +01:00
John McLear
c276343216
timeslider fixes
2014-12-27 22:31:23 +01:00
John McLear
b1f29b914c
minor ts bg fix
2014-12-27 22:05:35 +01:00
John McLear
ae22332f71
removing dokuwiki
2014-12-27 14:08:45 +01:00
John McLear
9d66a446dc
support indentation up to 16 levels and dont go back afterwards
2014-12-27 13:18:58 +01:00
John McLear
88ab74b1e9
fix flowing of items in editbar
2014-12-24 17:54:13 +00:00
John McLear
653cc6c87f
this class was in before, it is used to show when a style is applied to a piece of content
2014-12-09 14:57:18 +00:00
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