From 4dcbf7df60407aa25c4cd406f6926d5f9c9db567 Mon Sep 17 00:00:00 2001 From: Artem Bazykin Date: Mon, 13 Feb 2017 16:16:06 +0200 Subject: [PATCH 1/4] Fix group, org member tables in mobile view --- ckan/public/base/less/group.less | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/ckan/public/base/less/group.less b/ckan/public/base/less/group.less index 2b7393c4a5f..5557354eff0 100644 --- a/ckan/public/base/less/group.less +++ b/ckan/public/base/less/group.less @@ -35,3 +35,28 @@ max-width: 85px; } } + +colgroup { + @media (min-width: 320px) and (max-width: 479px) { + col:first-child { + width: 43%; + } + col + col { + width: 31%; + } + col + col + col { + width: 36%; + } + } + @media (min-width: 480px) { + col:first-child { + width: 55%; + } + col + col { + width: 25%; + } + col + col + col { + width: 20%; + } + } +} From f8098d51732f6a9910175e344a41dad6777efd74 Mon Sep 17 00:00:00 2001 From: Artem Bazykin Date: Tue, 14 Feb 2017 11:25:56 +0200 Subject: [PATCH 2/4] Use class in template instead col tag --- ckan/public/base/less/group.less | 14 +++++++------- ckan/templates/group/members.html | 11 ++++------- ckan/templates/organization/members.html | 11 ++++------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/ckan/public/base/less/group.less b/ckan/public/base/less/group.less index 5557354eff0..f21874508e2 100644 --- a/ckan/public/base/less/group.less +++ b/ckan/public/base/less/group.less @@ -36,26 +36,26 @@ } } -colgroup { +.group-org-members { @media (min-width: 320px) and (max-width: 479px) { - col:first-child { + .col-user { width: 43%; } - col + col { + .col-role { width: 31%; } - col + col + col { + .col-actions { width: 36%; } } @media (min-width: 480px) { - col:first-child { + .col-user { width: 55%; } - col + col { + .col-role { width: 25%; } - col + col + col { + .col-actions { width: 20%; } } diff --git a/ckan/templates/group/members.html b/ckan/templates/group/members.html index 63f88167910..41a73e97efe 100644 --- a/ckan/templates/group/members.html +++ b/ckan/templates/group/members.html @@ -8,15 +8,12 @@ {% block primary_content_inner %}

{{ _('{0} members'.format(c.members|length)) }}

- - - - +
- - - + + + diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html index 6a0827a0188..745acf1033b 100644 --- a/ckan/templates/organization/members.html +++ b/ckan/templates/organization/members.html @@ -11,15 +11,12 @@ {% block primary_content_inner %}

{{ _('{0} members'.format(c.members|length)) }}

-
{{ _('User') }}{{ _('Role') }}{{ _('User') }}{{ _('Role') }}
- - - +
- - - + + + From c60f2a68d483527566bb188b9d538f6d2db0ddba Mon Sep 17 00:00:00 2001 From: Artem Bazykin Date: Sun, 19 Feb 2017 14:23:15 +0200 Subject: [PATCH 3/4] Delete css styles --- ckan/public/base/less/group.less | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/ckan/public/base/less/group.less b/ckan/public/base/less/group.less index f21874508e2..2b7393c4a5f 100644 --- a/ckan/public/base/less/group.less +++ b/ckan/public/base/less/group.less @@ -35,28 +35,3 @@ max-width: 85px; } } - -.group-org-members { - @media (min-width: 320px) and (max-width: 479px) { - .col-user { - width: 43%; - } - .col-role { - width: 31%; - } - .col-actions { - width: 36%; - } - } - @media (min-width: 480px) { - .col-user { - width: 55%; - } - .col-role { - width: 25%; - } - .col-actions { - width: 20%; - } - } -} From 3ec395eadd964ca6574fc2915aef9804afbac0c1 Mon Sep 17 00:00:00 2001 From: Artem Bazykin Date: Sun, 19 Feb 2017 21:18:23 +0200 Subject: [PATCH 4/4] Delete classes --- ckan/templates/group/members.html | 8 ++++---- ckan/templates/organization/members.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ckan/templates/group/members.html b/ckan/templates/group/members.html index 41a73e97efe..4cec329a585 100644 --- a/ckan/templates/group/members.html +++ b/ckan/templates/group/members.html @@ -8,12 +8,12 @@ {% block primary_content_inner %}

{{ _('{0} members'.format(c.members|length)) }}

-
{{ _('User') }}{{ _('Role') }}{{ _('User') }}{{ _('Role') }}
+
- - - + + + diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html index 745acf1033b..e9a2bf54c79 100644 --- a/ckan/templates/organization/members.html +++ b/ckan/templates/organization/members.html @@ -11,12 +11,12 @@ {% block primary_content_inner %}

{{ _('{0} members'.format(c.members|length)) }}

-
{{ _('User') }}{{ _('Role') }}{{ _('User') }}{{ _('Role') }}
+
- - - + + +
{{ _('User') }}{{ _('Role') }}{{ _('User') }}{{ _('Role') }}