diff options
author | Damien <dcosset@hotmail.fr> | 2016-01-15 14:37:15 +0300 |
---|---|---|
committer | Damien <dcosset@hotmail.fr> | 2016-01-15 14:37:15 +0300 |
commit | 772f0dc860b3ae3d5b12f0f17f6f4d86b1c718b7 (patch) | |
tree | 0ff86b77950701f97b2e86dfd60ab0961e5f0f65 | |
parent | 84e495e8a10f65dab11f9b6dbae9ae2c5bbb3590 (diff) |
Few changes according to #817
Changed some _ for - .
-rwxr-xr-x | css/mail.css | 46 | ||||
-rw-r--r-- | css/mobile.css | 6 | ||||
-rw-r--r-- | js/controller/foldercontroller.js | 2 | ||||
-rw-r--r-- | js/templates/message-list-item.html | 8 | ||||
-rwxr-xr-x | js/ui.js | 8 | ||||
-rw-r--r-- | js/views/app.js | 4 | ||||
-rwxr-xr-x | js/views/helper.js | 2 | ||||
-rw-r--r-- | templates/index.php | 4 |
8 files changed, 40 insertions, 40 deletions
diff --git a/css/mail.css b/css/mail.css index ee59b787f..eed4ace33 100755 --- a/css/mail.css +++ b/css/mail.css @@ -140,14 +140,14 @@ /* STOP: should be done in core/apps.css */ #emptycontent, -#mail_messages #emptycontent.emptycontent-search { +#mail-messages #emptycontent.emptycontent-search { position: static; margin-top: 2em; } -#mail_messages #emptycontent.emptycontent-search h2 { +#mail-messages #emptycontent.emptycontent-search h2 { line-height: 150%; } -#mail_messages #emptycontent { +#mail-messages #emptycontent { position: absolute; } @@ -213,7 +213,7 @@ /* app content*/ -#mail_messages { +#mail-messages { width: 30%; height: 100%; overflow-x: hidden; @@ -239,17 +239,17 @@ height: 68px; } -.mail_message_summary { +.mail-message-summary { border-top: 1px solid #eee; position: relative; } -.mail_message_summary:hover, -.mail_message_summary:focus, -.mail_message_summary.active { +.mail-message-summary:hover, +.mail-message-summary:focus, +.mail-message-summary.active { background-color: #f8f8f8; } -.mail_message_summary * { +.mail-message-summary * { cursor: pointer; } @@ -260,8 +260,8 @@ padding-left: 10px; } -.mail_message_summary_from, -.mail_message_summary_subject, +.mail-message-summary-from, +.mail-message-summary-subject, .date { display: inline-block; padding: 12px; @@ -270,14 +270,14 @@ text-overflow: ellipsis; } -.mail_message_summary_from { +.mail-message-summary-from { width: 55%; margin-left: 37px; padding-bottom: 0; opacity: .5; } -.mail_message_summary_subject { +.mail-message-summary-subject { padding-top: 0; width: 75%; margin-left: 37px; @@ -292,13 +292,13 @@ opacity: .5; } -.mail_message_summary.unseen .mail_message_summary_from, -.mail_message_summary.unseen .mail_message_summary_subject, -.mail_message_summary.unseen .date { +.mail-message-summary.unseen .mail-message-summary-from, +.mail-message-summary.unseen .mail-message-summary-subject, +.mail-message-summary.unseen .date { font-weight: bold; } -#mail_messages .action.delete { +#mail-messages .action.delete { position: absolute; bottom: 0; right: 0; @@ -306,8 +306,8 @@ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=25)"; opacity: .15; } -#mail_messages .action.delete:hover, -#mail_messages .action.delete:focus { +#mail-messages .action.delete:hover, +#mail-messages .action.delete:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; opacity: .5; } @@ -457,9 +457,9 @@ input.submit-message { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; opacity: 1; } -.mail_message_summary.active .star.icon-star, -.mail_message_summary:hover .star.icon-star, -.mail_message_summary:focus .star.icon-star { +.mail-message-summary.active .star.icon-star, +.mail-message-summary:hover .star.icon-star, +.mail-message-summary:focus .star.icon-star { display: inline-block; } @@ -471,7 +471,7 @@ input.submit-message { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; opacity: .5; } -.icon-reply ~ .mail_message_summary_subject { +.icon-reply ~ .mail-message-summary-subject { margin-left: 57px; width: 65%; } diff --git a/css/mobile.css b/css/mobile.css index 775c21d4b..4d72311a1 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -1,7 +1,7 @@ @media only screen and (max-width: 768px) { /* full width for message list on mobile */ -#mail_messages { +#mail-messages { width: 100%; } @@ -64,10 +64,10 @@ display: none; } /* more space for sender accordingly */ -.mail_message_summary_from { +.mail-message-summary-from { width: 80%; } -.mail_message_summary_subject { +.mail-message-summary-subject { width: 80%; } diff --git a/js/controller/foldercontroller.js b/js/controller/foldercontroller.js index c3ab0faae..95ce8fc52 100644 --- a/js/controller/foldercontroller.js +++ b/js/controller/foldercontroller.js @@ -70,7 +70,7 @@ define(function(require) { var UI = require('app').UI; // TODO: create loading-view - $('#mail_messages').removeClass('hidden').addClass('icon-loading'); + $('#mail-messages').removeClass('hidden').addClass('icon-loading'); $('#mail-message').removeClass('hidden').addClass('icon-loading'); $('#mail_new_message').removeClass('hidden'); $('#folders').removeClass('hidden'); diff --git a/js/templates/message-list-item.html b/js/templates/message-list-item.html index e27d9273c..4a4d89a01 100644 --- a/js/templates/message-list-item.html +++ b/js/templates/message-list-item.html @@ -1,4 +1,4 @@ -<div class="mail_message_summary {{#if flags.unseen}}unseen{{/if}} {{#if active}}active{{/if}}" data-message-id="{{id}}"> +<div class="mail-message-summary {{#if flags.unseen}}unseen{{/if}} {{#if active}}active{{/if}}" data-message-id="{{id}}"> {{#if accountMail}} <div class="mail-message-account-color" style="background-color: {{accountColor accountMail}}"></div> {{/if}} @@ -25,8 +25,8 @@ <div class="icon-public icon-attachment"></div> {{/if}} - <div class="mail_message_summary_from" title="{{fromEmail}}">{{from}}</div> - <div class="mail_message_summary_subject" title="{{subject}}"> + <div class="mail-message-summary-from" title="{{fromEmail}}">{{from}}</div> + <div class="mail-message-summary-subject" title="{{subject}}"> {{subject}} </div> <div class="date"> @@ -37,4 +37,4 @@ </div> <div class="icon-delete action delete" title="{{delete}}"></div> </div> -</div>
\ No newline at end of file +</div> @@ -91,7 +91,7 @@ define(function(require) { // setup messages view messageView = new MessagesView({ - el: $('#mail_messages') + el: $('#mail-messages') }); messageView.render(); @@ -216,7 +216,7 @@ define(function(require) { // Set folder active setFolderActive(accountId, folderId); clearMessages(); - $('#mail_messages') + $('#mail-messages') .removeClass('hidden') .addClass('icon-loading') .removeClass('hidden'); @@ -237,7 +237,7 @@ define(function(require) { require('app').State.currentAccountId = accountId; require('app').State.currentFolderId = folderId; setMessageActive(null); - $('#mail_messages').removeClass('icon-loading'); + $('#mail-messages').removeClass('icon-loading'); require('app').State.currentlyLoading = null; } else { require('app').Communication.fetchMessageList(accountId, folderId, { @@ -246,7 +246,7 @@ define(function(require) { require('app').State.currentAccountId = accountId; require('app').State.currentFolderId = folderId; setMessageActive(null); - $('#mail_messages').removeClass('icon-loading'); + $('#mail-messages').removeClass('icon-loading'); // Fade out the message composer $('#mail_new_message').prop('disabled', false); diff --git a/js/views/app.js b/js/views/app.js index 1cab54fb7..97fb595ba 100644 --- a/js/views/app.js +++ b/js/views/app.js @@ -55,10 +55,10 @@ define(function(require) { // and message list is visible (not being in a settings dialog) // and if searchbox is not focused if (!$('.to, .cc, .message-body').is(':focus') && - $('#mail_messages').is(':visible') && + $('#mail-messages').is(':visible') && !$('#searchbox').is(':focus')) { // Mimic a client clicking the delete button for the currently active message. - $('.mail_message_summary.active .icon-delete.action.delete').click(); + $('.mail-message-summary.active .icon-delete.action.delete').click(); } } } diff --git a/js/views/helper.js b/js/views/helper.js index 9fcd9fed3..6c10a9638 100755 --- a/js/views/helper.js +++ b/js/views/helper.js @@ -144,7 +144,7 @@ define(function(require) { controlsWidth = $('#content').width() - $('#app-navigation').width() - - $('#mail_messages').width() - + $('#mail-messages').width() - getScrollBarWidth(); } $('#mail-message-header').css('width', controlsWidth); diff --git a/templates/index.php b/templates/index.php index cbf384d13..aed096ad9 100644 --- a/templates/index.php +++ b/templates/index.php @@ -43,8 +43,8 @@ if ($debug) { </div> </div> <div id="app-content"> - <div id="mail_messages"></div> + <div id="mail-messages"></div> <div id="setup" class="hidden" ></div> <div id="mail-message" class="icon-loading hidden-mobile"></div> </div> -</div>
\ No newline at end of file +</div> |