Commit e213112f authored by Phil Hughes's avatar Phil Hughes

Mobile spacing for override ldap permissions box

Toggle button text fix
parent 5b0a041e
...@@ -37,8 +37,11 @@ ...@@ -37,8 +37,11 @@
return $el.data('id'); return $el.data('id');
}, },
toggleLabel (selected, $el) { toggleLabel (selected, $el) {
console.log($el.text().trim()); if ($link.data('revert')) {
return $el.text(); return $btn.text();
} else {
return $el.text();
}
}, },
clicked: (selected, $el) => { clicked: (selected, $el) => {
const $link = $($el); const $link = $($el);
......
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
.member { .member {
&.is-overriden { &.is-overriden {
.btn-ldap-override { .btn-ldap-override {
visibility: hidden; display: none!important;
}
.form-horizontal {
margin-right: 45px;
} }
} }
...@@ -117,14 +121,36 @@ ...@@ -117,14 +121,36 @@
.alert-member-ldap { .alert-member-ldap {
background-color: #fff1e0; background-color: #fff1e0;
line-height: 40px;
@media (min-width: $screen-sm-min) {
line-height: 40px;
}
> p { > p {
float: left; float: left;
margin-bottom: 10px;
color: $orange-normal; color: $orange-normal;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
padding-left: 55px; padding-left: 55px;
margin-bottom: 0;
}
}
.controls {
width: 100%;
@media (min-width: $screen-sm-min) {
width: auto;
} }
} }
} }
.btn-ldap-override {
width: 100%;
@media (min-width: $screen-sm-min) {
margin-left: 10px;
width: auto;
}
}
...@@ -115,10 +115,12 @@ ...@@ -115,10 +115,12 @@
Delete Delete
= icon('trash', class: 'hidden-xs') = icon('trash', class: 'hidden-xs')
- elsif member.ldap - elsif member.ldap
%button.btn.btn-default.btn-ldap-override.prepend-left-10.js-ldap-permissions{ type: "button", %button.btn.btn-default.btn-ldap-override.js-ldap-permissions{ type: "button",
"aria-label" => "Override LDAP settings", "aria-label" => "Edit permissions",
data: { name: user.name, id: dom_id(member) } } data: { name: user.name, id: dom_id(member) } }
= icon("pencil") %span.visible-xs-block.visible-sm-block
Edit permissions
= icon("pencil", class: "hidden-xs hidden-sm")
- else - else
%span.member-access-text= member.human_access %span.member-access-text= member.human_access
- if member.ldap - if member.ldap
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment