Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
d429c16c
Commit
d429c16c
authored
Jun 17, 2016
by
Liam Sharpe
Committed by
Pat Kira
Jun 24, 2016
Browse files
Bug #1591596 - Fixed the text not showing on quotas dropdowns
behatnotneeded Change-Id: Ia392c12ca0ea2e135ff30da3be8d2bfa37fc0425
parent
710108cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
htdocs/artefact/file/lib.php
View file @
d429c16c
...
@@ -1544,6 +1544,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
...
@@ -1544,6 +1544,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'defaultgroupquota'
=>
array
(
'defaultgroupquota'
=>
array
(
'title'
=>
get_string
(
'defaultgroupquota'
,
'artefact.file'
),
'title'
=>
get_string
(
'defaultgroupquota'
,
'artefact.file'
),
'type'
=>
'bytes'
,
'type'
=>
'bytes'
,
'class'
=>
'form-inline'
,
'defaultvalue'
=>
$defaultgroupquota
,
'defaultvalue'
=>
$defaultgroupquota
,
),
),
'updategroupquotas'
=>
array
(
'updategroupquotas'
=>
array
(
...
...
htdocs/theme/raw/js/theme.js
View file @
d429c16c
...
@@ -146,10 +146,11 @@ jQuery(function($) {
...
@@ -146,10 +146,11 @@ jQuery(function($) {
}
}
function
attachInputDropdown
()
{
function
attachInputDropdown
()
{
// Sets a new context for every .js-dropdown-group item
var
context
=
$
(
'
.js-dropdown-group
'
);
$
(
'
.js-dropdown-group
'
).
each
(
function
()
{
var
context
=
$
(
this
);
handleInputDropdown
(
context
);
handleInputDropdown
(
context
);
})
$
(
'
.js-dropdown-group select
'
).
on
(
'
change
'
,
function
(){
$
(
'
.js-dropdown-group select
'
).
on
(
'
change
'
,
function
(){
var
context
=
$
(
this
).
closest
(
'
.js-dropdown-group
'
);
var
context
=
$
(
this
).
closest
(
'
.js-dropdown-group
'
);
...
...
htdocs/theme/raw/sass/form/_dropdown-group.scss
View file @
d429c16c
...
@@ -20,7 +20,9 @@
...
@@ -20,7 +20,9 @@
&
.form-group
{
&
.form-group
{
border-bottom
:
none
;
border-bottom
:
none
;
.with-heading
&
{
.form-control
{
max-width
:
none
;
width
:
200px
;
}
}
}
}
.with-dropdown
{
.with-dropdown
{
...
@@ -28,7 +30,7 @@
...
@@ -28,7 +30,7 @@
top
:
0
;
top
:
0
;
left
:
0
;
left
:
0
;
padding
:
0
5px
;
padding
:
0
5px
;
width
:
2
00
px
;
width
:
1
00
%
;
z-index
:
2
;
z-index
:
2
;
float
:
left
;
float
:
left
;
height
:
$input-height-base
;
height
:
$input-height-base
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment