Commit 1bdfef8c authored by Gilles-Philippe Leblanc's avatar Gilles-Philippe Leblanc Committed by Robert Lyon
Browse files

Bug 1648837: Fix for Select2 selector UI

behatnotneeded: style change only
Change-Id: I5d81b31a41f655acd3f29ea98169eeea52108f0a
parent 23e00618
......@@ -156,7 +156,6 @@ function pieform_element_autocomplete_language() {
*/
function pieform_element_autocomplete_get_headdata() {
global $THEME;
$cssfile = $THEME->get_url('style/select2.css');
$lang = pieform_element_autocomplete_language();
$langfile = '';
if ($lang != 'en') {
......@@ -165,7 +164,6 @@ function pieform_element_autocomplete_get_headdata() {
'"></script>';
}
$r = <<<JS
<link rel="stylesheet" href="{$cssfile}" />
{$langfile}
JS;
return array($r);
......
......@@ -7,8 +7,7 @@
min-width: 20px;
max-width: 100%;
&.input-short {
//width: 100px;
max-width: 170px;
max-width: 200px;
.select2 {
width: auto !important; // js is doing some weird calculations and getting the width wrong. Override inline js
min-width:150px;
......
......@@ -65,7 +65,7 @@ Version: 4.0.0 Timestamp: Jul 1 13:43:36 EDT 2015
position: absolute;
left: -100000px;
width: 100%;
z-index: 1051; }
z-index: 999; }
.select2-results {
display: block; }
......@@ -76,11 +76,18 @@ Version: 4.0.0 Timestamp: Jul 1 13:43:36 EDT 2015
padding: 0; }
.select2-results__option {
padding: 6px;
padding: 4px;
user-select: none;
-webkit-user-select: none;
overflow: auto;
img {
margin: -4px 3px -4px -4px;
margin-right: 4px;
display: block;
float: left;
}
span {
line-height: 1;
vertical-align: text-top;
}
}
.select2-results__option[aria-selected] {
......@@ -507,3 +514,7 @@ Version: 4.0.0 Timestamp: Jul 1 13:43:36 EDT 2015
.select2-container--classic.select2-container--open .select2-dropdown {
border-color: #5897fb; }
.select2-container.select2-container--default.select2-container--open {
z-index: 2001;
}
This diff is collapsed.
......@@ -126,9 +126,6 @@ $stylesheets = array();
foreach (array_reverse($THEME->get_url('style/style.css', true, 'artefact/file')) as $sheet) {
$stylesheets[] = '<link rel="stylesheet" type="text/css" href="' . append_version_number($sheet) . '">';
}
foreach (array_reverse($THEME->get_url('style/select2.css', true)) as $sheet) {
$stylesheets[] = '<link rel="stylesheet" type="text/css" href="' . append_version_number($sheet) . '">';
}
$stylesheets = array_merge($stylesheets, $view->get_all_blocktype_css());
// Tell the user to change the view theme if the current one is no
......
......@@ -10,10 +10,6 @@ Feature: Mahara users can create their blogs
Scenario: Create blogs
Given I log in as "userA" with password "Kupuhipa1"
And I set the following account settings values:
| field | value |
| multipleblogs | 1 |
| tagssideblockmaxtags | 10 |
When I follow "Settings"
And I fill in the following:
| tagssideblockmaxtags | 10 |
......@@ -34,7 +30,8 @@ Feature: Mahara users can create their blogs
And I set the following fields to these values:
| Title | Journal entry 1 |
| Entry | This is a test |
When I fill in select2 input "editpost_tags" with "blogentry" and select "blogentry"
And I scroll to the base of id "editpost_tags_container"
And I fill in select2 input "editpost_tags" with "blogentry" and select "blogentry"
And I press "Save entry"
And I choose "Pages" in "Portfolio"
And I press "Create page"
......
......@@ -28,8 +28,8 @@ Scenario: Adding tags to files (Bug 1426983)
And I set the following fields to these values:
| Title * | Journal one |
| Entry | This is a test |
And I fill in select2 input "editpost_tags" with "journal" and select "journal"
And I scroll to the base of id "editpost_tags_container"
And I fill in select2 input "editpost_tags" with "journal" and select "journal"
And I fill in select2 input "editpost_tags" with "test" and select "test"
And I press "Save entry"
# Creating a Plan with a tag
......@@ -38,6 +38,7 @@ Scenario: Adding tags to files (Bug 1426983)
And I fill in the following:
| Title * | Plan 9 from outer space |
| Description | Woooo |
And I scroll to the base of id "addplan_tags_container"
And I fill in select2 input "addplan_tags" with "plan" and select "plan"
And I fill in select2 input "addplan_tags" with "test" and select "test"
And I press "Save plan"
......@@ -46,8 +47,8 @@ Scenario: Adding tags to files (Bug 1426983)
And I fill in the following:
| Title * | Task one |
| Completion date * | 2020/12/31 |
And I fill in select2 input "addtasks_tags" with "task" and select "task"
And I scroll to the base of id "addtasks_tags_container"
And I fill in select2 input "addtasks_tags" with "task" and select "task"
And I fill in select2 input "addtasks_tags" with "test" and select "test"
And I press "Save task"
# Creating page 1 with a tag
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment