From a2d9a89f5a9f5cb7c8a02a7a6162fb2cabe4b112 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Mon, 31 Oct 2016 16:24:11 +0800 Subject: [PATCH] MDL-56149 permissions: Alignment of icons should not wrap /admin/roles/permissions.php?contextid=2 the icons should not wrap. --- admin/roles/classes/permissions_table.php | 2 +- theme/bootstrapbase/less/moodle/bs4-compat.less | 4 ++++ theme/bootstrapbase/style/moodle.css | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/admin/roles/classes/permissions_table.php b/admin/roles/classes/permissions_table.php index 9f339d83ff7..76260c74020 100644 --- a/admin/roles/classes/permissions_table.php +++ b/admin/roles/classes/permissions_table.php @@ -132,7 +132,7 @@ class core_role_permissions_table extends core_role_capability_table_base { $risks = $this->get_risks($capability); - $contents = html_writer::tag('td', $risks, array('class' => 'risks')); + $contents = html_writer::tag('td', $risks, array('class' => 'risks text-nowrap')); $contents .= html_writer::tag('td', $neededroles, array('class' => 'allowedroles')); $contents .= html_writer::tag('td', $forbiddenroles, array('class' => 'forbiddenroles')); return $contents; diff --git a/theme/bootstrapbase/less/moodle/bs4-compat.less b/theme/bootstrapbase/less/moodle/bs4-compat.less index d88b8a2efd1..21be34b806d 100644 --- a/theme/bootstrapbase/less/moodle/bs4-compat.less +++ b/theme/bootstrapbase/less/moodle/bs4-compat.less @@ -139,3 +139,7 @@ .pull-xs-right:extend(.pull-right) { /* stylelint-disable-line no-empty-source */ } + +.text-nowrap { + white-space: nowrap !important; /* stylelint-disable-line declaration-no-important */ +} diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index 7052f402e25..9d8952c43b6 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -19224,3 +19224,7 @@ input[type="reset"] .caret { .pull-xs-right { /* stylelint-disable-line no-empty-source */ } +.text-nowrap { + white-space: nowrap !important; + /* stylelint-disable-line declaration-no-important */ +}