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

Rrebohluciónt

stable
Xavier Julián 2014-10-23 13:21:13 +02:00
parent f9b102527d
commit 3eb76b5566
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,24 +27,12 @@
} }
.edit-role { .edit-role {
@include table-flex(stretch, left, center, row, wrap); @include table-flex(stretch, left, center, row, wrap);
<<<<<<< HEAD
<<<<<<< HEAD
margin-bottom: 1rem;
input {
=======
=======
>>>>>>> Admin roles design and UX
background-color: $whitish; background-color: $whitish;
margin-bottom: 1rem; margin-bottom: 1rem;
padding: .5rem; padding: .5rem;
input { input {
background-color: $white; background-color: $white;
<<<<<<< HEAD
>>>>>>> fix #1397 - rename role
width: auto;
=======
width: 50%; width: 50%;
>>>>>>> Admin roles design and UX
} }
.icon-floppy { .icon-floppy {
@include transition(color.3s linear); @include transition(color.3s linear);