From 065fd12021f69fe35031456e2562a900511d9b74 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Thu, 4 Aug 2016 11:35:29 +0800 Subject: [PATCH] MDL-54687 core_message: changed outder div's CSS class --- message/templates/message_area.mustache | 4 +- theme/bootstrapbase/less/moodle/message.less | 242 +++++++++---------- theme/bootstrapbase/style/moodle.css | 78 +++--- 3 files changed, 162 insertions(+), 162 deletions(-) diff --git a/message/templates/message_area.mustache b/message/templates/message_area.mustache index 4c0d2b8b4cb..bdc6ac4d91e 100644 --- a/message/templates/message_area.mustache +++ b/message/templates/message_area.mustache @@ -1,4 +1,4 @@ -
+
  • @@ -31,7 +31,7 @@ {{#js}} require(['core_message/message_area'], function(Messagearea) { - new Messagearea('.messaging-area-all'); + new Messagearea('.messaging-area-container'); } ); {{/js}} \ No newline at end of file diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less index 39d400f82f9..7a1886884ed 100644 --- a/theme/bootstrapbase/less/moodle/message.less +++ b/theme/bootstrapbase/less/moodle/message.less @@ -1,5 +1,5 @@ /** The message area **/ -.messaging-area-all { +.messaging-area-container { .actions { float: right; @@ -54,149 +54,149 @@ margin-right: -120px; } } -} -.messaging-area { - border: 1px solid black; - clear: both; + .messaging-area { + border: 1px solid black; + clear: both; - .setSelected() { - background-color: #CCF2FF; - } - - .contacts-area { - border-right: 1px solid black; - height: 600px; - - .searcharea { - padding: 5px; - text-align: center; + .setSelected() { + background-color: #CCF2FF; } - .contacts { - height: 505px; - overflow-y: scroll; + .contacts-area { + border-right: 1px solid black; + height: 600px; - .contact.selected { - .setSelected(); + .searcharea { + padding: 5px; + text-align: center; } - .contact { - &:hover { + .contacts { + height: 505px; + overflow-y: scroll; + + .contact.selected { .setSelected(); - cursor: pointer; } - .deleteconversationcheckbox { - display: none; + .contact { + &:hover { + .setSelected(); + cursor: pointer; + } + + .deleteconversationcheckbox { + display: none; + } + + .information { + padding-left: 8px; + padding-right: 8px; + + .name { + font-weight: bold; + } + + .lastmessage { + word-wrap: break-word; + } + } + } + } + + .tabs { + border-top: 1px solid black; + + .tab { + &:hover { + .setSelected(); + cursor: pointer; + } } - .information { - padding-left: 8px; - padding-right: 8px; + .tab.selected { + .setSelected(); + } + .tabconversations { + text-align: center; + border-right: 1px solid black; + } + + .tabcontacts { + text-align: center; + } + } + } + + .messages-area { + .profile { + padding: 5px; + font-size: 16px; + + .picture { .name { font-weight: bold; } + } - .lastmessage { + .information { + padding-top: 10px; + + ul { + list-style: none; + margin: 0; + } + } + + .actions { + padding-top: 10px; + } + } + + .name { + font-weight: bold; + } + + .messages { + height: 500px; + overflow-y: auto; + + .blocktime { + clear: both; + font-weight: bold; + text-align: center; + } + + .message { + + .deletemessagecheckbox { + display: none; + } + + .content { + border: 1px solid black; + padding-left: 5px; + margin-bottom: 5px; + font-size: 10px; word-wrap: break-word; + width: 80%; + } + + .content.left { + float: left; + } + + .content.right { + float: right; } } } - } - .tabs { - border-top: 1px solid black; - - .tab { - &:hover { - .setSelected(); - cursor: pointer; - } + .response textarea { + width: 80%; } - - .tab.selected { - .setSelected(); - } - - .tabconversations { - text-align: center; - border-right: 1px solid black; - } - - .tabcontacts { - text-align: center; - } - } - } - - .messages-area { - .profile { - padding: 5px; - font-size: 16px; - - .picture { - .name { - font-weight: bold; - } - } - - .information { - padding-top: 10px; - - ul { - list-style: none; - margin: 0; - } - } - - .actions { - padding-top: 10px; - } - } - - .name { - font-weight: bold; - } - - .messages { - height: 500px; - overflow-y: auto; - - .blocktime { - clear: both; - font-weight: bold; - text-align: center; - } - - .message { - - .deletemessagecheckbox { - display: none; - } - - .content { - border: 1px solid black; - padding-left: 5px; - margin-bottom: 5px; - font-size: 10px; - word-wrap: break-word; - width: 80%; - } - - .content.left { - float: left; - } - - .content.right { - float: right; - } - } - } - - .response textarea { - width: 80%; } } } diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index 3bd1401969e..e0da8ea9c32 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -5766,135 +5766,135 @@ a.ygtvspacer:hover { padding-left: 5px; } /** The message area **/ -.messaging-area-all .actions { +.messaging-area-container .actions { float: right; } -.messaging-area-all .actions .core-message-menu { +.messaging-area-container .actions .core-message-menu { margin: 0; } -.messaging-area-all .actions .core-message-menu li { +.messaging-area-container .actions .core-message-menu li { float: left; position: relative; list-style-type: none; white-space: nowrap; } -.messaging-area-all .actions .core-message-menu ul[aria-hidden=true] { +.messaging-area-container .actions .core-message-menu ul[aria-hidden=true] { display: none; } -.messaging-area-all .actions .core-message-menu .caret { +.messaging-area-container .actions .core-message-menu .caret { margin: 8px; } -.messaging-area-all .actions .core-message-menu .core-message-sub-menu { +.messaging-area-container .actions .core-message-menu .core-message-sub-menu { position: absolute; list-style: none; margin: 0; } -.messaging-area-all .actions .core-message-menu .core-message-sub-menu li { +.messaging-area-container .actions .core-message-menu .core-message-sub-menu li { float: none; } -.messaging-area-all .actions .core-message-menu .core-message-sub-menu .menu-focus a { +.messaging-area-container .actions .core-message-menu .core-message-sub-menu .menu-focus a { color: #fff; text-decoration: none; background-color: #00699e; background-image: linear-gradient(to bottom, #0070a8, #005f8f); background-repeat: repeat-x; } -.messaging-area-all .actions .core-message-menu .core-message-sub-menu[aria-hidden=false] { +.messaging-area-container .actions .core-message-menu .core-message-sub-menu[aria-hidden=false] { display: block; } -.messaging-area-all .actions .core-message-menu.core-message-menu-open-left .core-message-sub-menu { +.messaging-area-container .actions .core-message-menu.core-message-menu-open-left .core-message-sub-menu { margin-left: -120px; } -.messaging-area-all .actions .dir-rtl .core-message-menu.core-message-menu-open-left .core-message-sub-menu { +.messaging-area-container .actions .dir-rtl .core-message-menu.core-message-menu-open-left .core-message-sub-menu { margin-left: 0; margin-right: -120px; } -.messaging-area { +.messaging-area-container .messaging-area { border: 1px solid black; clear: both; } -.messaging-area .contacts-area { +.messaging-area-container .messaging-area .contacts-area { border-right: 1px solid black; height: 600px; } -.messaging-area .contacts-area .searcharea { +.messaging-area-container .messaging-area .contacts-area .searcharea { padding: 5px; text-align: center; } -.messaging-area .contacts-area .contacts { +.messaging-area-container .messaging-area .contacts-area .contacts { height: 505px; overflow-y: scroll; } -.messaging-area .contacts-area .contacts .contact.selected { +.messaging-area-container .messaging-area .contacts-area .contacts .contact.selected { background-color: #CCF2FF; } -.messaging-area .contacts-area .contacts .contact:hover { +.messaging-area-container .messaging-area .contacts-area .contacts .contact:hover { background-color: #CCF2FF; cursor: pointer; } -.messaging-area .contacts-area .contacts .contact .deleteconversationcheckbox { +.messaging-area-container .messaging-area .contacts-area .contacts .contact .deleteconversationcheckbox { display: none; } -.messaging-area .contacts-area .contacts .contact .information { +.messaging-area-container .messaging-area .contacts-area .contacts .contact .information { padding-left: 8px; padding-right: 8px; } -.messaging-area .contacts-area .contacts .contact .information .name { +.messaging-area-container .messaging-area .contacts-area .contacts .contact .information .name { font-weight: bold; } -.messaging-area .contacts-area .contacts .contact .information .lastmessage { +.messaging-area-container .messaging-area .contacts-area .contacts .contact .information .lastmessage { word-wrap: break-word; } -.messaging-area .contacts-area .tabs { +.messaging-area-container .messaging-area .contacts-area .tabs { border-top: 1px solid black; } -.messaging-area .contacts-area .tabs .tab:hover { +.messaging-area-container .messaging-area .contacts-area .tabs .tab:hover { background-color: #CCF2FF; cursor: pointer; } -.messaging-area .contacts-area .tabs .tab.selected { +.messaging-area-container .messaging-area .contacts-area .tabs .tab.selected { background-color: #CCF2FF; } -.messaging-area .contacts-area .tabs .tabconversations { +.messaging-area-container .messaging-area .contacts-area .tabs .tabconversations { text-align: center; border-right: 1px solid black; } -.messaging-area .contacts-area .tabs .tabcontacts { +.messaging-area-container .messaging-area .contacts-area .tabs .tabcontacts { text-align: center; } -.messaging-area .messages-area .profile { +.messaging-area-container .messaging-area .messages-area .profile { padding: 5px; font-size: 16px; } -.messaging-area .messages-area .profile .picture .name { +.messaging-area-container .messaging-area .messages-area .profile .picture .name { font-weight: bold; } -.messaging-area .messages-area .profile .information { +.messaging-area-container .messaging-area .messages-area .profile .information { padding-top: 10px; } -.messaging-area .messages-area .profile .information ul { +.messaging-area-container .messaging-area .messages-area .profile .information ul { list-style: none; margin: 0; } -.messaging-area .messages-area .profile .actions { +.messaging-area-container .messaging-area .messages-area .profile .actions { padding-top: 10px; } -.messaging-area .messages-area .name { +.messaging-area-container .messaging-area .messages-area .name { font-weight: bold; } -.messaging-area .messages-area .messages { +.messaging-area-container .messaging-area .messages-area .messages { height: 500px; overflow-y: auto; } -.messaging-area .messages-area .messages .blocktime { +.messaging-area-container .messaging-area .messages-area .messages .blocktime { clear: both; font-weight: bold; text-align: center; } -.messaging-area .messages-area .messages .message .deletemessagecheckbox { +.messaging-area-container .messaging-area .messages-area .messages .message .deletemessagecheckbox { display: none; } -.messaging-area .messages-area .messages .message .content { +.messaging-area-container .messaging-area .messages-area .messages .message .content { border: 1px solid black; padding-left: 5px; margin-bottom: 5px; @@ -5902,13 +5902,13 @@ a.ygtvspacer:hover { word-wrap: break-word; width: 80%; } -.messaging-area .messages-area .messages .message .content.left { +.messaging-area-container .messaging-area .messages-area .messages .message .content.left { float: left; } -.messaging-area .messages-area .messages .message .content.right { +.messaging-area-container .messaging-area .messages-area .messages .message .content.right { float: right; } -.messaging-area .messages-area .response textarea { +.messaging-area-container .messaging-area .messages-area .response textarea { width: 80%; } #newmessageoverlay {