Skip to content

Commit

Permalink
fix(dashboard): fix popular app control
Browse files Browse the repository at this point in the history
  • Loading branch information
KostyaDanovsky committed May 13, 2016
1 parent 1a9329b commit 5322ca6
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
7 changes: 5 additions & 2 deletions src/app/pages/dashboard/popularApp/popularApp.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<div class="popular-app-img">
<img ng-src="{{::( 'app/my-app-logo.png' | appImage )}}"/>
<div class="popular-app-img-container">
<div class="popular-app-img">
<img ng-src="{{::( 'app/my-app-logo.png' | appImage )}}"/>
<span class="logo-text">Super&nbspApp</span>
</div>
</div>
<div class="popular-app-cost row">
<div class="col-xs-9">
Expand Down
2 changes: 1 addition & 1 deletion src/app/theme/theme.constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

var IMAGES_ROOT = 'assets/img/';

var blurTheme = false;
var blurTheme = true;

var basic = {
default: 'rgba(#000000, 0.2)',
Expand Down
Binary file modified src/assets/img/app/my-app-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 13 additions & 6 deletions src/sass/theme/dashboard/_popularApp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,33 @@
padding: 0;
}

.popular-app-img {
.popular-app-img-container {
position: relative;
padding: 30px 0;
height: 260px;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
background: rgba(0, 0, 0, 0.5);
img {
max-width: 85%;
//background: rgba(0, 0, 0, 0.5);
.popular-app-img {
width: 260px;
position: absolute;
transform: translateY(-50%) translate(-50%);
top: 50%;
left: 50%;

.logo-text {
display: inline-block;
margin: 10px;
font-size: 26px;
color: $default-text;
}
}
}
.popular-app-cost {
font-size: 20px;
padding: 20px 22px;
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.12);
border-bottom: 1px solid $border-light;
border-top: 1px solid $border-light;
}
.popular-app-info {
padding: 20px 22px;
Expand Down

0 comments on commit 5322ca6

Please sign in to comment.