diff --git a/cadasta/core/static/css/main.css b/cadasta/core/static/css/main.css index 22a97e6e2..f0f4c0866 100644 --- a/cadasta/core/static/css/main.css +++ b/cadasta/core/static/css/main.css @@ -3906,7 +3906,7 @@ div.org-logo { padding: 10px; } .org-text { - margin-left: 160px; } + margin-left: 0; } /* =Single member permissions -------------------------------------------------------------- */ @@ -3927,16 +3927,19 @@ div.org-logo { margin: 0 0 4px 0; } .member-info .member-role { - padding: 30px 0; + padding: 20px 0; border-top: solid 1px #e7e8ea; border-bottom: solid 1px #e7e8ea; clear: both; - margin: 30px 0; } + margin: 10px 0; } .member-info .btn-full { padding: 20px 0; } -#projects-permissions .form-control { +#projects-permissions .form-group, .form-inline .form-group { + display: block; } + +#projects-permissions .form-control, .form-inline .form-control { min-width: 70%; } @media (max-width: 991px) { @@ -5626,7 +5629,14 @@ main.container-fluid { .content-single .panel .panel-buttons { padding: 20px 15px; } .content-single .panel .panel-buttons .btn { - min-width: 110px; } + min-width: 110px; + margin-right: 20px; } + .content-single .panel .panel-buttons .btn:last-child { + margin-right: 0; } + .content-single .member-panel { + border: 0; + -webkit-box-shadow: none !important; + box-shadow: none !important; } .content-single .nav-tabs { margin-bottom: 20px; } @@ -5820,44 +5830,6 @@ table#select-list { .form-control { padding: 6px; } } -/* =Organizations --------------------------------------------------------------- */ -div.org-logo { - float: left; - padding: 10px; } - -.org-text { - margin-left: 0; } - -.member-pic { - padding-bottom: 12px; } - .member-pic img { - display: block; - margin-left: auto; - margin-right: auto; } - -.member-detail { - min-height: 100px; - display: inline-block; - padding: 0 0 20px 0; } - .member-detail h5 { - font-size: 16px; - font-weight: 600; - margin: 0 0 4px 0; } - -.member-role { - padding: 30px 0; - border-top: solid 1px #e7e8ea; - border-bottom: solid 1px #e7e8ea; - clear: both; - margin: 30px 0; } - -#projects-permissions .form-group, .form-inline .form-group { - display: block; } - -#projects-permissions .form-control, .form-inline .form-control { - min-width: 70%; } - /* =Dashboard map -------------------------------------------------------------- */ #dashboard-map { @@ -6006,6 +5978,9 @@ div.add-btn-btm { .form-narrow .alert-full, .narrow .alert-full { margin-bottom: 20px; } +.form-narrow .alert-full, .narrow .alert-full { + margin-bottom: 20px; } + .translation-wrapper { background-color: fuchsia; } diff --git a/cadasta/core/static/css/main.scss b/cadasta/core/static/css/main.scss index db82390ff..f380fd575 100644 --- a/cadasta/core/static/css/main.scss +++ b/cadasta/core/static/css/main.scss @@ -849,9 +849,18 @@ main.container-fluid { padding: 20px 15px; .btn { min-width: 110px; + margin-right: 20px; + &:last-child { + margin-right: 0; + } } } } + .member-panel { // member edit page + border: 0; + -webkit-box-shadow: none !important; + box-shadow: none !important; + } .nav-tabs { margin-bottom: 20px; } @@ -1124,56 +1133,6 @@ table#select-list { } } -/* =Organizations --------------------------------------------------------------- */ - -div.org-logo { - float: left; - padding: 10px; -} - -.org-text { - // margin-left: 160px; adjusted until upload field is added - margin-left: 0; -} - -.member-pic { - padding-bottom: 12px; - img { - display: block; - margin-left: auto; - margin-right: auto; - } -} - -.member-detail { - min-height: 100px; - display: inline-block; - padding: 0 0 20px 0; - h5 { - font-size: 16px; - font-weight: 600; - margin: 0 0 4px 0; - } -} - -.member-role { - padding: 30px 0; - border-top: solid 1px $table-border-color; - border-bottom: solid 1px $table-border-color; - clear: both; - margin: 30px 0; -} - -#projects-permissions, .form-inline { - .form-group { - display: block; - } - .form-control { - min-width: 70%; - } -} - /* =Dashboard map -------------------------------------------------------------- */ @@ -1359,6 +1318,11 @@ div.add-btn-btm { // add party link at bottom of table padding: 4px; } } +.form-narrow, .narrow { + .alert-full { + margin-bottom: 20px; + } +} .form-narrow, .narrow { .alert-full { diff --git a/cadasta/core/static/css/orgs.scss b/cadasta/core/static/css/orgs.scss index 719c1e95e..840c3d77c 100644 --- a/cadasta/core/static/css/orgs.scss +++ b/cadasta/core/static/css/orgs.scss @@ -7,7 +7,8 @@ div.org-logo { } .org-text { - margin-left: 160px; + // margin-left: 160px; adjusted until upload field is added + margin-left: 0; } /* =Single member permissions @@ -33,19 +34,24 @@ div.org-logo { } } .member-role { - padding: 30px 0; + padding: 20px 0; border-top: solid 1px $table-border-color; border-bottom: solid 1px $table-border-color; clear: both; - margin: 30px 0; + margin: 10px 0; } .btn-full { padding: 20px 0; } } -#projects-permissions .form-control { - min-width: 70%; +#projects-permissions, .form-inline { + .form-group { + display: block; + } + .form-control { + min-width: 70%; + } } @media (max-width: $screen-sm-max) { diff --git a/cadasta/templates/organization/organization_members_edit.html b/cadasta/templates/organization/organization_members_edit.html index 451a93e50..7bc6d62c6 100644 --- a/cadasta/templates/organization/organization_members_edit.html +++ b/cadasta/templates/organization/organization_members_edit.html @@ -13,78 +13,95 @@
-

{% trans "Member" %}: {{ object.get_display_name }}

-
- {% csrf_token %} -
-
- -
-
-
- -
-
-

{{ object.username }}

- {{ object.full_name }}
- {{ object.email }}
- Last login: {{ object.last_login }}
-
-
- - - {% if org_admin %} - {% render_field form.org_role class+="form-control" %} - {% else %} - {% render_field form.org_role class+="form-control" %} - {% endif %} -
-
- - {% if org_admin %} - - {% endif %} +
+

{% trans "Member" %}: {{ object.get_display_name }}

+
+
+ + {% csrf_token %} +
+
+
+ +
+
+
+ +
+
+

{{ object.username }}

+ {{ object.full_name }}
+ {{ object.email }}
+ Last login: {{ object.last_login }}
+
+
+ + {% if org_admin %} + {% render_field form.org_role class+="form-control" data-parsley-required="true" %} + {% else %} + {% render_field form.org_role class+="form-control" data-parsley-required="true" %} + {% endif %} +
{{ form.org_role.errors }}
+
+
+ + {% if org_admin %} + + {% endif %} +
+
+
-
- -
-
-
-

Member Permissions

-
+
- - - - - - - - - {% for field in form %} - {% if field.name != 'org_role' %} - - - - - {% endif %} - {% endfor %} - -
ProjectPermissions
{% render_field field class+="form-control" %}
-
-
-
- + + +