flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-21 14:56:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/nerzhul/ocsms

Browse Source
This commit is contained in:
Loic Blot 2016-12-15 20:59:07 +01:00
commit 9fb4b6e340
2 changed files with 12 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
css/style.css
View File

@ -25,6 +25,8 @@
width: 100%; width: 100%;
border-top: 1px solid #eee; border-top: 1px solid #eee;
box-sizing: border-box; box-sizing: border-box;
display: flex;
align-items: center;
} }
#app-mailbox-peers li:hover > a, #app-mailbox-peers li:hover > a,
@ -140,26 +142,23 @@
} }
.msg-sent, .msg-recv { .msg-sent, .msg-recv {
border-radius: 12px; border: 1px solid #ccc;
border-left-width: 4px;
border-radius: 2px;
margin: 4px; margin: 4px;
max-width: 50%; max-width: 50%;
padding: 8px; padding: 8px;
box-shadow: 1px 1px 1px #CCC; box-shadow: 0px 1px 2px 0px #0000004d;
-moz-box-shadow: 1px 1px 1px #CCC;
-webkit-box-shadow: 1px 1px 1px #CCC;
-ms-box-shadow: 1px 1px 1px #CCC;
-o-box-shadow: 1px 1px 1px #CCC;
} }
.msg-sent { .msg-sent {
border: 1px solid #bbb; border-color: #a0ce89;
background: #a5fb7a; background: #e0ffd1;
float: right; float: right;
} }
.msg-recv { .msg-recv {
border: 1px solid #bbb; background: #f5f5f5;
background: #e8e8e8;
float: left; float: left;
} }
@ -214,27 +213,7 @@ label {
font-weight: bold; font-weight: bold;
} }
.loader, .icon-loading {
.loader:before,
.loader:after {
background: #646464;
-webkit-animation: load1 1s infinite ease-in-out;
animation: load1 1s infinite ease-in-out;
width: 1em;
height: 4em;
}
.loader:before,
.loader:after {
position: absolute;
top: 0;
content: '';
}
.loader:before {
left: -1.5em;
-webkit-animation-delay: -0.32s;
animation-delay: -0.32s;
}
.loader {
color: #646464; color: #646464;
text-indent: -9999em; text-indent: -9999em;
margin: 88px auto; margin: 88px auto;
@ -246,30 +225,3 @@ label {
-webkit-animation-delay: -0.16s; -webkit-animation-delay: -0.16s;
animation-delay: -0.16s; animation-delay: -0.16s;
} }
.loader:after {
left: 1.5em;
}
@-webkit-keyframes load1 {
0%,
80%,
100% {
box-shadow: 0 0;
height: 4em;
}
40% {
box-shadow: 0 -2em;
height: 5em;
}
}
@keyframes load1 {
0%,
80%,
100% {
box-shadow: 0 0;
height: 4em;
}
40% {
box-shadow: 0 -2em;
height: 5em;
}
}

4
templates/main.php
View File

@ -8,7 +8,7 @@ use \OCA\OcSms\Lib\CountryCodes;
<div class="ng-scope" id="app" ng-app="OcSms" ng-controller="OcSmsController"> <div class="ng-scope" id="app" ng-app="OcSms" ng-controller="OcSmsController">
<div id="app-mailbox-peers"> <div id="app-mailbox-peers">
<div id="app-contacts-loader" class="loader" ng-show="isContactsLoading"> <div id="app-contacts-loader" class="icon-loading" ng-show="isContactsLoading">
</div> </div>
<ul class="contact-list" ng-show="!isContactsLoading"> <ul class="contact-list" ng-show="!isContactsLoading">
<li ng-repeat="contact in contacts | orderBy:setting_contactOrder:setting_contactOrderReverse" peer-label="{{ contact.label }}" ng-click="loadConversation(contact);" href="#"> <li ng-repeat="contact in contacts | orderBy:setting_contactOrder:setting_contactOrderReverse" peer-label="{{ contact.label }}" ng-click="loadConversation(contact);" href="#">
@ -58,7 +58,7 @@ use \OCA\OcSms\Lib\CountryCodes;
</div> </div>
<div id="app-content"> <div id="app-content">
<div id="app-content-loader" class="loader" ng-show="isConvLoading"> <div id="app-content-loader" class="icon-loading" ng-show="isConvLoading">
</div> </div>
<div id="app-content-header" ng-show="!isConvLoading && selectedContact.label !== undefined && selectedContact.label !== ''" <div id="app-content-header" ng-show="!isConvLoading && selectedContact.label !== undefined && selectedContact.label !== ''"
ng-style="{'background-color': (selectedContact.label | peerColor)}"> ng-style="{'background-color': (selectedContact.label | peerColor)}">