Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #18968 from verchaswa/Bug_999939_MADAI_CAMERA_No_e…
Browse files Browse the repository at this point in the history
…ffect_on_camera_option_menu_back_button

[Bug 999939][MADAI][CAMERA] No effect on camera option menu back button
  • Loading branch information
wilsonpage committed Jun 3, 2014
2 parents 0851a4e + 9928d15 commit 4d3d20b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 11 deletions.
4 changes: 3 additions & 1 deletion apps/camera/js/views/setting-options.js 100644 → 100755
Expand Up @@ -73,7 +73,9 @@ module.exports = View.extend({

template: function(data) {
return '<div class="inner">' +
'<h2 class="settings_title icon-back-arrow js-back">' +
'<h2 class="settings_title">' +
'<button class="settings-back-btn icon-back-arrow js-back">' +
'</button>' +
this.l10n.get(data.header) + '</h2>' +
'<div class="settings_items"><ul class="inner js-list"></ul></div>' +
'</div>';
Expand Down
32 changes: 22 additions & 10 deletions apps/camera/style/setting-options.css 100644 → 100755
Expand Up @@ -17,16 +17,6 @@
height: 100%;
}

/** Title
---------------------------------------------------------*/

.setting-options .settings_title:before {
display: block;
position: absolute;
left: -1rem; top: 0;
font-size: 24px;
}

/** Items
---------------------------------------------------------*/

Expand Down Expand Up @@ -105,3 +95,25 @@
.setting-option.selected:before {
visibility: visible;
}

.settings-back-btn {
width: 15rem;
height: 9rem;
background: transparent;
border: none;
text-shadow: none;
font-size: 24px;
color: #FFFFFF;
text-align: left;
margin-top: 0rem;
margin-right: -26.1rem;
margin-left: -3rem;
line-height: 9.5rem;
padding-left: 0.5rem;
position: absolute;
}

.settings-back-btn:active {
background: transparent;
color: #008EAb;
}

0 comments on commit 4d3d20b

Please sign in to comment.