libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

colibris: clean no more used code since refactor

Browse source
This commit is contained in:
Sebastian Castro 2020-04-04 13:06:12 +02:00 committed by muxator
parent b5543d65be
commit 6d586a21b3
10 changed files with 25 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/static/skins/colibris/pad.css
View file

@ -16,14 +16,17 @@
@import url("src/plugins/brightcolorpicker.css");
@import url("src/plugins/comments_page.css");
@import url("src/plugins/font_color.css");
@import url("src/plugins/set_title_on_pad.css");
@import url("src/plugins/tables2.css");
@import url("src/plugins/embedded_hyperlinks.css");
@import url("src/plugins/author_hover.css");
/* -----------------------------------------------------------------
* COLORS
* If you want to change main colors, please replace following rules
* -----------------------------------------------------------------
*/
/* NEUTRAL COLOR */
body,
#mycolorpickercancel,
.btn-default,
.color\:black,
[data-color=black],
@ -38,10 +41,7 @@ body,
.comment-changeFrom-value,
.comment-changeTo-value,
.reply-suggestion .reply-comment-suggest-from,
.suggestion .comment-suggest-from,
.hyperlink-dialog>.hyperlink-url,
.timeslider #innerdocbody span ,
.exporttype, .timeslider #export > p
.suggestion .comment-suggest-from
{ color: #2E3338 !important; }
/* MENUS ICONS */
@ -53,15 +53,11 @@ body,
{ background-color: #767676 !important; }
/* PRIMARY BUTTONS */
#mycolorpickersave,
.btn-primary,
#tbl_btn_close,
#save_title button,
#yui-picker-panel .button-group .yui-button:last-child button,
#newComment.sidebar-comment input[type=submit],
.comment-changeTo-approve input[type=submit],
.hyperlink-dialog>.hyperlink-save,
#importsubmitinput, #forcereconnect
.comment-changeTo-approve input[type=submit]
{
background-color: #64d29b;
color: white;
@ -114,7 +110,6 @@ h1,
p[data-l10n-id="ep_comments_page.comment"],
#newComment.sidebar-comment input[type=submit],
.comment-changeTo-approve input[type=submit],
.hyperlink-dialog>.hyperlink-save,
#sidedivinner>div:before
{ font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif !important; }

12
src/static/skins/colibris/src/components/buttons.css
View file

@ -1,10 +1,7 @@
.btn, #mycolorpickercancel, #mycolorpickersave, #save_title button, #yui-picker-panel .button-group .yui-button button, .hyperlink-dialog>.hyperlink-save, .timeslider #editbar .buttontext,
#importsubmitinput, #forcereconnect
button, .btn, #yui-picker-panel .button-group .yui-button button
{
margin-right: 10px;
padding: 5px 20px;
border-radius: 4px;
font-size: 13px;
line-height: 1.5;
width: auto;
border: none !important;
@ -12,16 +9,13 @@
text-transform: uppercase;
position: relative;
background: none;
top: 0;
left: 0;
}
.btn:hover, #mycolorpickercancel:hover, #mycolorpickersave:hover, #save_title button:hover, .hyperlink-dialog>.hyperlink-save:hover, #importsubmitinput:hover, #forcereconnect:hover {
cursor: pointer;
}
button, select {
font-family: inherit;
font-size: inherit;
cursor: pointer;
}

14
src/static/skins/colibris/src/components/users.css
View file

@ -28,22 +28,8 @@ table#otheruserstable {
margin-bottom: 25px;
}
#mycolorpickercancel {
padding-left: 3px;
}
#mycolorpickersave {
color: #fff;
}
#mycolorpickerpreview {
float: right;
top: 0;
left: 0;
position: relative;
border-radius: 50%;
height: 20px;
width: 20px;
}
@media (max-width: 720px) {

14
src/static/skins/colibris/src/layout.css
View file

@ -9,13 +9,6 @@
width: 250px;
}
@media (max-width:600px) {
#outerdocbody.plugin-ep_author_neat { padding-left: 0; }
#options-linenoscheck { display:none; }
#options-linenoscheck ~ label { display:none; }
#outerdocbody { padding-left: 0; } /* side div is hidden now */
}
#outerdocbody.sidediv-hidden {
padding-left: 0; /* sidediv hidden */
}
@ -35,7 +28,6 @@
.comment-modal { margin-top: 75px !important; margin-left: 45px; }
.authortooltip { margin-top: 65px !important; margin-left: 60px; }
.caretindicator { margin-top: 61px!important; margin-left: 52px; }
#outerdocbody.plugin-ep_author_neat .authortooltip{ margin-left: 145px; }
#outerdocbody.plugin-ep_author_neat .caretindicator{ margin-left: 52px; margin-top: 65px!important;}
@media (max-width:1000px) {
@ -44,6 +36,7 @@
#outerdocbody.plugin-ep_author_neat .caretindicator{ margin-left: 17px; }
}
/* Fix comments_page */
@media (min-width: 1381px) {
#outerdocbody.plugin-ep_comments_page { padding-right: 150px; } }
#outerdocbody.plugin-ep_comments_page #comments { left: calc(100% - 150px) }
@ -56,6 +49,7 @@
#outerdocbody.plugin-ep_comments_page { padding-right: 0px; }
}
@media (min-width: 999px) {
#outerdocbody {
min-height: calc(100vh - 20px);
@ -86,10 +80,6 @@
}
@media (max-width:600px) {
html { overflow: scroll; }
#outerdocbody {
width: 100%;
}
#outerdocbody iframe, #outerdocbody > #innerdocbody {
padding: 15px;
}

0
src/static/skins/colibris/src/plugins/cursortrace.css
View file

6
src/static/skins/colibris/src/plugins/embedded_hyperlinks.css
View file

@ -1,6 +0,0 @@
.hyperlink-dialog>.hyperlink-save{
height: 34px;
margin-top: 1px;
margin-right: 0;
margin-left: 2px;
}

29
src/static/skins/colibris/src/plugins/set_title_on_pad.css
View file

@ -1,29 +0,0 @@
@media (max-width: 720px) {
#pad_title {
display: none !important;
}
}
#edit_title {
color: white;
}
#edit_title:before {
font-family: fontawesome-etherpad;
position: absolute;
top: 20px;
font-size: 14px;
content: "\E839";
margin-left: 10px;
}
#input_title {
background-color: #f9f9f9 !important;
height: auto !important;
margin-top: 3px;
width: calc(100% - 110px) !important;
padding: 8px 10px !important;
}
#save_title button {
height: 30px !important;
padding: 5px 20px !important;
}

136
src/static/skins/colibris/timeslider.css
View file

@ -4,15 +4,6 @@
height: 28px;
}
#editorcontainerbox {
overflow-y: auto;
}
button {
font-family: inherit;
cursor: pointer;
}
#timeslider-slider #ui-slider-bar {
border-radius: 3px;
background-color: #e4e4e4;
@ -67,129 +58,4 @@ button {
.timeslider-subtitle {
margin-top: 6px;
font-size: .9em;
}
/*@media (max-width: 600px) { html { overflow: hidden } }
@media (max-width: 1100px) {
.timeslider #padeditor {
padding: 0 !important;
}
}
.timeslider #import_export, .timeslider #settings{
top: 108px !important;
right: 55px;
}
.timeslider #export > p {
font-size: 15px;
margin-top: 0;
margin-bottom: 20px;
}
.timeslider #padpage {
display: flex;
flex-direction: column;
}
.timeslider #timeslider-top {
position: relative;
border-bottom: 1px solid #e4e4e4;
}
.timeslider-bar { background: none; }
.timeslider-bar p { margin: 8px; font-size: 12px;}
.timeslider-bar #editbar {
border: none;
background: none !important;
margin-right: 10px;
margin-top: 10px;
}
.timeslider #padmain {
position: relative;
top: 0 !important;
flex: 1 auto;
overflow: auto;
}
.timeslider #padeditor {
height: 100%;
padding-top: 30px;
}
.timeslider #editorcontainerbox {
height: 100%;
overflow: visible;
margin-top: 0 !important;
}
#timeslider {
margin-top: -20px;
margin-left: 0;
background-color: transparent;
}
#timeslider, #timeslider-left, #timeslider-right {
height: 57px;
background-color: transparent;
}
#timeslider #timer {
opacity: 0.8;
font-style: italic;
right: 158px;
top: -3px;
left: initial;
background: none;
}
#timeslider #timeslider-slider { margin-left: 4px; }
#timeslider .star {
top: 25px;
}
#timeslider .star:before {
color: #da9700;
content: "\e836";
}
.timeslider #editbar .grouped-right {
margin: 0;
border-radius: 3px;
margin-left: 5px;
}
.timeslider #playpause_button {
right: 95px;
top: 1px;
}
#playpause_button_icon {
border:none;
}
#playpause_button_icon:before { color: white; }
.timeslider #leftstep {
right: 60px;
top: 12px;
}
.timeslider #rightstep {
top: 12px;
right: 30px;
}
.stepper {
border: 2px solid;
text-align: center;
border-radius: 50%;
height: 25px;
padding-top: 2px;
}
*/
}

12
src/templates/pad.html
View file

@ -202,7 +202,7 @@
<div class="importmessage" id="importmessagesuccess" data-l10n-id="pad.importExport.importSuccessful"></div>
<div class="importformdiv" id="importformsubmitdiv">
<span class="nowrap">
<input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput">
<input type="submit" class="btn btn-primary" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput">
<div alt="" id="importstatusball" class="loadingAnimation" align="top"></div>
</span>
</div>
@ -252,12 +252,12 @@
<h1 data-l10n-id="pad.modals.userdup"></h1>
<h2 data-l10n-id="pad.modals.userdup.explanation"></h2>
<p id="defaulttext" data-l10n-id="pad.modals.userdup.advice"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
</div>
<div class="unauth">
<h1 data-l10n-id="pad.modals.unauth"></h1>
<p id="defaulttext" data-l10n-id="pad.modals.unauth.explanation"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
</div>
<div class="looping">
<h1 data-l10n-id="pad.modals.disconnected"></h1>
@ -273,13 +273,13 @@
<h1 data-l10n-id="pad.modals.disconnected"></h1>
<h2 data-l10n-id="pad.modals.slowcommit.explanation"></h2>
<p id="defaulttext" data-l10n-id="pad.modals.slowcommit.cause"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
</div>
<div class="badChangeset with_reconnect_timer">
<h1 data-l10n-id="pad.modals.disconnected"></h1>
<h2 data-l10n-id="pad.modals.badChangeset.explanation"></h2>
<p id="defaulttext" data-l10n-id="pad.modals.badChangeset.cause"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
</div>
<div class="corruptPad">
<h1 data-l10n-id="pad.modals.disconnected"></h1>
@ -295,7 +295,7 @@
<h1 data-l10n-id="pad.modals.disconnected"></h1>
<h2 data-l10n-id="pad.modals.disconnected.explanation"></h2>
<p id="defaulttext" data-l10n-id="pad.modals.disconnected.cause"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
<% e.end_block(); %>
</div>
<form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;">

10
src/templates/timeslider.html
View file

@ -151,12 +151,12 @@
<h1 data-l10n-id="pad.modals.userdup"></h1>
<h2 data-l10n-id="pad.modals.userdup.explanation"></h2>
<p data-l10n-id="pad.modals.userdup.advice"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
</div>
<div class="unauth">
<h1 data-l10n-id="pad.modals.unauth"></h1>
<p data-l10n-id="pad.modals.unauth.explanation"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
</div>
<div class="looping">
<h1 data-l10n-id="pad.modals.disconnected"></h1>
@ -172,13 +172,13 @@
<h1 data-l10n-id="pad.modals.disconnected"></h1>
<h2 data-l10n-id="pad.modals.slowcommit.explanation"></h2>
<p data-l10n-id="pad.modals.slowcommit.cause"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
</div>
<div class="badChangeset">
<h1 data-l10n-id="pad.modals.disconnected"></h1>
<h2 data-l10n-id="pad.modals.badChangeset.explanation"></h2>
<p data-l10n-id="pad.modals.badChangeset.cause"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
</div>
<div class="corruptPad">
<h1 data-l10n-id="pad.modals.disconnected"></h1>
@ -194,7 +194,7 @@
<h1 data-l10n-id="pad.modals.disconnected"></h1>
<h2 data-l10n-id="pad.modals.disconnected.explanation"></h2>
<p data-l10n-id="pad.modals.disconnected.cause"></p>
<button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
<button id="forcereconnect" class="btn btn-primary" data-l10n-id="pad.modals.forcereconnect"></button>
<% e.end_block(); %>
</div>
<form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;">