refactor(litleIssues): preloader logs and firefox, tabs - icons,message-center icons raonded

pull/3/head
alex 2016-03-05 17:46:49 +03:00
parent e6100f4b28
commit f8cae976cf
6 changed files with 25 additions and 9 deletions

View File

@ -6,7 +6,7 @@
Take up one idea. Take up one idea.
</p> </p>
<div class="kameleon-icon with-round-bg danger"><img ng-src="{{::( 'Key' | kameleonImg )}}"></div> <div class="kameleon-icon-tabs kameleon-icon with-round-bg danger"><img ng-src="{{::( 'Key' | kameleonImg )}}"></div>
<p> <p>
People who succeed have momentum. The more they succeed, the more they want to succeed, and the more they find a People who succeed have momentum. The more they succeed, the more they want to succeed, and the more they find a
way to succeed. </p> way to succeed. </p>
@ -45,7 +45,7 @@
Take up one idea. Take up one idea.
</p> </p>
<div class="kameleon-icon with-round-bg warning"><img ng-src="{{::( 'Phone-Booth' | kameleonImg )}}"></div> <div class="kameleon-icon-tabs kameleon-icon with-round-bg warning"><img ng-src="{{::( 'Phone-Booth' | kameleonImg )}}"></div>
<p> <p>
People who succeed have momentum. The more they succeed, the more they want to succeed, and the more they find a People who succeed have momentum. The more they succeed, the more they want to succeed, and the more they find a
way to succeed. </p> way to succeed. </p>

View File

@ -16,7 +16,7 @@
</div> </div>
<div class="msg-list"> <div class="msg-list">
<a href class="clearfix" ng-repeat="msg in notifications"> <a href class="clearfix" ng-repeat="msg in notifications">
<div class="img-area"><img ng-src="{{::( msg.image || (users[msg.userId].name | profilePicture) )}}"></div> <div class="img-area"><img ng-class="{'photo-msg-item' : !msg.image}" ng-src="{{::( msg.image || (users[msg.userId].name | profilePicture) )}}"></div>
<div class="msg-area"> <div class="msg-area">
<div ng-bind-html="getMessage(msg)"></div> <div ng-bind-html="getMessage(msg)"></div>
<span>{{ msg.time }}</span> <span>{{ msg.time }}</span>
@ -40,7 +40,7 @@
</div> </div>
<div class="msg-list"> <div class="msg-list">
<a href class="clearfix" ng-repeat="msg in messages"> <a href class="clearfix" ng-repeat="msg in messages">
<div class="img-area"><img ng-src="{{::( users[msg.userId].name | profilePicture )}}"></div> <div class="img-area"><img class="photo-msg-item" ng-src="{{::( users[msg.userId].name | profilePicture )}}"></div>
<div class="msg-area"> <div class="msg-area">
<div>{{ msg.text }}</div> <div>{{ msg.text }}</div>
<span>{{ msg.time }}</span> <span>{{ msg.time }}</span>

View File

@ -16,16 +16,13 @@
var img = new Image(); var img = new Image();
img.src = src; img.src = src;
img.onload = function(){ img.onload = function(){
console.log("img " + src + " loaded");
d.resolve(); d.resolve();
}; };
return d.promise; return d.promise;
}, },
loadAmCharts : function(){ loadAmCharts : function(){
var d = $q.defer(); var d = $q.defer();
console.log("amchart");
AmCharts.ready(function(){ AmCharts.ready(function(){
console.log("amchart loaded");
d.resolve(); d.resolve();
}); });
return d.promise; return d.promise;

View File

@ -33,7 +33,7 @@ a.see-all-icons {
float: right; float: right;
} }
.awesomeIcons{ .awesomeIcons {
height: 308px; height: 308px;
} }
@ -58,6 +58,15 @@ a.see-all-icons {
} }
} }
.kameleon-icon-tabs {
max-width: 84px;
img {
width: 100%;
min-width: 81px;
min-height: 81px;
}
}
.kameleon-icon { .kameleon-icon {
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;

View File

@ -6,6 +6,14 @@
transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */ transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */
} }
} }
@-moz-keyframes spin {
0% {
-moz-transform: rotate(0deg); /* Firefox 16+*/
}
100% {
-moz-transform: rotate(360deg); /* Firefox 16+*/
}
}
@keyframes spin { @keyframes spin {
0% { 0% {

View File

@ -148,7 +148,9 @@
img { img {
width: 36px; width: 36px;
height: 36px; height: 36px;
border-radius: 4px; &.photo-msg-item{
border-radius: 18px;
}
} }
& > div { & > div {
width: 36px; width: 36px;