Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
cloudbehl committed Apr 17, 2017
2 parents 6e8d9d8 + 0fa2cb5 commit 05df474
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Tendrl",
"description": "Dashboard",
"version": "0.0.1",
"version": "1.2.1",
"dependencies": {
"angular": "~1.5.8",
"angular-animate": "~1.5.8",
Expand Down
2 changes: 1 addition & 1 deletion src/commons/components/create-pool/create-pool.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.wizard-pf {
.wizard-pf-sidebar {
top: 125px;
bottom: 0;
height: 78vh;
}
}
.bold-text {
Expand Down
1 change: 1 addition & 0 deletions src/modules/rbd/create-rbd/create-rbd.scss
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@

.create-pool-wizard .wizard-pf .wizard-pf-body .wizard-pf-sidebar{
top: 254px;
height: 65vh;
}

.hide-rbd-footer{
Expand Down

0 comments on commit 05df474

Please sign in to comment.