Spacing for invited users list class & fixes

- Fix disappearing right border on invite user modal
- Refactor rounded corners on login form
- Remove commented-out code from modals
This commit is contained in:
Paul Adam Davis 2014-07-17 15:48:09 +01:00
parent 819370b815
commit fff19ec0d5
5 changed files with 37 additions and 41 deletions

View File

@ -95,7 +95,7 @@
@include transition(background ease 0.25s); @include transition(background ease 0.25s);
@media (max-width: 630px) { @media (max-width: 630px) {
width:264px; width: 264px;
@include transition(none); @include transition(none);
} }
@ -115,13 +115,10 @@
z-index: 100; z-index: 100;
} }
margin-right: 3px; margin-right: 3px;
border-radius: 2px 0 0 2px;
@media (max-width: 630px) { @media (max-width: 630px) {
margin-right: 0; margin-right: 0;
border-radius: 2px;
}
}
.email { .email {
padding-left: 28px; padding-left: 28px;
border-radius: 2px 0 0 2px; border-radius: 2px 0 0 2px;
@ -136,19 +133,34 @@
left: 11px; left: 11px;
z-index: 100; z-index: 100;
} }
border-radius: 0 2px 2px 0;
@media (max-width: 630px) {
border-radius: 2px;
}
.password { .password {
padding-left: 28px; padding-left: 28px;
border-radius: 0 2px 2px 0; border-radius: 0 2px 2px 0;
} }
} }
@media (min-width: 631px) {
.email-wrap,
.email-wrap .email {
border-radius: 2px 0 0 2px;
}
.password-wrap,
.password-wrap .password {
border-radius: 0 2px 2px 0;
}
}
@media (max-width: 630px) {
.email-wrap,
.email-wrap .email,
.password-wrap,
.password-wrap .password {
border-radius: 2px;
}
}
button { button {
width: 85px; width: 85px;
height: 36px; height: 36px;

View File

@ -21,21 +21,17 @@
width: 60%; width: 60%;
} }
&:nth-of-type(2) { &:nth-of-type(2) {
float: right; float: left;
width: 35%; width: 35%;
margin-left: 5%;
} }
input, input {
select {
margin-top: 1px;
width: 100%; width: 100%;
} }
.gh-select {
padding-right: 1px;
}
} // .form-group } // .form-group
.button-add { .button-add {
width: 100%; width: 100%;
padding: 0.85rem 1.9rem; padding: 0.85rem 1.9rem;
@ -43,10 +39,4 @@
line-height: 16px; line-height: 16px;
} }
} } // .invite-new-user
.modal-footer {
.reject-button-class {
@extend .button;
}
}

View File

@ -23,12 +23,6 @@
z-index: 1040; z-index: 1040;
@include transition(all 0.15s linear 0s); @include transition(all 0.15s linear 0s);
@include transform(translateZ(0)); @include transform(translateZ(0));
// @include display(flex);
// @include align-items(center);
// @include justify-content(center);
// @include flex-direction(column);
} }
.fade { .fade {
@ -121,8 +115,6 @@
} }
.modal-header { .modal-header {
position: relative; position: relative;
// padding: 20px;
// border-bottom: 1px solid $lightbrown;
h1 { h1 {
display: inline-block; display: inline-block;
@ -134,12 +126,14 @@
.modal-body { .modal-body {
position: relative; position: relative;
// min-height: 100px;
overflow-y: auto; overflow-y: auto;
} }
.modal-footer { .modal-footer {
margin-top: 20px; margin-top: 20px;
.reject-button-class {
@extend .button;
}
} }
.modal-style-wide { .modal-style-wide {

View File

@ -11,8 +11,8 @@
Object List Object List
========================================================================== */ ========================================================================== */
.object-list:not(:first-of-type) { .invited-users {
margin-top: 34px; margin-bottom: 34px;
} }
.object-list-title { .object-list-title {

File diff suppressed because one or more lines are too long