mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 18:36:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Harmonize list- and indent-related CSS in the pad editor and timeslider.

Browse source 
* 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.
This commit is contained in:
Dan Bornstein 2016-09-09 12:33:46 -07:00
parent a5a7ebea3d
commit d7940cf8c5
3 changed files with 212 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

88
src/static/css/timeslider.css
View file

@ -1,3 +1,9 @@
@import url('css/lists_and_indents.css');
p.pblort {
height: 100px;
}
#editorcontainerbox {
overflow: auto;
top: 40px;
@ -90,7 +96,7 @@
cursor:hand;
}
#playpause_button_icon:before {
line-height:44px;
line-height:44px;
padding-left:2px;
font-family: fontawesome-etherpad;
content: "\e82c";
@ -105,7 +111,7 @@
border: solid 1px #666;
}
.pause:before {
line-height:44px;
line-height:44px;
padding-left:2px;
font-family: fontawesome-etherpad;
content: "\e82e" !important;
@ -256,83 +262,6 @@ stepper:active{
#padeditor {
position: static
}
/* lists */
.list-bullet2,
.list-indent2,
.list-number2 {
margin-left: 3em
}
.list-bullet3,
.list-indent3,
.list-number3 {
margin-left: 4.5em
}
.list-bullet4,
.list-indent4,
.list-number4 {
margin-left: 6em
}
.list-bullet5,
.list-indent5,
.list-number5 {
margin-left: 7.5em
}
.list-bullet6,
.list-indent6,
.list-number6 {
margin-left: 9em
}
.list-bullet7,
.list-indent7,
.list-number7 {
margin-left: 10.5em
}
.list-bullet8,
.list-indent8,
.list-number8 {
margin-left: 12em
}
/* unordered lists */
UL {
list-style-type: disc;
margin-left: 1.5em;
}
UL UL {
margin-left: 0 !important
}
.list-bullet2,
.list-bullet5,
.list-bullet8 {
list-style-type: circle
}
.list-bullet3,
.list-bullet6 {
list-style-type: square
}
.list-indent1,
.list-indent2,
.list-indent3,
.list-indent5,
.list-indent5,
.list-indent6,
.list-indent7,
.list-indent8 {
list-style-type: none
}
/* ordered lists */
OL {
list-style-type: decimal;
margin-left: 1.5em;
}
.list-number2,
.list-number5,
.list-number8 {
list-style-type: lower-latin
}
.list-number3,
.list-number6 {
list-style-type: lower-roman
}
button{
margin:0;
@ -348,4 +277,3 @@ button::-moz-focus-inner {
button:focus{
border: 1px solid #666;
}