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 1

reverted John's commits, added labels and tweaked popups to act more dynamically

Browse source
This commit is contained in:
Robin 2012-01-28 17:38:52 +01:00
parent 158fd6c281
commit d872b42e31
3 changed files with 96 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

183
static/css/pad.css
View file

@ -741,56 +741,9 @@ a#topbarmaximize {
width: 100%;
}
#settingsmenu {
position:absolute;
top:40px;
right:20px;
width:400px;
height:135px;
z-index:500;
padding:10px;
border-radius:6px;
background:black;
background:rgba(0, 0, 0, 0.7);
color: #fff;
font-size:14px;
display:none;
}
#settingsmenu p {
margin: 5px 0;
}
#embed {
display:none;
position:absolute;
top:40px;
font-size:14px;
width:400px;
right: 20px;
z-index: 500;
background-color: #000;
color: white;
background-color: rgb(0,0,0);
background-color: rgba(0,0,0,0.7);
padding: 10px;
-moz-border-radius: 6px;
border-radius: 6px;
}
.right {
float:right;
}
#embed input[type=text] {
width: 100%;
padding: 5px;
box-sizing: border-box;
-moz-box-sizing: border-box;
display:block;
margin-top: 10px;
}
ul#colorpickerswatches
{
padding-left: 3px;
@ -982,38 +935,6 @@ position: relative;
top: -5px;
}
#importexport{
position:absolute;
top:40px;
font-size:14px;
width:450px;
right: 20px;
z-index: 500;
background-color: #000;
color: white;
background-color: rgb(0,0,0);
background-color: rgba(0,0,0,0.7);
padding: 10px;
-moz-border-radius: 6px;
border-radius: 6px;
height:190px;
display:none;
}
#import{
position:absolute;
width:240px;
left:10px;
line-height:20px;
}
#export{
position:absolute;
width:180px;
right:10px;
line-height:20px;
}
.exporttype{
margin-top: 2px;
background-repeat:no-repeat;
@ -1065,10 +986,6 @@ position: relative;
background-position: 0px -459px;
}
#export a{
text-decoration: none;
}
#importstatusball{
display:none;
}
@ -1141,10 +1058,6 @@ width:33px !important;
color: #999;
}
label[for=readonlyinput] {
margin: 0 10px 0 2px;
}
#qr_center {
margin: 10px 10px auto 0;
text-align: center;
@ -1250,43 +1163,81 @@ label[for=readonlyinput] {
direction:RTL;
}
#settingslocal{
left:10px;
position:absolute;
width:200px;
#chattext p {
word-wrap: break-word;
}
#settingseveryone{
position:absolute;
right:10px;
width:200px;
/* fix for misaligned labels */
label {
position: relative;
bottom: 1px;
}
#settingsline{
border-left: 1px solid #fff;
height: 110px;
position:absolute;
width:0px;
left:200px;
opacity:.8;
.right {
float:right;
}
.warning{
padding:10px;
background-color:#FFA4A4;
opacity:.8;
.popup {
font-size: 14px;
width: 400px;
z-index: 500;
padding: 10px;
border-radius: 6px;
background: #222;
background: rgba(0,0,0,.7);
background: -webkit-linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
background: -moz-linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
box-shadow: 0 0 8px #888;
color: #fff;
}
#settingseveryoneitems{
display:none;
.popup input[type=text] {
width: 100%;
padding: 5px;
box-sizing: border-box;
-moz-box-sizing: border-box;
display:block;
margin-top: 10px;
}
#settingswarning{
cursor: pointer;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
.popup a {
text-decoration: none;
}
.popup h1 {
font-size: 18px;
}
.popup h2 {
font-size: 15px;
}
.popup p {
margin: 5px 0;
}
.left_popup {
float: left;
width: 50%;
}
.right_popup {
float: left;
padding-left: 10px;
}
#settingsmenu, #importexport, #embed {
position: absolute;
top: 55px;
right: 20px;
display: none;
}
#settingsmenu .right_menu {
float:none;
}
.note {
color: #ddd;
font-size: 11px;
font-weight: bold;
}