Refactor of error messages 1/2

stable
Xavier Julián 2014-08-06 10:52:11 +02:00
parent f8ef271fab
commit 41c7181893
7 changed files with 51 additions and 29 deletions

View File

@ -31,8 +31,11 @@ MAX_MEMBERSHIP_FIELDSETS = 6
CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) -> CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
template = _.template(""" template = _.template("""
<div class="add-member-wrapper">
<fieldset> <fieldset>
<input type="email" placeholder="Type an Email" data-required="true" /> <input type="email" placeholder="Type an Email" data-required="true" />
</fieldset>
<fieldset>
<select data-required="true"> <select data-required="true">
<% _.each(roleList, function(role) { %> <% _.each(roleList, function(role) { %>
<option value="<%- role.id %>"><%- role.name %></option> <option value="<%- role.id %>"><%- role.name %></option>
@ -40,6 +43,7 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
</select> </select>
<a class="icon icon-plus add-fieldset" href=""></a> <a class="icon icon-plus add-fieldset" href=""></a>
</fieldset> </fieldset>
</div>
""") # i18n """) # i18n
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->

View File

@ -20,5 +20,5 @@ block content
div.paginator.memberships-paginator div.paginator.memberships-paginator
div.lightbox.ligbox_add-member.hidden(tg-lb-create-members) div.lightbox.lightbox_add-member.hidden(tg-lb-create-members)
include views/modules/lightbox_add-member include views/modules/lightbox_add-member

View File

@ -3,6 +3,8 @@ a.close(href="", title="close")
form form
h2.title New Member h2.title New Member
//- Form is set in a directive
a.button.button-green(href="", title="Save") a.button.button-green(href="", title="Save")
span Create span Create

View File

@ -35,6 +35,10 @@ textarea {
.checksley-error-list { .checksley-error-list {
margin-bottom: 0; margin-bottom: 0;
position: absolute;
top: 10px;
right: 2rem;
font-size: .8rem;
li { li {
color: $red; color: $red;
padding: .2rem; padding: .2rem;

View File

@ -1,6 +1,7 @@
.project-values-row { .project-values-row {
@include table-flex(stretch, center, flex, row, wrap, center); @include table-flex(stretch, center, flex, row, wrap, center);
border-bottom: 1px solid $whitish; border-bottom: 1px solid $whitish;
padding: 1rem;
&:hover { &:hover {
@include transition (background .2s ease-in); @include transition (background .2s ease-in);
background: lighten($green-taiga, 60%); background: lighten($green-taiga, 60%);
@ -10,7 +11,13 @@
opacity: 1; opacity: 1;
} }
} }
div {
margin-left: 1rem;
position: relative;
&:first-child {
margin: 0;
}
}
.icon { .icon {
@extend %large; @extend %large;
color: $gray-light; color: $gray-light;
@ -27,15 +34,12 @@
border-bottom: 2px solid $gray-light; border-bottom: 2px solid $gray-light;
} }
.project-values-name,
.project-values-isclosed,
.project-values-settings {
padding: 1rem;
}
.project-values-name { .project-values-name {
@include table-flex-child(3, 0, 0); @include table-flex-child(3, 0, 0);
} }
.project-values-value {
@include table-flex-child(1, 0, 0);
}
.project-values-isclosed, .project-values-isclosed,
.project-values-settings { .project-values-settings {

View File

@ -31,6 +31,9 @@
cursor: pointer; cursor: pointer;
} }
} }
div {
position: relative;
}
.color-column, .color-column,
.is-closed-column, .is-closed-column,
.options-column, .options-column,

View File

@ -154,27 +154,29 @@
} }
} }
.ligbox_add-member { .lightbox_add-member {
.add-member-wrapper {
@include table-flex();
}
fieldset { fieldset {
@include clearfix; position: relative;
margin-bottom: 1rem; &:first-child {
@include table-flex-child(3, 400px);
}
&:last-child {
@include table-flex-child(1, 200px);
margin-left: .5rem;
}
} }
input[type=email], input[type=email],
select { select {
float: left;
margin-bottom: 0; margin-bottom: 0;
} }
input[type=email] {
width: 430px;
}
select { select {
margin-left: .5rem; width: 80%;
width: 255px;
} }
.icon { .icon {
@extend %large; @extend %large;
float: left;
line-height: 40px;
margin-left: .5rem; margin-left: .5rem;
} }
.icon-delete { .icon-delete {
@ -183,12 +185,15 @@
} }
} }
.button { .button {
margin-top: 2rem; margin-top: 1rem;
} }
.help-text { .help-text {
@extend %small; @extend %small;
padding: .5rem 1rem; padding: .5rem 1rem;
} }
.checksley-error-list {
right: .5rem;
}
} }
.lightbox_add-sprint { .lightbox_add-sprint {