Skip to content

Commit

Permalink
refactor(litleIssues): preloader logs and firefox, tabs - icons,messa…
Browse files Browse the repository at this point in the history
…ge-center icons raonded
  • Loading branch information
SashaSkywalker committed Mar 5, 2016
1 parent e6100f4 commit f8cae97
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/app/pages/ui/tabs/sideTabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Take up one idea.
</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>
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>
Expand Down Expand Up @@ -45,7 +45,7 @@
Take up one idea.
</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>
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>
Expand Down
4 changes: 2 additions & 2 deletions src/app/theme/components/msgCenter/msgCenter.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<div class="msg-list">
<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 ng-bind-html="getMessage(msg)"></div>
<span>{{ msg.time }}</span>
Expand All @@ -40,7 +40,7 @@
</div>
<div class="msg-list">
<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>{{ msg.text }}</div>
<span>{{ msg.time }}</span>
Expand Down
3 changes: 0 additions & 3 deletions src/app/theme/services/preloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@
var img = new Image();
img.src = src;
img.onload = function(){
console.log("img " + src + " loaded");
d.resolve();
};
return d.promise;
},
loadAmCharts : function(){
var d = $q.defer();
console.log("amchart");
AmCharts.ready(function(){
console.log("amchart loaded");
d.resolve();
});
return d.promise;
Expand Down
11 changes: 10 additions & 1 deletion src/sass/app/_iconsPage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ a.see-all-icons {
float: right;
}

.awesomeIcons{
.awesomeIcons {
height: 308px;
}

Expand All @@ -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 {
text-align: center;
margin: 0 auto;
Expand Down
8 changes: 8 additions & 0 deletions src/sass/theme/_preloader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
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 {
0% {
Expand Down
4 changes: 3 additions & 1 deletion src/sass/theme/components/_msgCenter.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@
img {
width: 36px;
height: 36px;
border-radius: 4px;
&.photo-msg-item{
border-radius: 18px;
}
}
& > div {
width: 36px;
Expand Down

0 comments on commit f8cae97

Please sign in to comment.