diff --git a/src/static/skins/colibris/pad.css b/src/static/skins/colibris/pad.css index 1a49a73ca..2cf5781d4 100644 --- a/src/static/skins/colibris/pad.css +++ b/src/static/skins/colibris/pad.css @@ -14,7 +14,6 @@ @import url("src/components/import-export.css"); @import url("src/plugins/brightcolorpicker.css"); -@import url("src/plugins/comments_page.css"); @import url("src/plugins/font_color.css"); @import url("src/plugins/tables2.css"); @import url("src/plugins/author_hover.css"); @@ -29,20 +28,8 @@ body, .btn-default, .color\:black, -[data-color=black], -#tbl_context_menu ul .yuimenuitemlabel, -.yui-skin-sam .yui-split-button button em:not(.color-picker-button), -#yui-picker-panel .button-group .yui-button:first-child button, -#newComment .sidebar-comment input[type=reset], #newComment .sidebar-comment input[type=reset]:hover, -#newComment .sidebar-comment input[type=submit]:hover, -.suggestion, .comment-reply-input, .reply-suggestion p:not(.reply-comment-suggest-from-p), .comment-text, -.sidebar-comment textarea, .reply-comment-suggest label, .comment-suggest label, .comment-reply-input -#comments, #newComments, .reply-comment-suggest-from-p, -.comment-changeFrom-value, -.comment-changeTo-value, -.reply-suggestion .reply-comment-suggest-from, -.suggestion .comment-suggest-from -{ color: #2E3338 !important; } +[data-color=black] +{ color: #41484e !important; } /* MENUS ICONS */ #edit_title:before, @@ -53,11 +40,7 @@ body, { background-color: #767676 !important; } /* PRIMARY BUTTONS */ -.btn-primary, -#tbl_btn_close, -#yui-picker-panel .button-group .yui-button:last-child button, -#newComment.sidebar-comment input[type=submit], -.comment-changeTo-approve input[type=submit] +.btn-primary { background-color: #64d29b; color: white; @@ -65,10 +48,6 @@ body, /* PRIMARY COLOR */ h1, -#titlelabel, -.yui-skin-sam .yui-panel .hd, -p[data-l10n-id="ep_comments_page.comment"], -.comment-reply-input-label span, #slider-btn-container .stepper, #importmessageabiword, #importmessageabiword > a, .toolbar .show-more-icon-btn { color: #64d29b; } diff --git a/src/static/skins/colibris/src/layout.css b/src/static/skins/colibris/src/layout.css index 8669a72ec..0cb508513 100644 --- a/src/static/skins/colibris/src/layout.css +++ b/src/static/skins/colibris/src/layout.css @@ -21,11 +21,10 @@ background-color: white; } #sidediv { - padding-top: 55px; /* = #outerdocbody iframe padding-top */ + padding-top: 55px; /* = #innerdocbody iframe padding-top */ } -/* Fixs comments_page & author_hover does not take in account the document padding */ -.comment-modal { margin-top: 75px !important; margin-left: 45px; } +/* Fixs author_hover does not take in account the document padding */ .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; } @@ -36,19 +35,6 @@ #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) } -@media (max-width: 1380px) { - #outerdocbody.plugin-ep_comments_page #comments { left: calc(100% - 220px) } - #outerdocbody.plugin-ep_comments_page { padding-right: 220px; } -} -@media (max-width: 1278px) { - #outerdocbody.plugin-ep_comments_page #comments { display: none; } - #outerdocbody.plugin-ep_comments_page { padding-right: 0px; } -} - @media (min-width: 999px) { #outerdocbody { @@ -68,7 +54,7 @@ padding-top: 20px !important; /* = #outerdocbody iframe padding-top */ } - .comment-modal, .authortooltip { margin-top: 20px !important; } + .authortooltip { margin-top: 20px !important; } .caretindicator { margin-top: 0px !important; } #outerdocbody.plugin-ep_author_neat .caretindicator { margin-top: 10px !important; } @@ -83,5 +69,6 @@ #outerdocbody iframe, #outerdocbody > #innerdocbody { padding: 15px; } + /* #sidediv is hidden at this size of screen */ } diff --git a/src/static/skins/colibris/src/plugins/comments_page.css b/src/static/skins/colibris/src/plugins/comments_page.css deleted file mode 100644 index f11fa61c8..000000000 --- a/src/static/skins/colibris/src/plugins/comments_page.css +++ /dev/null @@ -1,290 +0,0 @@ -.comment.selected { - color: #a28239; -} - -#newComment { - box-shadow: 0 0 0 1px rgba(99, 114, 130, 0.16), 0 8px 16px rgba(27, 39, 51, 0.08); - border: none; - padding: 15px; -} - -p[data-l10n-id="ep_comments_page.comment"] { - font-weight: 900; - font-size: 16px; - text-transform: uppercase; - margin-bottom: 10px; -} - -#newComment.sidebar-comment textarea:not(.comment-suggest-from) { - border: 1px solid #d2d2d2; - border-radius: 3px; - padding: 8px 10px; - height: 80px; - padding: 8px; - font-size: 14px; - width: calc(100% - 15px); -} - -#newComment.sidebar-comment .comment-suggest-from { - height: auto !important; - font-size: 14px; - padding: 8px; - width: calc(100% - 15px) !important; - background-color: #f9f9f9; - margin-top: 8px; - border: 1px solid #f3eeee; - border-left: 4px solid #a7a7a7; - border-radius: 3px; -} - -.comment-suggest { - margin-bottom: 8px; -} - -.reply-comment-suggest input, -.comment-suggest input { - vertical-align: -2px; - margin-right: 5px; -} - -.reply-comment-suggest label, -.comment-suggest label { - font-style: italic; - font-weight: normal; -} - -.sidebar-comment input, -.comment-buttons input { - border-radius: 4px; - text-transform: uppercase; - font-weight: 900; - font-size: 13px; - line-height: 1.5; - width: auto; - border: none; -} - -#newComment.sidebar-comment input[type=submit] { - color: white; - margin-right: 10px; - padding: 0 10px; - border: none; -} - -#newComment.sidebar-comment input[type=reset] { - background-color: white; - border: none; -} - -.comment-content:focus { - border: 2px solid rgba(33, 150, 243, 0.51); -} - -.comment-changeTo-approve input[type=submit] { width: 100%; font-size: 12px;} - -.reply-comment-suggest-from-p, -.comment-changeFrom-value, -.comment-changeTo-value, -.reply-suggestion .reply-comment-suggest-from, -.suggestion .comment-suggest-from { - border: none; - font-weight: normal; - font-style: italic; - padding-left: 0; - width: 100% !important; - padding: 0; - padding-top: 8px; - /* width: inherit !important; */ - /*color: rgba(41, 125, 191, 0.85);*/ -} - -textarea.comment-suggest-to { - margin-bottom: 8px; -} - -.suggestion { - font-weight: bold; - font-size: 11px; - text-transform: uppercase; -} - -#comments { - top: 82px; -} - -#comments .sidebar-comment { - background-color: transparent; - font-size: 13px; - border: none; - box-shadow: none; -} - -@media (min-width: 1200px) { - #comments .sidebar-comment:hover, - #comments .sidebar-comment.mouseover, - .comment-modal { - margin-right: -30px; - } -} - -#comments .sidebar-comment:hover, -#comments .sidebar-comment.mouseover, -.comment-modal { - background-color: #fff; - padding: 0; - padding-top: 10px; - margin-top: -8px; - width: 250px; - box-shadow: 0 0 0 1px rgba(99, 114, 130, 0.16), 0 8px 16px rgba(27, 39, 51, 0.08); -} - -#comments .sidebar-comment:hover time, -#comments .sidebar-comment.mouseover time, -.comment-modal-comment>time { - display: block !important; -} - -#comments .sidebar-comment:hover>section, -#comments .sidebar-comment.mouseover>section, -.comment-modal-comment>section { - padding: 0 15px; - padding-bottom: 10px; - margin-top: 5px; - display: block; - line-height: 20px; - margin-top: 8px; -} - -.comment-delete-container { - float: right; - margin: 0; - height: 15px; - font-size: 15px; - background-color: transparent; - padding: 6px 15px 4px 8px; - color: #7b7777; -} - -.comment-reply { - border-top: 1px solid #d2d2d2; - background-color: #f9f9f9; - margin: 0; - padding: 10px 15px 3px; -} - -.comment-reply-input-label span { - font-weight: bold; -} - -.comment-reply-input { - border: 1px solid #d2d2d2 !important; - width: calc(100% - 20px) !important; - padding: 8px 10px; - text-transform: none !important; - margin-top: 5px; - margin-bottom: 10px; - font-weight: normal; -} - -.reply-suggestion p:not(.reply-comment-suggest-from-p) { - text-transform: uppercase; - font-size: 11px; - font-weight: 400; - text-transform: uppercase; -} - -.comment-changeTo-approve input { - height: 25px; - margin: 0; - margin-top: 5px; -} - -.reply-suggestion { - margin-top: 8px; -} - -.reply-comment-suggest-from-p { - padding: 0 -} - -.comment-text { - font-weight: normal; - line-height: 20px; -} - -.sidebar-comment-reply:nth-child(even) { - background-color: transparent; -} - -.sidebar-comment-reply { - padding: 0; - margin-bottom: 10px; -} - -.comment-author-name { - font-style: normal; -} - -.comment-changeFrom-label, -.comment-changeTo-label { - text-transform: uppercase; - font-size: 11px; -} - -.comment-reply note { - line-height: 16px; -} - -.reply-comment-suggest { - display: none !important -} - -.comment-changeTo-form { - margin-bottom: 5px; - padding: 0 15px; -} - -.sidebar-comment>.comment-author-name, -.comment-modal-comment>.comment-author-name { - padding-left: 0px; -} - -#comments .sidebar-comment:hover >.comment-author-name, -#comments .sidebar-comment.mouseover >.comment-author-name { - margin-top: 2px; - display: inline-block; - padding-left: 15px; -} - -.sidebar-comment>time, -.comment-modal-comment>time { - position: absolute; - top: 11px; - font-size: 11px; - right: 36px; - color: #555555; - font-style: italic; -} - -.comment-changeTo-approve { - margin-bottom: 14px; - margin-top: 5px; -} - -.comment-reply note:first-child { - margin-top: 8px; -} - -.comment-modal { - padding: 0; - border: none; - width: 350px !important; - margin-top: 0; - padding-top: 10px; -} - -.comment-modal-comment>.comment-author-name { - padding-left: 14px; -} - -