Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
This commit is contained in:
johnyma22
commit
28abd527bc
5 changed files with 136 additions and 661 deletions
|
|
@ -5,6 +5,13 @@
|
|||
html { cursor: text; } /* in Safari, produces text cursor for whole doc (inc. below body) */
|
||||
span { cursor: auto; }
|
||||
|
||||
::selection {
|
||||
background: #acf;
|
||||
}
|
||||
::-moz-selection {
|
||||
background: #acf;
|
||||
}
|
||||
|
||||
a { cursor: pointer !important; }
|
||||
|
||||
ul, ol, li {
|
||||
|
|
|
|||
|
|
@ -20,18 +20,17 @@ iframe {
|
|||
position: absolute
|
||||
}
|
||||
#users {
|
||||
position: absolute;
|
||||
z-index: 500;
|
||||
background-color: #000;
|
||||
background-color: rgba(0,0,0,0.7);
|
||||
background: #f7f7f7;
|
||||
background: -webkit-linear-gradient( #F7F7F7,#EEE);
|
||||
background: -moz-linear-gradient( #F7F7F7,#EEE);
|
||||
background: -ms-linear-gradient( #F7F7F7,#EEE);
|
||||
background: -o-linear-gradient( #F7F7F7,#EEE);
|
||||
background: linear-gradient( #F7F7F7,#EEE);
|
||||
width: 160px;
|
||||
right: 20px;
|
||||
top: 40px;
|
||||
color: #fff;
|
||||
padding: 5px;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
border-radius: 0 0 6px 6px;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
#otherusers {
|
||||
max-height: 400px;
|
||||
|
|
@ -41,14 +40,6 @@ a img {
|
|||
border: 0
|
||||
}
|
||||
/* menu */
|
||||
.toolbar ul {
|
||||
position: relative;
|
||||
list-style: none;
|
||||
padding-right: 3px;
|
||||
padding-left: 1px;
|
||||
z-index: 2;
|
||||
overflow: hidden;
|
||||
}
|
||||
.toolbar {
|
||||
background: #f7f7f7;
|
||||
background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
|
|
@ -58,15 +49,34 @@ a img {
|
|||
background: linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
border-bottom: 1px solid #ccc;
|
||||
overflow: hidden;
|
||||
padding-top: 3px;
|
||||
padding-top: 4px;
|
||||
width: 100%;
|
||||
white-space: nowrap;
|
||||
height: 32px;
|
||||
}
|
||||
.toolbar ul {
|
||||
position: relative;
|
||||
list-style: none;
|
||||
padding-right: 3px;
|
||||
padding-left: 1px;
|
||||
z-index: 2;
|
||||
overflow: hidden;
|
||||
float: left
|
||||
}
|
||||
.toolbar ul.menu_right {
|
||||
float: right
|
||||
}
|
||||
.toolbar ul li {
|
||||
float: left;
|
||||
margin-left: 2px;
|
||||
}
|
||||
.toolbar ul li.separator {
|
||||
border: inherit;
|
||||
background: inherit;
|
||||
visibility: hidden;
|
||||
width: 0px;
|
||||
padding: 5px;
|
||||
}
|
||||
.toolbar ul li a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
|
@ -93,13 +103,6 @@ a img {
|
|||
-moz-box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
|
||||
box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
|
||||
}
|
||||
.toolbar ul li.separator {
|
||||
border: inherit;
|
||||
background: inherit;
|
||||
visibility: hidden;
|
||||
width: 0px;
|
||||
padding: 5px;
|
||||
}
|
||||
.toolbar ul li a {
|
||||
background: #fff;
|
||||
background: -webkit-linear-gradient(#fff, #f0f0f0);
|
||||
|
|
@ -108,7 +111,7 @@ a img {
|
|||
background: -ms-linear-gradient(#fff, #f0f0f0);
|
||||
background: linear-gradient(#fff, #f0f0f0);
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
border-radius: 3px;
|
||||
color: #ccc;
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
|
|
@ -123,19 +126,48 @@ a img {
|
|||
position: relative;
|
||||
top: 1px;
|
||||
}
|
||||
.toolbar ul {
|
||||
float: left
|
||||
.toolbar ul li a.grouped-left {
|
||||
border-radius: 3px 0 0 3px;
|
||||
}
|
||||
.toolbar ul.menu_right {
|
||||
float: right
|
||||
.toolbar ul li a.grouped-middle {
|
||||
border-radius: 0;
|
||||
margin-left: -2px;
|
||||
border-left: 0;
|
||||
}
|
||||
#users {
|
||||
display: none
|
||||
.toolbar ul li a.grouped-right {
|
||||
border-radius: 0 3px 3px 0;
|
||||
margin-left: -2px;
|
||||
border-left: 0;
|
||||
}
|
||||
.toolbar ul li a.selected {
|
||||
background: #eee !important;
|
||||
background: -webkit-linear-gradient(#EEE, #F0F0F0) !important;
|
||||
background: -moz-linear-gradient(#EEE, #F0F0F0) !important;
|
||||
background: -o-linear-gradient(#EEE, #F0F0F0) !important;
|
||||
background: -ms-linear-gradient(#EEE, #F0F0F0) !important;
|
||||
background: linear-gradient(#EEE, #F0F0F0) !important;
|
||||
}
|
||||
.toolbar ul li select {
|
||||
padding: 4px;
|
||||
line-height: 22px; /* fix for safari (win/mac) */
|
||||
height: 28px; /* fix for chrome (mac) */
|
||||
border-radius: 3px;
|
||||
border: 1px solid #ccc;
|
||||
outline: none;
|
||||
}
|
||||
#usericon a {
|
||||
min-width: 30px;
|
||||
}
|
||||
#usericon a #online_count {
|
||||
color: #777;
|
||||
font-size: 10px;
|
||||
position: relative;
|
||||
top: 2px;
|
||||
}
|
||||
#editorcontainer {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
top: 36px;
|
||||
top: 37px; /* + 1px border */
|
||||
left: 0px;
|
||||
bottom: 0px;
|
||||
z-index: 1;
|
||||
|
|
@ -169,232 +201,6 @@ a img {
|
|||
bottom: 0px;
|
||||
width: 100%;
|
||||
}
|
||||
.maximized #padpage {
|
||||
left: 8px;
|
||||
right: 8px;
|
||||
width: auto;
|
||||
margin-left: 0;
|
||||
}
|
||||
body.fullwidth #padpage {
|
||||
width: auto;
|
||||
margin-left: 6px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
body.squish1width #padpage {
|
||||
width: 800px
|
||||
}
|
||||
body.squish2width #padpage {
|
||||
width: 700px
|
||||
}
|
||||
a#backtoprosite,
|
||||
#accountnav {
|
||||
display: block;
|
||||
position: absolute;
|
||||
height: 15px;
|
||||
line-height: 15px;
|
||||
width: auto;
|
||||
top: 5px;
|
||||
font-size: 1.2em;
|
||||
display: none;
|
||||
}
|
||||
a#backtoprosite,
|
||||
#accountnav a {
|
||||
color: #cde7ff;
|
||||
text-decoration: underline;
|
||||
}
|
||||
a#backtoprosite {
|
||||
padding-left: 20px;
|
||||
left: 6px;
|
||||
background: url(static/img/protop.gif) no-repeat -5px -6px;
|
||||
}
|
||||
#accountnav {
|
||||
right: 30px;
|
||||
color: #fff;
|
||||
}
|
||||
#specialkeyarea {
|
||||
top: 5px;
|
||||
left: 250px;
|
||||
color: yellow;
|
||||
font-weight: bold;
|
||||
font-size: 1.5em;
|
||||
position: absolute;
|
||||
}
|
||||
#alertbar {
|
||||
margin-top: 6px;
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
|
||||
filter: alpha(opacity=0);
|
||||
opacity: 0;
|
||||
display: none;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 53;
|
||||
}
|
||||
#servermsg {
|
||||
position: relative;
|
||||
zoom: 1;
|
||||
border: 1px solid #992;
|
||||
background: #ffc;
|
||||
padding: 0.8em;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
#servermsg h3 {
|
||||
font-weight: bold;
|
||||
margin-right: 10px;
|
||||
margin-bottom: 1em;
|
||||
float: left;
|
||||
width: auto;
|
||||
}
|
||||
#servermsg #servermsgdate {
|
||||
font-style: italic;
|
||||
font-weight: normal;
|
||||
color: #666;
|
||||
}
|
||||
a#hidetopmsg {
|
||||
position: absolute;
|
||||
right: 5px;
|
||||
bottom: 5px;
|
||||
}
|
||||
#shuttingdown {
|
||||
position: relative;
|
||||
zoom: 1;
|
||||
border: 1px solid #992;
|
||||
background: #ffc;
|
||||
padding: 0.6em;
|
||||
font-size: 1.2em;
|
||||
margin-top: 6px;
|
||||
}
|
||||
#docbar {
|
||||
margin-top: 6px;
|
||||
height: 25px;
|
||||
position: relative;
|
||||
zoom: 1;
|
||||
background: #fbfbfb url(static/img/padtopback2.gif) repeat-x 0 -31px;
|
||||
}
|
||||
.docbarbutton {
|
||||
padding-top: 2px;
|
||||
padding-bottom: 2px;
|
||||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
border-left: 1px solid #CCC;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.docbarbutton img {
|
||||
border: 0px;
|
||||
width: 13px;
|
||||
margin-right: 2px;
|
||||
vertical-align: middle;
|
||||
margin-top: 3px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
.menu,
|
||||
.menu ul {
|
||||
font-size: 10pt;
|
||||
list-style-type: none;
|
||||
}
|
||||
.menu ul {
|
||||
padding-left: 20px
|
||||
}
|
||||
.menu a {
|
||||
font-size: 10px;
|
||||
line-height: 18px;
|
||||
text-decoration: none;
|
||||
color: #444;
|
||||
font-weight: bold;
|
||||
}
|
||||
.docbarbutton.highlight {
|
||||
background-color: #fef2bd;
|
||||
border: 1px solid #CCC;
|
||||
border-right: 0px;
|
||||
}
|
||||
#docbarleft {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
background: url(static/img/padtop5.gif) no-repeat left -31px;
|
||||
width: 7px;
|
||||
}
|
||||
#docbarpadtitle {
|
||||
position: absolute;
|
||||
height: auto;
|
||||
left: 9px;
|
||||
width: 280px;
|
||||
font-size: 1.6em;
|
||||
color: #444;
|
||||
font-weight: normal;
|
||||
line-height: 22px;
|
||||
margin-left: 2px;
|
||||
height: 22px;
|
||||
top: 2px;
|
||||
overflow: hidden; /*not supported in FF*/
|
||||
-o-text-overflow: ellipsis;
|
||||
-ms-text-overflow: ellipsis;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.docbar-public #docbarpadtitle {
|
||||
padding-left: 22px;
|
||||
background: url(static/img/public.gif) no-repeat left center;
|
||||
}
|
||||
#docbarrenamelink {
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
font-size: 1.1em;
|
||||
display: none;
|
||||
}
|
||||
#docbarrenamelink a {
|
||||
color: #999
|
||||
}
|
||||
#docbarrenamelink a:hover {
|
||||
color: #48d
|
||||
}
|
||||
#padtitlebuttons {
|
||||
position: absolute;
|
||||
width: 74px;
|
||||
zoom: 1;
|
||||
height: 17px;
|
||||
top: 4px;
|
||||
left: 170px;
|
||||
display: none;
|
||||
background: url(static/img/ok_or_cancel.gif) 0px 0px;
|
||||
}
|
||||
#padtitlesave {
|
||||
position: absolute;
|
||||
display: block;
|
||||
height: 0;
|
||||
padding-top: 17px;
|
||||
overflow: hidden;
|
||||
width: 23px;
|
||||
left: 0;
|
||||
top: 0;
|
||||
}
|
||||
#padtitlecancel {
|
||||
position: absolute;
|
||||
display: block;
|
||||
height: 0;
|
||||
padding-top: 17px;
|
||||
overflow: hidden;
|
||||
width: 35px;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
#padtitleedit {
|
||||
position: absolute;
|
||||
top: 2px;
|
||||
left: 5px;
|
||||
height: 15px;
|
||||
padding: 2px;
|
||||
font-size: 1.4em;
|
||||
background: white;
|
||||
border-left: 1px solid #c3c3c3;
|
||||
border-top: 1px solid #c3c3c3;
|
||||
border-right: 1px solid #e6e6e6;
|
||||
border-bottom: 1px solid #e6e6e6;
|
||||
width: 150px;
|
||||
display: none;
|
||||
}
|
||||
#padmain {
|
||||
margin-top: 0px;
|
||||
position: absolute;
|
||||
|
|
@ -412,35 +218,6 @@ a#hidetopmsg {
|
|||
top: 0;
|
||||
zoom: 1;
|
||||
}
|
||||
.hidesidebar #padeditor {
|
||||
right: 0
|
||||
}
|
||||
#vdraggie {
|
||||
/* background: url(static/img/vdraggie.gif) no-repeat top center;;*/
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
background-image: url('../../static/img/etherpad_lite_icons.png');
|
||||
background-repeat: no-repeat;
|
||||
background-position: 0px -300px;
|
||||
cursor: W-resize;
|
||||
bottom: 0;
|
||||
position: absolute;
|
||||
right: 268px;
|
||||
top: 0;
|
||||
width: 56px;
|
||||
z-index: 10;
|
||||
display: inline-block;
|
||||
}
|
||||
.toolbarsavetable {
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
right: 8px;
|
||||
height: 24px;
|
||||
}
|
||||
.toolbarsavetable td,
|
||||
.toolbartable td {
|
||||
white-space: nowrap
|
||||
}
|
||||
#myswatchbox {
|
||||
position: absolute;
|
||||
left: 5px;
|
||||
|
|
@ -464,31 +241,13 @@ a#hidetopmsg {
|
|||
top: 0px;
|
||||
z-index: 101;
|
||||
display: none;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
background: rgba(0, 0, 0, 0.7);
|
||||
border-radius: 0 0 6px 6px;
|
||||
background: #f7f7f7;
|
||||
border: 1px solid #ccc;
|
||||
border-top: 0;
|
||||
padding-left: 10px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
/*
|
||||
#mycolorpicker ul li
|
||||
{
|
||||
|
||||
float: left;
|
||||
|
||||
}
|
||||
|
||||
#mycolorpicker .picked {
|
||||
border: 1px solid #000 !important;
|
||||
}
|
||||
|
||||
|
||||
#mycolorpicker .picked .pickerswatch {
|
||||
border: 1px solid #fff;
|
||||
}
|
||||
|
||||
*/
|
||||
#mycolorpickersave {
|
||||
left: 10px;
|
||||
font-weight: bold;
|
||||
|
|
@ -579,6 +338,10 @@ float: left;
|
|||
#myusernameform .editempty {
|
||||
color: #333
|
||||
}
|
||||
#myswatchbox, #myusernameedit, #otheruserstable .swatch {
|
||||
border: 1px solid #ccc !important;
|
||||
color: #333;
|
||||
}
|
||||
table#otheruserstable {
|
||||
display: none
|
||||
}
|
||||
|
|
@ -595,7 +358,7 @@ table#otheruserstable {
|
|||
height: 26px;
|
||||
vertical-align: middle;
|
||||
padding: 0 2px;
|
||||
color: #fff;
|
||||
color: #333;
|
||||
}
|
||||
#otheruserstable .swatch {
|
||||
border: 1px solid #000;
|
||||
|
|
@ -751,73 +514,6 @@ table#otheruserstable {
|
|||
font-size: 12pt;
|
||||
padding: 5px;
|
||||
}
|
||||
/* We give docbar a higher z-index than its descendant impexp-wrapper in
|
||||
order to allow the Import/Export panel to be on top of stuff lower
|
||||
down on the page in IE. Strange but it works! */
|
||||
#docbar {
|
||||
z-index: 52
|
||||
}
|
||||
#impexp-wrapper {
|
||||
width: 650px;
|
||||
right: 10px;
|
||||
}
|
||||
#impexp-panel {
|
||||
height: 160px
|
||||
}
|
||||
.docbarimpexp-closing #impexp-wrapper {
|
||||
z-index: 50
|
||||
}
|
||||
#savedrevs-wrapper {
|
||||
width: 100%;
|
||||
left: 0;
|
||||
}
|
||||
#savedrevs-panel {
|
||||
height: 79px
|
||||
}
|
||||
.docbarsavedrevs-closing #savedrevs-wrapper {
|
||||
z-index: 50
|
||||
}
|
||||
#savedrevs-wrapper .dbpanel-rightedge {
|
||||
background-position: 0 -10px
|
||||
}
|
||||
#options-wrapper {
|
||||
width: 340px;
|
||||
right: 200px;
|
||||
}
|
||||
#options-panel {
|
||||
height: 114px
|
||||
}
|
||||
.docbaroptions-closing #options-wrapper {
|
||||
z-index: 50
|
||||
}
|
||||
#security-wrapper {
|
||||
width: 320px;
|
||||
right: 300px;
|
||||
}
|
||||
#security-panel {
|
||||
height: 130px
|
||||
}
|
||||
.docbarsecurity-closing #security-wrapper {
|
||||
z-index: 50
|
||||
}
|
||||
#revision-notifier {
|
||||
position: absolute;
|
||||
right: 8px;
|
||||
top: 25px;
|
||||
width: auto;
|
||||
height: auto;
|
||||
font-size: 1.2em;
|
||||
background: #ffc;
|
||||
border: 1px solid #aaa;
|
||||
color: #444;
|
||||
padding: 3px 5px;
|
||||
display: none;
|
||||
z-index: 55;
|
||||
}
|
||||
#revision-notifier .label {
|
||||
color: #777;
|
||||
font-weight: bold;
|
||||
}
|
||||
#mainmodals {
|
||||
z-index: 600; /* higher than the modals themselves: */
|
||||
}
|
||||
|
|
@ -829,17 +525,6 @@ down on the page in IE. Strange but it works! */
|
|||
#mainmodals .editempty {
|
||||
color: #aaa
|
||||
}
|
||||
.expand-collapse {
|
||||
height: 22px;
|
||||
background-image: url(static/img/sharedistri.gif);
|
||||
background-repeat: no-repeat;
|
||||
background-position: 0 3px;
|
||||
padding-left: 17px;
|
||||
text-decoration: none;
|
||||
}
|
||||
.expand-collapse.expanded {
|
||||
background-position: 0 -31px
|
||||
}
|
||||
.modaldialog {
|
||||
position: absolute;
|
||||
top: 100px;
|
||||
|
|
@ -877,69 +562,6 @@ down on the page in IE. Strange but it works! */
|
|||
vertical-align: top;
|
||||
text-align: left;
|
||||
}
|
||||
.sharebox-url {
|
||||
width: 440px;
|
||||
height: 18px;
|
||||
text-align: left;
|
||||
font-size: 1.3em;
|
||||
line-height: 18px;
|
||||
padding: 2px;
|
||||
}
|
||||
#viewbarcontents {
|
||||
display: none
|
||||
}
|
||||
#viewzoomtitle {
|
||||
position: absolute;
|
||||
left: 10px;
|
||||
top: 4px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
#bottomarea {
|
||||
height: 28px;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
height: 28px;
|
||||
bottom: 0px;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
font-size: 1.2em;
|
||||
color: #444;
|
||||
}
|
||||
#widthprefcheck {
|
||||
position: absolute;
|
||||
background-image: url(static/img/layoutbuttons.gif);
|
||||
background-repeat: no-repeat;
|
||||
cursor: pointer;
|
||||
width: 86px;
|
||||
height: 20px;
|
||||
top: 4px;
|
||||
right: 2px;
|
||||
}
|
||||
.widthprefunchecked {
|
||||
background-position: -1px -1px
|
||||
}
|
||||
.widthprefchecked {
|
||||
background-position: -1px -23px
|
||||
}
|
||||
#sidebarcheck {
|
||||
position: absolute;
|
||||
background-image: url(static/img/layoutbuttons.gif);
|
||||
background-repeat: no-repeat;
|
||||
cursor: pointer;
|
||||
width: 86px;
|
||||
height: 20px;
|
||||
top: 4px;
|
||||
right: 90px;
|
||||
}
|
||||
.sidebarunchecked {
|
||||
background-position: -1px -45px
|
||||
}
|
||||
.sidebarchecked {
|
||||
background-position: -1px -67px
|
||||
}
|
||||
|
||||
#modaloverlay {
|
||||
z-index: 500;
|
||||
|
|
@ -959,67 +581,7 @@ down on the page in IE. Strange but it works! */
|
|||
background-image: none;
|
||||
background-repeat: no-repeat; /* scale the image */
|
||||
}
|
||||
a#topbarmaximize {
|
||||
float: right;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
margin-right: -143px;
|
||||
margin-top: 4px;
|
||||
background: url(static/img/maximize_normal.png);
|
||||
}
|
||||
.maximized a#topbarmaximize {
|
||||
background: url(static/img/maximize_maximized.png)
|
||||
}
|
||||
.toolbarinner h1 {
|
||||
line-height: 29px;
|
||||
font-size: 16px;
|
||||
padding-left: 6pt;
|
||||
margin-top: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.toolbarinner h1 a {
|
||||
font-size: 12px
|
||||
}
|
||||
.bigbutton {
|
||||
display: block;
|
||||
background-color: #a3bde0;
|
||||
color: #555555;
|
||||
border-style: solid;
|
||||
border-width: 2px;
|
||||
border-left-color: #d6e2f1;
|
||||
border-right-color: #86aee1;
|
||||
border-top-color: #d6e2f1;
|
||||
border-bottom-color: #86aee1;
|
||||
margin: 10pt;
|
||||
text-align: center;
|
||||
text-decoration: none;
|
||||
padding: 50pt;
|
||||
font-size: 20pt;
|
||||
-webkit-border-radius: 3pt;
|
||||
-moz-border-radius: 3pt;
|
||||
border-radius: 3pt;
|
||||
}
|
||||
.modaldialog .bigbutton {
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
width: 100%;
|
||||
}
|
||||
ul#colorpickerswatches {
|
||||
padding-left: 3px;
|
||||
padding-top: 5px;
|
||||
}
|
||||
ul#colorpickerswatches li {
|
||||
border: 1px solid #ccc;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
overflow: hidden;
|
||||
margin: 3px 6px;
|
||||
padding: 0px;
|
||||
}
|
||||
ul#colorpickerswatches li:hover {
|
||||
border: 1px solid #000;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#chatbox {
|
||||
position: absolute;
|
||||
bottom: 0px;
|
||||
|
|
@ -1093,8 +655,8 @@ ul#colorpickerswatches li:hover {
|
|||
text-decoration: none
|
||||
}
|
||||
#chatcounter {
|
||||
color: #555;
|
||||
font-size: 9px;
|
||||
color: #777;
|
||||
font-size: 10px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#titlebar {
|
||||
|
|
@ -1127,31 +689,13 @@ ul#colorpickerswatches li:hover {
|
|||
margin-top: 2px;
|
||||
}
|
||||
.exporttype {
|
||||
margin-top: 2px;
|
||||
margin-top: 4px;
|
||||
background-repeat: no-repeat;
|
||||
padding-left: 25px;
|
||||
background-image: url("../../static/img/etherpad_lite_icons.png");
|
||||
color: #fff;
|
||||
color: #333;
|
||||
text-decoration: none;
|
||||
}
|
||||
#importexportline {
|
||||
border-left: 1px solid #fff;
|
||||
height: 190px;
|
||||
position: absolute;
|
||||
width: 0px;
|
||||
left: 260px;
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
|
||||
filter: alpha(opacity=80);
|
||||
opacity: .8;
|
||||
}
|
||||
.impexpbutton {
|
||||
background-image: -webkit-linear-gradient(center top , #EEEEEE, white 20%, white 20%);
|
||||
background-image: -moz-linear-gradient(center top , #EEEEEE, white 20%, white 20%);
|
||||
background-image: -o-linear-gradient(center top , #EEEEEE, white 20%, white 20%);
|
||||
background-image: -ms-linear-gradient(center top , #EEEEEE, white 20%, white 20%);
|
||||
background-image: linear-gradient(center top , #EEEEEE, white 20%, white 20%);
|
||||
padding: 3px;
|
||||
}
|
||||
#exporthtml {
|
||||
background-position: 0px -299px
|
||||
}
|
||||
|
|
@ -1302,22 +846,19 @@ input[type=checkbox] {
|
|||
.popup {
|
||||
font-size: 14px;
|
||||
width: 450px;
|
||||
z-index: 500;
|
||||
padding: 10px;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
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));
|
||||
background: -o-linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
|
||||
background: -ms-linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
|
||||
background: linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
|
||||
border-radius: 0 0 6px 6px;
|
||||
border: 1px solid #ccc;
|
||||
background: #f7f7f7;
|
||||
background: -webkit-linear-gradient(#F7F7F7, #EEE);
|
||||
background: -moz-linear-gradient(#F7F7F7, #EEE);
|
||||
background: -ms-linear-gradient(#F7F7F7, #EEE);
|
||||
background: -o-linear-gradient(#F7F7F7, #EEE);
|
||||
background: linear-gradient(#F7F7F7, #EEE);
|
||||
-webkit-box-shadow: 0 0 8px #888;
|
||||
-moz-box-shadow: 0 0 8px #888;
|
||||
box-shadow: 0 0 8px #888;
|
||||
color: #fff;
|
||||
box-shadow: 0 2px 4px #ddd;
|
||||
color: #222;
|
||||
}
|
||||
.popup input[type=text] {
|
||||
width: 100%;
|
||||
|
|
@ -1329,13 +870,18 @@ input[type=checkbox] {
|
|||
display: block;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.popup input[type=text], #users input[type=text] {
|
||||
outline: none;
|
||||
}
|
||||
.popup a {
|
||||
text-decoration: none
|
||||
}
|
||||
.popup h1 {
|
||||
color: #555;
|
||||
font-size: 18px
|
||||
}
|
||||
.popup h2 {
|
||||
color: #777;
|
||||
font-size: 15px
|
||||
}
|
||||
.popup p {
|
||||
|
|
@ -1347,24 +893,13 @@ input[type=checkbox] {
|
|||
}
|
||||
#settings,
|
||||
#importexport,
|
||||
#embed {
|
||||
#embed,
|
||||
#users {
|
||||
position: absolute;
|
||||
top: 55px;
|
||||
top: 36px;
|
||||
right: 20px;
|
||||
display: none;
|
||||
}
|
||||
.note {
|
||||
color: #ddd;
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.selected {
|
||||
background: #eee !important;
|
||||
background: -webkit-linear-gradient(#EEE, #F0F0F0) !important;
|
||||
background: -moz-linear-gradient(#EEE, #F0F0F0) !important;
|
||||
background: -o-linear-gradient(#EEE, #F0F0F0) !important;
|
||||
background: -ms-linear-gradient(#EEE, #F0F0F0) !important;
|
||||
background: linear-gradient(#EEE, #F0F0F0) !important;
|
||||
z-index: 500;
|
||||
}
|
||||
.stickyChat {
|
||||
background-color: #f1f1f1 !important;
|
||||
|
|
@ -1389,26 +924,20 @@ input[type=checkbox] {
|
|||
}
|
||||
@media screen and (max-width: 600px) {
|
||||
.toolbar ul li.separator {
|
||||
padding: 1px;
|
||||
display: none;
|
||||
}
|
||||
.toolbar ul li a {
|
||||
padding: 4px 1px
|
||||
}
|
||||
}
|
||||
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
|
||||
.toolbar ul li a {
|
||||
padding: 4px 5px;
|
||||
}
|
||||
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
|
||||
#users {
|
||||
right: 0;
|
||||
top: 36px;
|
||||
bottom: 33px;
|
||||
-webkit-border-radius: none;
|
||||
-moz-border-radius: none;
|
||||
bottom: 40px;
|
||||
border-radius: none;
|
||||
}
|
||||
#mycolorpicker {
|
||||
left: -72px;
|
||||
left: -73px;
|
||||
/* #mycolorpicker: width -#users: width */;
|
||||
}
|
||||
#editorcontainer {
|
||||
|
|
@ -1428,54 +957,20 @@ input[type=checkbox] {
|
|||
bottom: 0;
|
||||
border-top: 1px solid #ccc;
|
||||
}
|
||||
#chaticon {
|
||||
bottom: 3px;
|
||||
right: 55px;
|
||||
border-right: none;
|
||||
-webkit-border-radius: 0;
|
||||
-moz-border-radius: 0;
|
||||
border-radius: 0;
|
||||
background: #f7f7f7;
|
||||
background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
background: linear-gradient(#f7f7f7, #f1f1f1 80%);
|
||||
border: 0;
|
||||
}
|
||||
#chatbox {
|
||||
bottom: 32px;
|
||||
right: 0;
|
||||
border-top-right-radius: 0;
|
||||
border-right: none;
|
||||
}
|
||||
#usericonback {
|
||||
margin-top: 4px
|
||||
}
|
||||
.toolbar ul.menu_right > li:last-child {
|
||||
float: right;
|
||||
}
|
||||
.toolbar ul.menu_right > li:not(:last-child) a {
|
||||
display: block;
|
||||
}
|
||||
.toolbar ul.menu_right > li {
|
||||
padding: 0;
|
||||
}
|
||||
.toolbar ul.menu_right > li a {
|
||||
height: 24px;
|
||||
line-height: 24px;
|
||||
-webkit-border-radius: 0;
|
||||
-moz-border-radius: 0;
|
||||
border-radius: 0;
|
||||
border: none;
|
||||
background: none;
|
||||
margin: 0;
|
||||
padding: 4px 8px;
|
||||
padding: 8px;
|
||||
}
|
||||
.selected {
|
||||
.toolbar ul li a.selected {
|
||||
background: none !important
|
||||
}
|
||||
#timesliderlink {
|
||||
#chaticon, #timesliderlink {
|
||||
display: none !important
|
||||
}
|
||||
.popup {
|
||||
|
|
@ -1496,10 +991,7 @@ input[type=checkbox] {
|
|||
bottom: 33px;
|
||||
right: 0;
|
||||
}
|
||||
.separator {
|
||||
.toolbar ul li .separator {
|
||||
display: none
|
||||
}
|
||||
#online_count {
|
||||
line-height: 24px
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
|
||||
|
||||
<link rel="shortcut icon" href="favicon.ico">
|
||||
|
||||
<style>
|
||||
body {
|
||||
margin: 0;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
<meta name="robots" content="noindex, nofollow">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
|
||||
|
||||
<link rel="shortcut icon" href="../favicon.ico">
|
||||
|
||||
<% e.begin_block("styles"); %>
|
||||
<link href="../static/css/pad.css" rel="stylesheet">
|
||||
<link href="../static/custom/pad.css" rel="stylesheet">
|
||||
|
|
@ -23,54 +25,54 @@
|
|||
<ul class="menu_left">
|
||||
<% e.begin_block("editbarMenuLeft"); %>
|
||||
<li id="bold" data-key="bold">
|
||||
<a title="Bold (ctrl-B)">
|
||||
<a class="grouped-left" title="Bold (ctrl-B)">
|
||||
<span class="buttonicon buttonicon-bold"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="italic" data-key="italic">
|
||||
<a title="Italics (ctrl-I)">
|
||||
<a class="grouped-middle" title="Italics (ctrl-I)">
|
||||
<span class="buttonicon buttonicon-italic"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="underline" data-key="underline">
|
||||
<a title="Underline (ctrl-U)">
|
||||
<a class="grouped-middle" title="Underline (ctrl-U)">
|
||||
<span class="buttonicon buttonicon-underline"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="strikethrough" data-key="strikethrough">
|
||||
<a title="Strikethrough">
|
||||
<a class="grouped-right" title="Strikethrough">
|
||||
<span class="buttonicon buttonicon-strikethrough"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="separator"></li>
|
||||
<li id="oderedlist" data-key="insertorderedlist">
|
||||
<a title="Toggle Ordered List">
|
||||
<a class="grouped-left" title="Toggle Ordered List">
|
||||
<span class="buttonicon buttonicon-insertorderedlist"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="unoderedlist" data-key="insertunorderedlist">
|
||||
<a title="Toggle Bullet List">
|
||||
<a class="grouped-middle" title="Toggle Bullet List">
|
||||
<span class="buttonicon buttonicon-insertunorderedlist"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="indent" data-key="indent">
|
||||
<a title="Indent">
|
||||
<a class="grouped-middle" title="Indent">
|
||||
<span class="buttonicon buttonicon-indent"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="outdent" data-key="outdent">
|
||||
<a title="Unindent">
|
||||
<a class="grouped-right" title="Unindent">
|
||||
<span class="buttonicon buttonicon-outdent"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="separator"></li>
|
||||
<li id="undo" data-key="undo">
|
||||
<a title="Undo (ctrl-Z)">
|
||||
<a class="grouped-left" title="Undo (ctrl-Z)">
|
||||
<span class="buttonicon buttonicon-undo"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="redo" data-key="redo">
|
||||
<a title="Redo (ctrl-Y)">
|
||||
<a class="grouped-right" title="Redo (ctrl-Y)">
|
||||
<span class="buttonicon buttonicon-redo"></span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -85,22 +87,22 @@
|
|||
<ul class="menu_right">
|
||||
<% e.begin_block("editbarMenuRight"); %>
|
||||
<li data-key="settings">
|
||||
<a id="settingslink" title="Settings of this pad">
|
||||
<a class="grouped-left" id="settingslink" title="Settings of this pad">
|
||||
<span class="buttonicon buttonicon-settings"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li data-key="import_export">
|
||||
<a id="importexportlink" title="Import/Export from/to different document formats">
|
||||
<a class="grouped-middle" id="importexportlink" title="Import/Export from/to different document formats">
|
||||
<span class="buttonicon buttonicon-import_export"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li data-key="embed">
|
||||
<a id="embedlink" title="Share and Embed this pad">
|
||||
<a class="grouped-middle" id="embedlink" title="Share and Embed this pad">
|
||||
<span class="buttonicon buttonicon-embed"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li data-key="savedRevision">
|
||||
<a id="revisionlink" title="Mark this revision as a saved revision">
|
||||
<a class="grouped-right" id="revisionlink" title="Mark this revision as a saved revision">
|
||||
<span class="buttonicon buttonicon-savedRevision"></span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -112,7 +114,7 @@
|
|||
</li>
|
||||
<li id="usericon" data-key="showusers">
|
||||
<a title="Show connected users">
|
||||
<span class="buttonicon buttonicon-showusers" id="usericonback"></span>
|
||||
<span class="buttonicon buttonicon-showusers"></span>
|
||||
<span id="online_count">1</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -177,16 +179,15 @@
|
|||
<div class="column">
|
||||
<% e.begin_block("globalSettings"); %>
|
||||
<h2>Global view</h2>
|
||||
<p>Currently nothing.</p>
|
||||
<p class="note">These options affect everyone viewing this pad.</p>
|
||||
<% e.end_block(); %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="importexport" class="popup">
|
||||
<h1>Import/Export</h1>
|
||||
<div class="column">
|
||||
<% e.begin_block("importColumn"); %>
|
||||
<h2>Import from text file, HTML, PDF, Word, ODT or RTF</h2><br>
|
||||
<h2>Upload any text file or document</h2><br>
|
||||
<form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
|
||||
<div class="importformdiv" id="importformfilediv">
|
||||
<input type="file" name="file" size="15" id="importfileinput">
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
<meta name="robots" content="noindex, nofollow">
|
||||
|
||||
<title>Etherpad Lite Timeslider</title>
|
||||
|
||||
<link rel="shortcut icon" href="../../favicon.ico">
|
||||
<link rel="stylesheet" href="../../static/css/pad.css">
|
||||
<link rel="stylesheet" href="../../static/css/timeslider.css">
|
||||
<link rel="stylesheet" href="../../static/custom/timeslider.css">
|
||||
|
|
@ -13,35 +15,6 @@
|
|||
|
||||
<body id="padbody" class="timeslider limwidth">
|
||||
<div id="padpage">
|
||||
<div id="padtop">
|
||||
<div id="alertbar">
|
||||
<div id="servermsg">
|
||||
<h3>Server Notice<span id="servermsgdate"><!-- --></span>:</h3><a id=
|
||||
"hidetopmsg" href="javascript:%20void%20pad.hideServerMessage()" name=
|
||||
"hidetopmsg">hide</a>
|
||||
<p id="servermsgtext"><!-- --></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="navigation"></div>
|
||||
|
||||
<div id="docbar" class="menu docbar">
|
||||
<table border="0" cellpadding="0" cellspacing="0" width="100%" id="docbartable"
|
||||
class="docbartable">
|
||||
<tr>
|
||||
<td><img src="../../static/img/roundcorner_left.gif" /></td>
|
||||
|
||||
<td id="docbarpadtitle" class="docbarpadtitle" title=
|
||||
"Public Pad: Public Pad"><span>Public Pad</span></td>
|
||||
|
||||
<td width="100%"> </td>
|
||||
|
||||
<td><img src="../../static/img/roundcorner_right.gif" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div><!-- /docbar -->
|
||||
</div>
|
||||
|
||||
<div id="timeslider-top">
|
||||
<div id="timeslider-wrapper">
|
||||
<div id="timeslider" unselectable="on" style="display: none">
|
||||
|
|
|
|||
Loading…
Reference in a new issue