Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
2dcb3746
Commit
2dcb3746
authored
Nov 14, 2016
by
Eloy Lafuente
Browse files
Merge branch 'MDL-56794-master' of
git://github.com/damyon/moodle
parents
4af34676
7d41ccf0
Changes
3
Hide whitespace changes
Inline
Side-by-side
mod/forum/discuss.php
View file @
2dcb3746
...
...
@@ -294,7 +294,7 @@ $neighbourlinks = $renderer->neighbouring_discussion_navigation($neighbours['pre
echo
$neighbourlinks
;
/// Print the controls across the top
echo
'<div class="discussioncontrols clearfix"><div class="controlscontainer">'
;
echo
'<div class="discussioncontrols clearfix"><div class="controlscontainer
m-b-1
">'
;
if
(
!
empty
(
$CFG
->
enableportfolios
)
&&
has_capability
(
'mod/forum:exportdiscussion'
,
$modcontext
))
{
require_once
(
$CFG
->
libdir
.
'/portfoliolib.php'
);
...
...
theme/boost/scss/moodle/modules.scss
View file @
2dcb3746
...
...
@@ -148,6 +148,10 @@ select {
#page-mod-forum-discuss
.discussioncontrols
{
width
:
auto
;
margin
:
0
;
.form-inline
input
{
margin-top
:
-1px
;
}
}
.maincalendar
.calendarmonth
td
,
...
...
theme/boost/templates/core/url_select.mustache
View file @
2dcb3746
...
...
@@ -10,7 +10,7 @@
{{#
helpicon
}}
{{>
core
/
help_icon
}}
{{/
helpicon
}}
<select
{{#
attributes
}}{{
name
}}
="
{{
value
}}
"
{{/
attributes
}}
id=
"
{{
id
}}
"
class=
"
form-control
{{
classes
}}
"
name=
"jump"
>
<select
{{#
attributes
}}{{
name
}}
="
{{
value
}}
"
{{/
attributes
}}
id=
"
{{
id
}}
"
class=
"
custom-select
{{
classes
}}
"
name=
"jump"
>
{{#
options
}}
{{#
isgroup
}}
<optgroup
label=
"
{{
name
}}
"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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