From f2eeb11a606df3d8647d09d0a75b4b5275e47ba4 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 22 Oct 2014 08:54:38 +0200
Subject: [PATCH] fix #1397 - rename role

---
 app/partials/views/modules/lightbox-ask-choice.jade |  1 +
 app/styles/modules/admin/admin-roles.scss           | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/partials/views/modules/lightbox-ask-choice.jade b/app/partials/views/modules/lightbox-ask-choice.jade
index 0dcf1406..1fd43298 100644
--- a/app/partials/views/modules/lightbox-ask-choice.jade
+++ b/app/partials/views/modules/lightbox-ask-choice.jade
@@ -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
diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss
index 4bd3839b..9bcbcb46 100644
--- a/app/styles/modules/admin/admin-roles.scss
+++ b/app/styles/modules/admin/admin-roles.scss
@@ -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;