diff --git a/src/static/skins/colibris/pad.css b/src/static/skins/colibris/pad.css index 423db33b0..29b63535c 100644 --- a/src/static/skins/colibris/pad.css +++ b/src/static/skins/colibris/pad.css @@ -39,22 +39,38 @@ body, #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, -/* Menus icons*/ +#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: #495057 !important; } + +/* MENUS ICONS */ #edit_title:before, #tbl-menu:before -{ color: #495057 !important; } +{ color: #767676 !important; } /* PRIMARY BUTTONS */ #mycolorpickersave, .btn-primary, #tbl_btn_close, #save_title button, -#yui-picker-panel .button-group .yui-button:last-child button -{ background-color: #64d29b; color: white; } +#yui-picker-panel .button-group .yui-button:last-child button, +{ + background-color: #64d29b; + color: white; +} h1, #titlelabel, -.yui-skin-sam .yui-panel .hd +.yui-skin-sam .yui-panel .hd, +p[data-l10n-id="ep_comments_page.comment"], +.comment-reply-input-label span { color: #64d29b; } /* NEUTRAL FONT */ @@ -63,7 +79,8 @@ body, #chatinput, .toolbar ul li select, button, input, select, textarea, -td[name=tData] +td[name=tData], +#comments, #newComments { font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } /* PRIMARY FONT */ @@ -71,5 +88,9 @@ h1, #titlelabel, #chatlabel, .btn, -.yui-skin-sam .yui-panel .hd -{ font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif !important; } +.yui-skin-sam .yui-panel .hd, +.reply-suggestion p:not(.reply-comment-suggest-from-p), +p[data-l10n-id="ep_comments_page.comment"], +#newComment.sidebar-comment input[type=submit], +.comment-changeTo-approve input[type=submit] +{ font-family: OpenDyslexic, Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif !important; } diff --git a/src/static/skins/colibris/src/plugins/comments_page.css b/src/static/skins/colibris/src/plugins/comments_page.css index 8bddb0899..e61be1ab1 100644 --- a/src/static/skins/colibris/src/plugins/comments_page.css +++ b/src/static/skins/colibris/src/plugins/comments_page.css @@ -1,3 +1,7 @@ +.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; @@ -7,20 +11,30 @@ p[data-l10n-id="ep_comments_page.comment"] { font-weight: 900; font-size: 16px; - color: #64d29b; - font-family: Montserrat; text-transform: uppercase; margin-bottom: 10px; } -.sidebar-comment textarea { +#newComment.sidebar-comment textarea:not(.comment-suggest-from) { border: 1px solid #d2d2d2; - width: calc(100% - 20px); border-radius: 3px; padding: 8px 10px; - color: #495057; - height: 60px; - font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif !important; + 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 { @@ -37,7 +51,6 @@ p[data-l10n-id="ep_comments_page.comment"] { .comment-suggest label { font-style: italic; font-weight: normal; - color: #495057; } .sidebar-comment input, @@ -45,29 +58,30 @@ p[data-l10n-id="ep_comments_page.comment"] { border-radius: 4px; text-transform: uppercase; font-weight: 900; - font-family: Montserrat; font-size: 13px; line-height: 1.5; width: auto; border: none; } -.sidebar-comment input[type=submit] { - background-color: #64d29b; +#newComment.sidebar-comment input[type=submit] { color: white; margin-right: 10px; padding: 0 10px; + border: none; } -.sidebar-comment input[type=reset] { +#newComment.sidebar-comment input[type=reset] { background-color: white; - color: #495057; + border: none; } .comment-content:focus { border: 2px solid rgba(33, 150, 243, 0.51); } +.comment-changeTo-approve input[type=submit] { width: 100%; } + .reply-comment-suggest-from-p, .comment-changeFrom-value, .comment-changeTo-value, @@ -81,7 +95,7 @@ p[data-l10n-id="ep_comments_page.comment"] { padding: 0; padding-top: 8px; /* width: inherit !important; */ - color: rgba(41, 125, 191, 0.85); + /*color: rgba(41, 125, 191, 0.85);*/ } textarea.comment-suggest-to { @@ -89,11 +103,9 @@ textarea.comment-suggest-to { } .suggestion { - font-weight: normal; - color: #495057; + font-weight: bold; font-size: 11px; text-transform: uppercase; - font-family: Montserrat; } #comments { @@ -139,7 +151,10 @@ textarea.comment-suggest-to { .comment-modal-comment>section { padding: 0 15px; padding-bottom: 10px; + margin-top: 5px; display: block; + line-height: 20px; + margin-top: 8px; } .comment-delete-container { @@ -160,7 +175,6 @@ textarea.comment-suggest-to { } .comment-reply-input-label span { - color: #5cc390; font-weight: bold; } @@ -168,20 +182,17 @@ textarea.comment-suggest-to { border: 1px solid #d2d2d2 !important; width: calc(100% - 20px) !important; padding: 8px 10px; - font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif !important; text-transform: none !important; - color: #495057; margin-top: 5px; margin-bottom: 10px; + font-weight: normal; } .reply-suggestion p:not(.reply-comment-suggest-from-p) { text-transform: uppercase; - color: #495057; font-size: 11px; font-weight: 400; text-transform: uppercase; - font-family: Montserrat; } .comment-changeTo-approve input { @@ -200,7 +211,7 @@ textarea.comment-suggest-to { .comment-text { font-weight: normal; - color: #495057; + line-height: 20px; } .sidebar-comment-reply:nth-child(even) { @@ -214,15 +225,12 @@ textarea.comment-suggest-to { .comment-author-name { font-style: normal; - color: #4c4c4c; } .comment-changeFrom-label, .comment-changeTo-label { - font-family: Montserrat; text-transform: uppercase; font-size: 11px; - font-weight: normal; } .comment-reply note { @@ -240,6 +248,13 @@ textarea.comment-suggest-to { .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; }