mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-24 09:26:14 -04:00
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
This commit is contained in:
Egil Moeller
commit
ce5d2d8685
35 changed files with 1839 additions and 1037 deletions
|
|
@ -65,6 +65,7 @@ a img
|
|||
{
|
||||
text-decoration: none;
|
||||
color: #ccc;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
#editbar ul li a span
|
||||
|
|
@ -75,11 +76,13 @@ a img
|
|||
|
||||
#editbar ul li:hover {
|
||||
background: #fff;
|
||||
background: linear-gradient(#f4f4f4, #e4e4e4);
|
||||
}
|
||||
|
||||
#editbar ul li:active {
|
||||
background: #eee;
|
||||
background: linear-gradient(#ddd, #fff);
|
||||
box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
|
||||
}
|
||||
|
||||
#editbar ul li.separator
|
||||
|
|
@ -798,12 +801,11 @@ ul#colorpickerswatches li:hover
|
|||
#chatlabel
|
||||
{
|
||||
font-size:13px;
|
||||
line-height:16px;
|
||||
font-weight:bold;
|
||||
color:#555;
|
||||
text-decoration: none;
|
||||
position: relative;
|
||||
bottom: 3px;
|
||||
margin-right: 3px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#chatinput
|
||||
|
|
@ -816,8 +818,8 @@ ul#colorpickerswatches li:hover
|
|||
#chaticon
|
||||
{
|
||||
z-index: 400;
|
||||
position:absolute;
|
||||
bottom:0px;
|
||||
position: fixed;
|
||||
bottom: 0px;
|
||||
right: 20px;
|
||||
padding: 5px;
|
||||
border-left: 1px solid #999;
|
||||
|
|
@ -838,8 +840,7 @@ ul#colorpickerswatches li:hover
|
|||
{
|
||||
color:#555;
|
||||
font-size:9px;
|
||||
position:relative;
|
||||
bottom: 2px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#titlebar
|
||||
|
|
@ -877,40 +878,6 @@ ul#colorpickerswatches li:hover
|
|||
margin-left: 3px;
|
||||
margin-right: 3px;
|
||||
margin-top:2px;
|
||||
}
|
||||
|
||||
|
||||
/* resizable stuff for chat */
|
||||
.ui-resizable {
|
||||
position: relative;
|
||||
}
|
||||
.ui-resizable-handle {
|
||||
position: absolute;
|
||||
font-size: 0.1px;
|
||||
z-index: 99999;
|
||||
display: block;
|
||||
|
||||
}
|
||||
|
||||
.ui-resizable-nw {
|
||||
background-image: url("../../static/img/etherpad_lite_icons.png");
|
||||
background-position: 0 -416px;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% auto;
|
||||
cursor: nw-resize;
|
||||
height: 17px;
|
||||
left: 3px;
|
||||
top: 3px;
|
||||
width: 17px;
|
||||
}
|
||||
|
||||
.ui-resizable-ne
|
||||
{
|
||||
cursor: ne-resize;
|
||||
width: 9px;
|
||||
height: 9px;
|
||||
right: -5px;
|
||||
top: -5px;
|
||||
}
|
||||
|
||||
.exporttype{
|
||||
|
|
@ -1060,6 +1027,8 @@ margin-top: 1px;
|
|||
.buttonicon-chat {
|
||||
background-position: 0px -102px;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
margin: 0 !important;
|
||||
}
|
||||
.buttonicon-showusers {
|
||||
background-position: 0px -183px;
|
||||
|
|
@ -1085,7 +1054,10 @@ width:33px !important;
|
|||
}
|
||||
|
||||
#online_count{
|
||||
color: #999;
|
||||
color: #888;
|
||||
font-size: 11px;
|
||||
line-height: 18px;
|
||||
position: fixed;
|
||||
}
|
||||
|
||||
#qr_center {
|
||||
|
|
@ -1104,83 +1076,6 @@ width:33px !important;
|
|||
transform: scale(1.5);
|
||||
}
|
||||
|
||||
@media screen and (max-width: 960px) {
|
||||
.modaldialog {
|
||||
position: relative;
|
||||
margin: 0 auto;
|
||||
width: 80%;
|
||||
top: 40px;
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 600px) {
|
||||
#editbar ul li {
|
||||
padding: 4px 1px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
|
||||
#editbar ul li {
|
||||
padding: 4px 3px;
|
||||
}
|
||||
#editbar ul#menu_right > li {
|
||||
padding: 4px 8px;
|
||||
margin-top: 2px;
|
||||
}
|
||||
#chaticon {
|
||||
opacity: .8;
|
||||
}
|
||||
#users {
|
||||
right: 4px;
|
||||
}
|
||||
#mycolorpicker {
|
||||
left: -72px; /* #mycolorpicker:width - #users:width */
|
||||
}
|
||||
#editorcontainer {
|
||||
margin-bottom: 33px;
|
||||
}
|
||||
#editbar ul#menu_right {
|
||||
background: #f7f7f7;
|
||||
background: linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
height: 32px;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
border-top: 1px solid #ccc;
|
||||
}
|
||||
#editbar ul#menu_right li:not(:last-child) {
|
||||
display: none;
|
||||
}
|
||||
#editbar ul#menu_right li:last-child {
|
||||
height: 24px;
|
||||
border-radius: 0;
|
||||
margin-top: 0;
|
||||
border: 0;
|
||||
float: right;
|
||||
}
|
||||
#chaticon {
|
||||
bottom: 0;
|
||||
right: 55px;
|
||||
border-right: none;
|
||||
border-radius: 0;
|
||||
background: #f7f7f7;
|
||||
background: linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
border: 0;
|
||||
}
|
||||
#chatbox {
|
||||
bottom: 32px;
|
||||
right: 0;
|
||||
border-top-right-radius: 0;
|
||||
}
|
||||
#editbar ul li a span {
|
||||
top: -3px;
|
||||
}
|
||||
#usericonback {
|
||||
margin-top: 4px;
|
||||
}
|
||||
}
|
||||
.rtl{
|
||||
direction:RTL;
|
||||
}
|
||||
|
|
@ -1189,10 +1084,9 @@ width:33px !important;
|
|||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
/* fix for misaligned labels */
|
||||
label {
|
||||
position: relative;
|
||||
bottom: 1px;
|
||||
/* fix for misaligned checkboxes */
|
||||
input[type=checkbox] {
|
||||
vertical-align: -1px;
|
||||
}
|
||||
|
||||
.right {
|
||||
|
|
@ -1234,17 +1128,11 @@ label {
|
|||
margin: 5px 0;
|
||||
}
|
||||
|
||||
.left_popup {
|
||||
.column {
|
||||
float: left;
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.right_popup {
|
||||
float: left;
|
||||
width: 50%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
#settingsmenu, #importexport, #embed {
|
||||
position: absolute;
|
||||
top: 55px;
|
||||
|
|
@ -1262,3 +1150,121 @@ label {
|
|||
background: #eee !important;
|
||||
background: linear-gradient(#EEE, #F0F0F0) !important;
|
||||
}
|
||||
|
||||
.stickyChat {
|
||||
background-color: #f1f1f1 !important;
|
||||
right: 0px !important;
|
||||
top: 36px;
|
||||
border-radius: 0px !important;
|
||||
height: auto !important;
|
||||
border: none !important;
|
||||
border-left: 1px solid #ccc !important;
|
||||
width: 185px !important;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 960px) {
|
||||
.modaldialog {
|
||||
position: relative;
|
||||
margin: 0 auto;
|
||||
width: 80%;
|
||||
top: 40px;
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 600px) {
|
||||
#editbar ul li {
|
||||
padding: 4px 1px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
|
||||
#editbar ul li {
|
||||
padding: 4px 3px;
|
||||
}
|
||||
#users {
|
||||
right: 0;
|
||||
top: 36px;
|
||||
bottom: 33px;
|
||||
border-radius: none;
|
||||
}
|
||||
#mycolorpicker {
|
||||
left: -72px; /* #mycolorpicker:width - #users:width */
|
||||
}
|
||||
#editorcontainer {
|
||||
margin-bottom: 33px;
|
||||
}
|
||||
#editbar ul#menu_right {
|
||||
background: #f7f7f7;
|
||||
background: linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
height: 32px;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
border-top: 1px solid #ccc;
|
||||
}
|
||||
#editbar ul#menu_right li:last-child {
|
||||
height: 24px;
|
||||
border-radius: 0;
|
||||
margin-top: 0;
|
||||
border: 0;
|
||||
float: right;
|
||||
}
|
||||
#chaticon {
|
||||
bottom: 3px;
|
||||
right: 55px;
|
||||
border-right: none;
|
||||
border-radius: 0;
|
||||
background: #f7f7f7;
|
||||
background: linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
border: 0;
|
||||
}
|
||||
#chatbox {
|
||||
bottom: 32px;
|
||||
right: 0;
|
||||
border-top-right-radius: 0;
|
||||
border-right: none;
|
||||
}
|
||||
#editbar ul li a span {
|
||||
top: -3px;
|
||||
}
|
||||
#usericonback {
|
||||
margin-top: 4px;
|
||||
}
|
||||
#qrcode {
|
||||
display: none;
|
||||
}
|
||||
#editbar ul#menu_right li:not(:last-child) {
|
||||
display: block;
|
||||
}
|
||||
#editbar ul#menu_right > li {
|
||||
background: none;
|
||||
border: none;
|
||||
margin-top: 4px;
|
||||
padding: 4px 8px;
|
||||
}
|
||||
.selected {
|
||||
background: none !important;
|
||||
}
|
||||
#timesliderlink {
|
||||
display: none !important;
|
||||
}
|
||||
.popup {
|
||||
border-radius: 0;
|
||||
box-sizing: border-box;
|
||||
width: 100%;
|
||||
}
|
||||
#settingsmenu, #importexport, #embed {
|
||||
left: 0;
|
||||
top: 0;
|
||||
bottom: 33px;
|
||||
right: 0;
|
||||
}
|
||||
.separator {
|
||||
display: none;
|
||||
}
|
||||
#online_count {
|
||||
line-height: 24px;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue