taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #169 from taigaio/issue/1608/admin-layout-broken 

Fix admin layout in safari and other browsers
stable
David Barragán Merino 2014-11-19 19:24:27 +01:00
parent d22d0e2259 c970adbec2
commit 7719e1a275
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/coffee/modules/admin/roles.coffee
View File

@ -251,7 +251,8 @@ RolePermissionsDirective = ($rootscope, $repo, $confirm) ->
<div class="category-items">
<div class="items-container">
<% _.each(category.permissions, function(permission) { %>
<div class="category-item" data-id="<%- permission.key %>"> <%- permission.description %>
<div class="category-item" data-id="<%- permission.key %>">
<span><%- permission.description %></span>
<div class="check">
<input type="checkbox" <% if(permission.active) { %>checked="checked"<% } %>/>
<div></div>

1
app/coffee/modules/common/lightboxes.coffee
View File

@ -44,7 +44,6 @@ class LightboxService extends taiga.Service
docEl = angular.element(document)
docEl.off(".lightbox")
docEl.off(".keyboard-navigation") # Hack: to fix problems in the WYSIWYG textareas when press ENTER
$el.one "transitionend", =>
$el.removeAttr('style')
$el.removeClass("open").removeClass('close')

6
app/styles/modules/admin/admin-roles.scss
View File

@ -39,9 +39,9 @@
padding: .5rem;
}
.general-category {
align-items: center;
display: flex;
justify-content: flex-end;
@include display(flex);
@include align-items(center);
@include justify-content(flex-end);
padding-bottom: 2rem;
.check {
margin-left: .5rem;

16
app/styles/modules/common/category-config.scss
View File

@ -4,13 +4,14 @@
border-top: 1px solid $gray-light;
}
.resume {
@include table-flex($align-items: center);
@include display(flex);
@include align-items(space-between);
cursor: pointer;
padding: 1rem;
position: relative;
}
.resume-title {
@include table-flex-child(1, 280px, 0);
width: 280px;
}
.count {
color: $gray-light;
@ -18,7 +19,8 @@
padding-right: 5px;
}
.summary-role {
@include table-flex-child(3, 280px, 0);
@include flex(1);
width: 280px;
.role-summary-single {
background: $gray-light;
display: inline-block;
@ -34,7 +36,7 @@
}
}
.icon {
@include table-flex-child(1, 0, 0);
@include flex(1);
@extend %xlarge;
text-align: right;
}
@ -47,10 +49,10 @@
}
}
.category-item {
align-items: center;
@include display(flex);
@include justify-content(space-between);
@include align-items(center);
border-bottom: 1px solid $very-light-gray;
display: flex;
justify-content: space-between;
padding: .5rem .5rem .5rem 2rem;
&:last-child {
border-bottom: 0;