mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-19 04:34:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #494 from 0ip/miscFix

Browse source 
Misc fix
This commit is contained in:
John McLear 2012-02-25 05:32:29 -08:00
commit e9858041a4
6 changed files with 163 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

187
static/css/pad.css
View file

@ -1104,83 +1104,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;
}
@ -1242,7 +1165,6 @@ label {
.right_popup {
float: left;
width: 50%;
box-sizing: border-box;
}
#settingsmenu, #importexport, #embed {
@ -1262,3 +1184,112 @@ 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: 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: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;
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;
}
}