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

fix #1397 - rename role

stable
Juanfran 2014-10-22 08:54:38 +02:00 committed by Xavier Julián
parent a3d1c4bc65
commit f2eeb11a60
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/partials/views/modules/lightbox-ask-choice.jade
View File

@ -7,6 +7,7 @@ form
span.subtitle #125 Crear el perfil de usuario senior en el admin
span.replacement What value do you want to use as replacement?
select.choices
p if the role is deleted all role estimates will be deleted
div.options
a.button.button-green(href="", title="Accept")
span Accept

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

@ -5,8 +5,16 @@
}
.edit-role {
@include table-flex(stretch, left, center, row, wrap);
<<<<<<< HEAD
margin-bottom: 1rem;
input {
=======
background-color: $whitish;
margin-bottom: 1rem;
padding: .5rem;
input {
background-color: $white;
>>>>>>> fix #1397 - rename role
width: auto;
}
.icon-floppy {
@ -18,7 +26,7 @@
@extend %title;
background-color: $whitish;
color: $grayer;
padding: .5rem 1rem;
padding: 1rem;
span {
@extend %medium;
@extend %text;