Merge pull request #2528 from bechi/layout-details-02

Layout details 02
This commit is contained in:
Matias Alejo Garcia 2015-04-16 15:18:35 -03:00
commit 014390665a
8 changed files with 23 additions and 21 deletions

View file

@ -6,8 +6,12 @@
</div>
<div class="dr-notification-content">
<h3 class="dr-notification-title">{{noti.title|translate}}</h3>
<div class="dr-notification-text label"
ng-style="{'background-color':noti.userData.color}">{{noti.content|translate}}</div>
<div class="dr-notification-text label radius" ng-show="noti.userData.color"
ng-style="{'background-color':noti.userData.color}">{{noti.content|translate}}
</div>
<div class="dr-notification-text" ng-show="!noti.userData.color"
>{{noti.content|translate}}
</div>
</div>
</div>
</div>

View file

@ -35,10 +35,10 @@
</div>
</div>
<div class="text-warning size-12 columns m20t" ng-show="index.askPassword.isSetup">
<p class="text-warning size-12 columns m20t text-center" ng-show="index.askPassword.isSetup">
<i class="fi-alert"></i>
<span translate ng-show="!pass.error"> Password cannot be recovered. Be sure to write it down</span>
<span ng-show="pass.error">{{pass.error|translate}}</span>
</div>
</p>
</div>