Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
20cf4d20
Commit
20cf4d20
authored
Oct 14, 2015
by
Liam Sharpe
Committed by
Son Nguyen
Oct 23, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes some of the colors around mahara slightly to fix the contrast - Bug #1465107
behatnotneeded Change-Id: Ibe2edeeb178018e7d0bdf9814ce31c2f03f742fb
parent
7a993ffe
Changes
47
Hide whitespace changes
Inline
Side-by-side
Showing
47 changed files
with
91 additions
and
82 deletions
+91
-82
htdocs/admin/groups/manage.php
htdocs/admin/groups/manage.php
+1
-1
htdocs/artefact/file/blocktype/internalmedia/lib.php
htdocs/artefact/file/blocktype/internalmedia/lib.php
+1
-1
htdocs/artefact/resume/lib.php
htdocs/artefact/resume/lib.php
+2
-2
htdocs/theme/default/sass/components/_list-group.scss
htdocs/theme/default/sass/components/_list-group.scss
+0
-7
htdocs/theme/default/sass/layout/panel/_panel-heading.scss
htdocs/theme/default/sass/layout/panel/_panel-heading.scss
+1
-1
htdocs/theme/default/sass/utilities/_theme-variables.scss
htdocs/theme/default/sass/utilities/_theme-variables.scss
+0
-1
htdocs/theme/modern/sass/layout/panel/_panel-heading.scss
htdocs/theme/modern/sass/layout/panel/_panel-heading.scss
+2
-2
htdocs/theme/raw/js/theme.js
htdocs/theme/raw/js/theme.js
+1
-1
htdocs/theme/raw/pieforms/export.php
htdocs/theme/raw/pieforms/export.php
+2
-2
htdocs/theme/raw/plugintype/artefact/annotation/templates/import/annotations.tpl
...type/artefact/annotation/templates/import/annotations.tpl
+2
-2
htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
...fact/blog/blocktype/taggedposts/templates/taggedposts.tpl
+3
-3
htdocs/theme/raw/plugintype/artefact/blog/templates/import/blogs.tpl
...e/raw/plugintype/artefact/blog/templates/import/blogs.tpl
+1
-1
htdocs/theme/raw/plugintype/artefact/file/blocktype/filedownload/templates/filedownload.tpl
...ct/file/blocktype/filedownload/templates/filedownload.tpl
+1
-1
htdocs/theme/raw/plugintype/artefact/file/templates/folder_render_self.tpl
...plugintype/artefact/file/templates/folder_render_self.tpl
+1
-1
htdocs/theme/raw/plugintype/artefact/file/templates/import/files.tpl
...e/raw/plugintype/artefact/file/templates/import/files.tpl
+1
-1
htdocs/theme/raw/plugintype/artefact/plans/templates/import/plans.tpl
.../raw/plugintype/artefact/plans/templates/import/plans.tpl
+1
-1
htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
...heme/raw/plugintype/artefact/plans/templates/taskrows.tpl
+3
-3
htdocs/theme/raw/plugintype/blocktype/externalfeed/templates/feed.tpl
.../raw/plugintype/blocktype/externalfeed/templates/feed.tpl
+2
-2
htdocs/theme/raw/plugintype/interaction/forum/templates/simplepost.tpl
...raw/plugintype/interaction/forum/templates/simplepost.tpl
+2
-2
htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl
...eme/raw/plugintype/interaction/forum/templates/topics.tpl
+1
-1
htdocs/theme/raw/plugintype/search/elasticsearch/templates/artefact.tpl
...aw/plugintype/search/elasticsearch/templates/artefact.tpl
+2
-2
htdocs/theme/raw/plugintype/search/elasticsearch/templates/block_instance.tpl
...gintype/search/elasticsearch/templates/block_instance.tpl
+1
-1
htdocs/theme/raw/plugintype/search/elasticsearch/templates/collection.tpl
.../plugintype/search/elasticsearch/templates/collection.tpl
+1
-1
htdocs/theme/raw/plugintype/search/elasticsearch/templates/group.tpl
...e/raw/plugintype/search/elasticsearch/templates/group.tpl
+1
-1
htdocs/theme/raw/plugintype/search/elasticsearch/templates/interaction_forum_post.tpl
...search/elasticsearch/templates/interaction_forum_post.tpl
+2
-2
htdocs/theme/raw/plugintype/search/elasticsearch/templates/interaction_instance.tpl
...e/search/elasticsearch/templates/interaction_instance.tpl
+3
-3
htdocs/theme/raw/plugintype/search/elasticsearch/templates/view.tpl
...me/raw/plugintype/search/elasticsearch/templates/view.tpl
+3
-3
htdocs/theme/raw/sass/_custom.scss
htdocs/theme/raw/sass/_custom.scss
+1
-0
htdocs/theme/raw/sass/_shame.scss
htdocs/theme/raw/sass/_shame.scss
+1
-1
htdocs/theme/raw/sass/components/_list-group.scss
htdocs/theme/raw/sass/components/_list-group.scss
+3
-3
htdocs/theme/raw/sass/form/_dropdown.scss
htdocs/theme/raw/sass/form/_dropdown.scss
+1
-1
htdocs/theme/raw/sass/form/_form-group.scss
htdocs/theme/raw/sass/form/_form-group.scss
+17
-2
htdocs/theme/raw/sass/layout/nav/_main-nav.scss
htdocs/theme/raw/sass/layout/nav/_main-nav.scss
+1
-0
htdocs/theme/raw/sass/layout/nav/_nav-tabs.scss
htdocs/theme/raw/sass/layout/nav/_nav-tabs.scss
+3
-2
htdocs/theme/raw/sass/layout/panel/_panel.scss
htdocs/theme/raw/sass/layout/panel/_panel.scss
+1
-1
htdocs/theme/raw/sass/typography/_typography.scss
htdocs/theme/raw/sass/typography/_typography.scss
+3
-3
htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss
htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss
+3
-3
htdocs/theme/raw/templates/group/group.tpl
htdocs/theme/raw/templates/group/group.tpl
+1
-1
htdocs/theme/raw/templates/group/topicrows.tpl
htdocs/theme/raw/templates/group/topicrows.tpl
+4
-3
htdocs/theme/raw/templates/header.tpl
htdocs/theme/raw/templates/header.tpl
+1
-1
htdocs/theme/raw/templates/portfoliosearchresults.tpl
htdocs/theme/raw/templates/portfoliosearchresults.tpl
+1
-1
htdocs/theme/raw/templates/sideblocks/onlineusers.tpl
htdocs/theme/raw/templates/sideblocks/onlineusers.tpl
+2
-4
htdocs/theme/raw/templates/sideblocks/profile.tpl
htdocs/theme/raw/templates/sideblocks/profile.tpl
+1
-1
htdocs/theme/raw/templates/sideblocks/tags.tpl
htdocs/theme/raw/templates/sideblocks/tags.tpl
+1
-1
htdocs/theme/raw/templates/user/userfind.tpl
htdocs/theme/raw/templates/user/userfind.tpl
+2
-2
htdocs/theme/raw/templates/view/sharedviewrows.tpl
htdocs/theme/raw/templates/view/sharedviewrows.tpl
+2
-2
htdocs/theme/raw/templates/view/skin.tpl
htdocs/theme/raw/templates/view/skin.tpl
+1
-1
No files found.
htdocs/admin/groups/manage.php
View file @
20cf4d20
...
...
@@ -33,7 +33,7 @@ $quotasform = pieform(array(
'hiddenlabel'
=>
true
,
'title'
=>
get_string
(
'filequota1'
,
'admin'
),
'defaultvalue'
=>
$group
->
quota
,
'description'
=>
'<p class="text-small text-
light
tone">'
.
get_string
(
'groupfilequotadescription'
,
'admin'
)
.
'</p>'
,
'description'
=>
'<p class="text-small text-
mid
tone">'
.
get_string
(
'groupfilequotadescription'
,
'admin'
)
.
'</p>'
,
),
'submit'
=>
array
(
'type'
=>
'submit'
,
...
...
htdocs/artefact/file/blocktype/internalmedia/lib.php
View file @
20cf4d20
...
...
@@ -337,7 +337,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$html
=
'<span class="blocktype_internalmedia_mp3" id="'
.
$id
.
'" style="display:block;width:'
.
$width
.
'px;height:'
.
$height
.
'px;"></span>'
;
$html
.
=
'<span id="'
.
$id
.
'_h">'
.
get_string
(
'flashanimation'
,
'blocktype.file/internalmedia'
)
.
'</span>'
;
$html
.
=
'<div class="media-download content-text"><span class="icon icon-download left"></span><span class="sr-only">'
.
get_string
(
'Download'
,
'artefact.internal'
)
.
'</span><a class="media-link text-small" href="'
.
$url
.
'">'
.
hsc
(
$artefact
->
get
(
'title'
))
.
'</a>'
;
$html
.
=
'<span class="text-
light
tone text-small"> ['
.
$filesize
.
'] </span></div>'
;
$html
.
=
'<span class="text-
mid
tone text-small"> ['
.
$filesize
.
'] </span></div>'
;
$html
.
=
'<script type="application/javascript">
flowplayer("'
.
$id
.
'", "'
.
$playerurl
.
'", {
clip: {
...
...
htdocs/artefact/resume/lib.php
View file @
20cf4d20
...
...
@@ -1025,14 +1025,14 @@ EOF;
return
"
function (r, d) {
if (!
{
$bodystring
}
&& !
{
$attachstring
}
) {
return TD(null, SPAN(null,
{
$titlestring
}
), DIV({'class': 'detail text-
light
tone'},
{
$extrastring
}
));
return TD(null, SPAN(null,
{
$titlestring
}
), DIV({'class': 'detail text-
mid
tone'},
{
$extrastring
}
));
}
var link = A({'class': 'toggle textonly', 'href': ''},
{
$titlestring
}
);
connect(link, 'onclick', function (e) {
e.stop();
return showhideComposite(r,
{
$bodystring
}
,
{
$attachstring
}
);
});
var extra = DIV({'class': 'detail text-
light
tone'},
{
$extrastring
}
);
var extra = DIV({'class': 'detail text-
mid
tone'},
{
$extrastring
}
);
return TD({'id': 'composite-' + r.artefact + '-' + r.id}, DIV({'class': 'expandable-head'}, link, extra));
},
"
;
...
...
htdocs/theme/default/sass/components/_list-group.scss
View file @
20cf4d20
...
...
@@ -7,10 +7,3 @@
}
}
}
.outer-link
{
&
:focus
,
&
:hover
{
background-color
:
rgba
(
250
,
255
,
234
,
0
.2
);
}
}
htdocs/theme/default/sass/layout/panel/_panel-heading.scss
View file @
20cf4d20
...
...
@@ -29,7 +29,7 @@
color
:
#FFFFFF
;
}
.
metadata
{
.
text-midtone
{
color
:
#eef3e9
;
font-size
:
11px
;
margin-top
:
5px
;
...
...
htdocs/theme/default/sass/utilities/_theme-variables.scss
View file @
20cf4d20
...
...
@@ -10,4 +10,3 @@ $theme-accent-color: #474220;
$theme-text-lighttone-color
:
#888
;
$theme-text-midtone-color
:
#888
;
htdocs/theme/modern/sass/layout/panel/_panel-heading.scss
View file @
20cf4d20
...
...
@@ -4,8 +4,8 @@
border-color
:
$brand-secondary
;
color
:
#FFF
;
.
metadata
{
color
:
desaturate
(
lighten
(
$theme-secondary-color
,
30
)
,
26
);
.
text-midtone
{
color
:
desaturate
(
lighten
(
$theme-secondary-color
,
30
)
,
10
);
}
}
}
\ No newline at end of file
htdocs/theme/raw/js/theme.js
View file @
20cf4d20
...
...
@@ -135,7 +135,7 @@ jQuery(function($) {
if
(
context
.
find
(
'
.js-dropdown-context
'
).
length
>
0
){
context
.
find
(
'
.js-dropdown-context
'
).
html
(
'
(
'
+
val
+
'
)
'
);
}
else
{
context
.
find
(
'
.js-with-dropdown label
'
).
append
(
'
<em class="js-dropdown-context
metadata
">(
'
+
val
+
'
)</em>
'
);
context
.
find
(
'
.js-with-dropdown label
'
).
append
(
'
<em class="js-dropdown-context
text-midtone text-small
">(
'
+
val
+
'
)</em>
'
);
}
}
...
...
htdocs/theme/raw/pieforms/export.php
View file @
20cf4d20
...
...
@@ -9,7 +9,7 @@ return <<<EOF
<div class="checkbox">
{$element['html']}
{$element['labelhtml']}
<div class="text-small text-
light
tone with-label">
<div class="text-small text-
mid
tone with-label">
{$element['description']}
<a href="{$element['viewlink']}" class="viewlink text-small nojs-hidden-inline" target="_blank">{$strclicktopreview}</a>
</div>
...
...
@@ -73,7 +73,7 @@ $row = $col = 0;
$itemsinrow
=
3
;
foreach
(
$elements
as
$key
=>
$element
)
{
if
(
substr
(
$key
,
0
,
11
)
==
'collection_'
)
{
$body
[
$row
][
$col
]
=
'<div class="checkbox">'
.
$element
[
'html'
]
.
$element
[
'labelhtml'
]
.
'<p class="with-label text-small text-
light
tone labeldescriptpreview">'
.
hsc
(
$element
[
'description'
])
.
'</p></div>'
;
$body
[
$row
][
$col
]
=
'<div class="checkbox">'
.
$element
[
'html'
]
.
$element
[
'labelhtml'
]
.
'<p class="with-label text-small text-
mid
tone labeldescriptpreview">'
.
hsc
(
$element
[
'description'
])
.
'</p></div>'
;
$col
++
;
if
(
$col
%
$itemsinrow
==
0
)
{
$row
++
;
...
...
htdocs/theme/raw/plugintype/artefact/annotation/templates/import/annotations.tpl
View file @
20cf4d20
...
...
@@ -56,14 +56,14 @@
<div
id=
"
{
$feedback.id
}
_desc"
class=
"detail hidden"
>
{
$feedback.description
|
clean_html
|
safe
}
</div>
<span
id=
"annotationfeedbackstatus
{
$feedback.id
}
"
class=
"annotationfeedbackstatus text-small text-
light
tone"
>
<span
id=
"annotationfeedbackstatus
{
$feedback.id
}
"
class=
"annotationfeedbackstatus text-small text-
mid
tone"
>
{
if
$feedback.private
}
{
str
tag
=
private
section
=
artefact
.
annotation
}
{
else
}
{
str
tag
=
public
section
=
artefact
.
annotation
}
{/
if
}
</span>
<div
id=
"annotationfeedbackdetails_
{
$feedback.id
}
"
class=
"annotationfeedbackdetails text-small text-
light
tone"
>
<div
id=
"annotationfeedbackdetails_
{
$feedback.id
}
"
class=
"annotationfeedbackdetails text-small text-
mid
tone"
>
{
str
tag
=
enteredon
section
=
artefact
.
annotation
}
{
$feedback.ctime
}
</div>
<!-- TODO Display existing annotation feedbacks and annotation feedback count with section title -->
...
...
htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
View file @
20cf4d20
...
...
@@ -22,7 +22,7 @@
</div>
{/
if
}
<div
class=
"taggedpost-title text-
light
tone panel-body flush"
>
<div
class=
"taggedpost-title text-
mid
tone panel-body flush"
>
{
$blockheading
|
clean_html
|
safe
}
{
if
$viewowner
}
{
$tag
}
{
str
tag
=
'by'
section
=
'artefact.blog'
}
...
...
@@ -33,9 +33,9 @@
</div>
{
if
$configerror
}
<span
class=
"text-
light
tone"
>
{
str
tag
=
'configerror'
section
=
'blocktype.blog/taggedposts'
}
</span>
<span
class=
"text-
mid
tone"
>
{
str
tag
=
'configerror'
section
=
'blocktype.blog/taggedposts'
}
</span>
{
elseif
$badtag
}
<span
class=
"text-
light
tone"
>
{
str
tag
=
'notags'
section
=
'blocktype.blog/taggedposts'
arg1
=
$badtag
}
</span>
<span
class=
"text-
mid
tone"
>
{
str
tag
=
'notags'
section
=
'blocktype.blog/taggedposts'
arg1
=
$badtag
}
</span>
{
elseif
$full
}
<div
id=
"blogdescription"
>
<div
id=
"postlist_
{
$blockid
}
"
class=
"list-group"
>
...
...
htdocs/theme/raw/plugintype/artefact/blog/templates/import/blogs.tpl
View file @
20cf4d20
...
...
@@ -59,7 +59,7 @@
{
$post.title
|
str_shorten_text
:
80
:
true
}
{/
if
}
</h4>
<span
id=
"poststatus
{
$post.id
}
"
class=
"poststatus text-small text-
light
tone"
>
<span
id=
"poststatus
{
$post.id
}
"
class=
"poststatus text-small text-
mid
tone"
>
{
if
$post.published
}
(
{
str
tag
=
published
section
=
artefact
.
blog
}
)
{
else
}
...
...
htdocs/theme/raw/plugintype/artefact/file/blocktype/filedownload/templates/filedownload.tpl
View file @
20cf4d20
...
...
@@ -21,7 +21,7 @@
</span>
</a>
</h4>
<span
class=
"text-small text-
light
tone"
>
-
<span
class=
"text-small text-
mid
tone"
>
-
{
$file.ctime
|
format_date
:
'strftimedaydate'
}
[
{
$file.size
|
display_size
}
]
</span>
...
...
htdocs/theme/raw/plugintype/artefact/file/templates/folder_render_self.tpl
View file @
20cf4d20
...
...
@@ -49,7 +49,7 @@
<span
class=
"icon icon-download icon-lg pull-right text-watermark icon-action"
></span>
{/
if
}
{
if
$child
->
description
}
<p
class=
"file-description text-small text-
light
tone"
>
<p
class=
"file-description text-small text-
mid
tone"
>
{
$child
->
description
}
</p>
{/
if
}
...
...
htdocs/theme/raw/plugintype/artefact/file/templates/import/files.tpl
View file @
20cf4d20
...
...
@@ -8,7 +8,7 @@
<h5
class=
"title list-group-item-heading text-inline"
>
{
$file.title
|
str_shorten_text
:
80
:
true
}
</h5>
<span
class=
"filesize text-small text-
light
tone"
>
<span
class=
"filesize text-small text-
mid
tone"
>
(
{
$file.filesize
|
display_size
}
)
</span>
<div
id=
"
{
$file.id
}
_desc"
class=
"detail"
>
...
...
htdocs/theme/raw/plugintype/artefact/plans/templates/import/plans.tpl
View file @
20cf4d20
...
...
@@ -59,7 +59,7 @@
</a>
</h4>
{
if
$task.completed
==
1
}
<span
class=
"completed text-small text-
light
tone"
>
<span
class=
"completed text-small text-
mid
tone"
>
(
{
str
tag
=
completed
section
=
artefact
.
plans
}
)
</span>
{/
if
}
...
...
htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
View file @
20cf4d20
...
...
@@ -7,7 +7,7 @@
<span
class=
"overdue-task"
>
<span
class=
"icon icon-times text-danger icon-lg left"
></span>
<span
class=
"text-danger"
>
{
$task
->
title
}
</span>
-
<span
class=
"text-small text-
light
tone"
>
<span
class=
"text-small text-
mid
tone"
>
{
str
tag
=
'completiondate'
section
=
'artefact.plans'
}
:
{
$task
->
completiondate
}
</span>
{
if
$task
->
description
}
...
...
@@ -39,12 +39,12 @@
<span
class=
"icon icon-check-square-o icon-lg text-success left"
></span>
<span
class=
"sr-only"
>
{
str
tag
=
completed
section
=
artefact
.
plans
}
</span>
{
else
}
<span
class=
"icon-square-o icon icon-lg text-
light
tone left"
></span>
<span
class=
"icon-square-o icon icon-lg text-
mid
tone left"
></span>
<span
class=
"sr-only"
>
{
str
tag
=
incomplete
section
=
artefact
.
plans
}
</span>
{/
if
}
<span
class=
"text-default"
>
{
$task
->
title
}
</span>
-
<span
class=
"text-
light
tone text-small"
>
<span
class=
"text-
mid
tone text-small"
>
{
str
tag
=
'completiondate'
section
=
'artefact.plans'
}
:
{
$task
->
completiondate
}
</span>
...
...
htdocs/theme/raw/plugintype/blocktype/externalfeed/templates/feed.tpl
View file @
20cf4d20
...
...
@@ -3,7 +3,7 @@
<div
id=
"blocktype_externalfeed_title"
>
{
if
$description
&&
$description
!=
$entries
[
0
]->
description
}
<div
class=
"panel-body flush"
>
<div
id=
"blocktype_externalfeed_desc"
class=
"feed-decription text-
light
tone text-small"
>
<div
id=
"blocktype_externalfeed_desc"
class=
"feed-decription text-
mid
tone text-small"
>
{
$description
|
clean_html
|
safe
}
</div>
</div>
...
...
@@ -51,7 +51,7 @@
</ol>
{/
if
}
<div
id=
"blocktype_externalfeed_lastupdate"
class=
"content-text text-right text-small text-
light
tone"
>
<div
id=
"blocktype_externalfeed_lastupdate"
class=
"content-text text-right text-small text-
mid
tone"
>
{
$lastupdated
}
</div>
</div>
...
...
htdocs/theme/raw/plugintype/interaction/forum/templates/simplepost.tpl
View file @
20cf4d20
...
...
@@ -13,7 +13,7 @@
</div>
{
if
$post
->
postcount
}
<div
class=
"postcount text-
light
tone"
>
<div
class=
"postcount text-
mid
tone"
>
{
$post
->
postcount
}
</div>
{/
if
}
...
...
@@ -33,7 +33,7 @@
</div>
{/
if
}
<p
class=
"posttime detail text-small text-
light
tone"
>
<p
class=
"posttime detail text-small text-
mid
tone"
>
{
$post
->
ctime
}
</p>
...
...
htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl
View file @
20cf4d20
...
...
@@ -21,7 +21,7 @@
{/
if
}
{
if
$topic
->
closed
||
$topic
->
subscribed
||
$sticky
}
{
if
$sticky
}
<span
class=
"icon icon-asterisk icon-sm left text-
light
tone"
></span>
<span
class=
"icon icon-asterisk icon-sm left text-
mid
tone"
></span>
{/
if
}
{
if
$topic
->
closed
}
...
...
htdocs/theme/raw/plugintype/search/elasticsearch/templates/artefact.tpl
View file @
20cf4d20
...
...
@@ -24,7 +24,7 @@
</h3>
{
else
}
<h3
class=
"title list-group-item-heading text-inline"
>
<span
class=
"icon icon-
{
$record
->
artefacttype
}
left
{
if
$record
->
deleted
}
text-
light
tone
{/
if
}
"
></span>
<span
class=
"icon icon-
{
$record
->
artefacttype
}
left
{
if
$record
->
deleted
}
text-
mid
tone
{/
if
}
"
></span>
{
if
$record
->
link
}
<a
href=
"
{
$WWWROOT
}{
$record
->
link
}
"
>
{
$record
->
title
|
str_shorten_html
:
50
:
true
|
safe
}
...
...
@@ -34,7 +34,7 @@
{/
if
}
</h3>
{/
if
}
<span
class=
"artefacttype text-
light
tone"
>
<span
class=
"artefacttype text-
mid
tone"
>
{
if
$secfacetterm
==
"Journalentry"
}
(
{
str
tag
=
blogpost
section
=
search
.
elasticsearch
}
)
{
elseif
$secfacetterm
==
"Forumpost"
}
...
...
htdocs/theme/raw/plugintype/search/elasticsearch/templates/block_instance.tpl
View file @
20cf4d20
...
...
@@ -11,7 +11,7 @@
{
$record
->
title
|
str_shorten_html
:
50
:
true
|
safe
}
</h3>
{/
if
}
<span
class=
"artefacttype text-
light
tone"
>
<span
class=
"artefacttype text-
mid
tone"
>
(
{
str
tag
=
document
section
=
search
.
elasticsearch
}
)
{
if
$record
->
deleted
}
(
{
str
tag
=
deleted
section
=
search
.
elasticsearch
}
)
...
...
htdocs/theme/raw/plugintype/search/elasticsearch/templates/collection.tpl
View file @
20cf4d20
...
...
@@ -3,7 +3,7 @@
<span
class=
"icon icon-folder-open left"
></span>
{
$record
->
name
}
</h3>
<span
class=
"artefacttype text-
light
tone"
>
(
{
str
tag
=
deleted
section
=
search
.
elasticsearch
}
)
</span>
<span
class=
"artefacttype text-
mid
tone"
>
(
{
str
tag
=
deleted
section
=
search
.
elasticsearch
}
)
</span>
{
else
}
<h3
class=
"title"
>
<span
class=
"icon icon-folder-open left"
></span>
...
...
htdocs/theme/raw/plugintype/search/elasticsearch/templates/group.tpl
View file @
20cf4d20
{
if
$record
->
deleted
}
<h3
class=
"title list-group-item-heading"
>
<span
class=
"icon icon-users left text-
light
tone"
></span>
<span
class=
"icon icon-users left text-
mid
tone"
></span>
{
$record
->
name
}
(
{
str
tag
=
deleted
section
=
search
.
elasticsearch
}
)
</h3>
{
else
}
...
...
htdocs/theme/raw/plugintype/search/elasticsearch/templates/interaction_forum_post.tpl
View file @
20cf4d20
...
...
@@ -3,7 +3,7 @@
<span
class=
"icon icon-commenting-o left"
></span>
{
$record
->
subject
}
</h3>
<span
class=
"artefacttype text-
light
tone"
>
(
{
str
tag
=
deletedforumpost
section
=
search
.
elasticsearch
}
)
</span>
<span
class=
"artefacttype text-
mid
tone"
>
(
{
str
tag
=
deletedforumpost
section
=
search
.
elasticsearch
}
)
</span>
{
else
}
<h3
class=
"title list-group-item-heading text-inline"
>
<span
class=
"icon icon-commenting-o left"
></span>
...
...
@@ -11,7 +11,7 @@
{
$record
->
subject
}
</a>
</h3>
<span
class=
"artefacttype text-
light
tone"
>
(
{
str
tag
=
forumpost
section
=
search
.
elasticsearch
}
)
</span>
<span
class=
"artefacttype text-
mid
tone"
>
(
{
str
tag
=
forumpost
section
=
search
.
elasticsearch
}
)
</span>
<div
class=
"source"
><strong>
{
str
tag
=
'forum'
section
=
'search.elasticsearch'
}
:
</strong>
{
$record
->
forumname
}
(
{
$record
->
groupname
}
)
</div>
<div
class=
"poster"
><strong>
{
str
tag
=
'forumpostedbylabel'
section
=
'search.elasticsearch'
}
:
</strong>
{
str
tag
=
forumpostedby
section
=
search
.
elasticsearch
arg1
=
'$record->authorlink|safe'
arg2
=
'$record->ctime'
}
</div>
<div
class=
"detail"
>
{
$record
->
body
|
str_shorten_html
:
140
:
true
:
false
|
safe
}
</div>
...
...
htdocs/theme/raw/plugintype/search/elasticsearch/templates/interaction_instance.tpl
View file @
20cf4d20
{
if
$record
->
deleted
}
<span
class=
"icon icon-comments-o left text-
light
tone"
></span>
<span
class=
"icon icon-comments-o left text-
mid
tone"
></span>
<h3
class=
"title list-group-item-heading"
>
{
$record
->
title
}
</h3>
<span
class=
"artefacttype text-
light
tone"
>
(
{
str
tag
=
deletedforumpost
section
=
search
.
elasticsearch
}
)
</span>
<span
class=
"artefacttype text-
mid
tone"
>
(
{
str
tag
=
deletedforumpost
section
=
search
.
elasticsearch
}
)
</span>
{
else
}
<h3
class=
"title list-group-item-heading text-inline"
>
<span
class=
"icon icon-comments-o left"
></span>
...
...
@@ -9,6 +9,6 @@
{
$record
->
title
}
</a>
</h3>
<span
class=
"artefacttype text-
light
tone"
>
(
{
str
tag
=
forum
section
=
search
.
elasticsearch
}
)
</span>
<span
class=
"artefacttype text-
mid
tone"
>
(
{
str
tag
=
forum
section
=
search
.
elasticsearch
}
)
</span>
<div
class=
"detail"
>
{
$record
->
description
|
str_shorten_html
:
140
:
true
|
safe
}
</div>
{/
if
}
htdocs/theme/raw/plugintype/search/elasticsearch/templates/view.tpl
View file @
20cf4d20
{
if
$record
->
deleted
}
<h3
class=
"title list-group-item-heading text-inline"
>
<span
class=
"icon icon-icon-file left text-
light
tone"
></span>
<span
class=
"icon icon-icon-file left text-
mid
tone"
></span>
{
$record
->
title
}
</h3>
<span
class=
"artefacttype text-
light
tone"
>
(
{
str
tag
=
deleted
section
=
search
.
elasticsearch
}
)
</span>
<span
class=
"artefacttype text-
mid
tone"
>
(
{
str
tag
=
deleted
section
=
search
.
elasticsearch
}
)
</span>
{
else
}
<h3
class=
"title list-group-item-heading text-inline"
>
<span
class=
"icon icon-file left"
></span>
<a
href=
"
{
$WWWROOT
}
view/view.php?id=
{
$record
->
id
}
"
>
{
$record
->
title
}
</a>
</h3>
<span
class=
"artefacttype text-
light
tone"
>
(
{
str
tag
=
page
section
=
search
.
elasticsearch
}
)
</span>
<span
class=
"artefacttype text-
mid
tone"
>
(
{
str
tag
=
page
section
=
search
.
elasticsearch
}
)
</span>
{
if
$record
->
createdbyname
}
<div
class=
"createdby"
>
{
if
$record
->
anonymise
}
...
...
htdocs/theme/raw/sass/_custom.scss
View file @
20cf4d20
...
...
@@ -196,6 +196,7 @@
.progress-bar
{
position
:
relative
;
background-color
:
darken
(
$brand-primary
,
5%
);
&
.small-progress
span
{
color
:
$text-color
;
display
:
block
;
...
...
htdocs/theme/raw/sass/_shame.scss
View file @
20cf4d20
...
...
@@ -57,4 +57,4 @@
}
}
}
}
}
\ No newline at end of file
htdocs/theme/raw/sass/components/_list-group.scss
View file @
20cf4d20
...
...
@@ -31,7 +31,7 @@
padding
:
3px
15px
;
}
small
{
@extend
.text-m
uted
;
@extend
.text-m
idtone
;
}
}
&
.list-group-unbordered
{
...
...
@@ -95,12 +95,12 @@ h4.list-group-item-heading {
.list-group-item-link
{
padding
:
0
;
a
{
@extend
.text-default
;
font-size
:
$font-size-small
;
display
:
block
;
padding
:
10px
15px
;
color
:
#666
;
&
:hover
{
background
:
darken
(
#f0f0f0
,
1
%
);
background
:
darken
(
#f0f0f0
,
0
.5
%
);
text-decoration
:
none
;
color
:
darken
(
$link-color
,
5%
);
}
...
...
htdocs/theme/raw/sass/form/_dropdown.scss
View file @
20cf4d20
...
...
@@ -118,7 +118,7 @@
background
:
#fff
;
border
:
0
;
box-shadow
:
none
;
color
:
#666
;
color
:
$theme-text-midtone-color
;
padding-right
:
0
;
}
&
.input-short
{
...
...
htdocs/theme/raw/sass/form/_form-group.scss
View file @
20cf4d20
...
...
@@ -370,7 +370,7 @@
label
{
font-size
:
0
.8em
;
color
:
#888
;
color
:
$theme-text-midtone-color
;
}
&
.customrowtitle
{
width
:
70px
;
...
...
@@ -523,7 +523,7 @@
padding-top
:
10px
;
}
.requiredmarker
{
color
:
$brand-danger
;
color
:
darken
(
$brand-danger
,
5%
)
;
}
@media
(
min-width
:
$screen-sm-min
)
{
...
...
@@ -541,3 +541,18 @@
padding-bottom
:
20px
;
}
// Style placeholder text
::-webkit-input-placeholder
{
/* WebKit, Blink, Edge */
color
:
#777
!
important
;
}
:-moz-placeholder
{
/* Mozilla Firefox 4 to 18 */
color
:
#777
!
important
;
opacity
:
1
;
}
::-moz-placeholder
{
/* Mozilla Firefox 19+ */
color
:
#777
!
important
;
opacity
:
1
;
}
:-ms-input-placeholder
{
/* Internet Explorer 10-11 */
color
:
#777
!
important
;
}
\ No newline at end of file
htdocs/theme/raw/sass/layout/nav/_main-nav.scss
View file @
20cf4d20
...
...
@@ -69,6 +69,7 @@
}
&
:hover
,
&
:focus
{
text-decoration
:none
;
color
:
$link-color
;
}
}
// Only shown on mobile, or when dropdowns are turned on
...
...
htdocs/theme/raw/sass/layout/nav/_nav-tabs.scss
View file @
20cf4d20
...
...
@@ -17,10 +17,10 @@
}
&
:hover
,
&
:focus
{
color
:
$
nav-tabs-active-link-hover
-color
;
color
:
$
link
-color
;
border
:
1px
solid
transparent
;
border-bottom
:
3px
solid
$nav-tabs-link-hover-border-color
;
background
:
#f
7f7f7
;
background
:
#f
9f9f9
;
}
}
}
...
...
@@ -33,6 +33,7 @@
}
.nav-tabs
>
li
.active
>
a
{
color
:
$link-color
;
border
:
1px
solid
transparent
;
border-bottom
:
3px
solid
$nav-tabs-active-link-hover-border-color
;
&
:hover
,
...
...
htdocs/theme/raw/sass/layout/panel/_panel.scss
View file @
20cf4d20
...
...
@@ -13,7 +13,7 @@
}
.list-group-item
small
{
@extend
.text-
light
tone
;
@extend
.text-
mid
tone
;
font-size
:
$font-size-base
-
2
;
}
...
...
htdocs/theme/raw/sass/typography/_typography.scss
View file @
20cf4d20
...
...
@@ -153,7 +153,7 @@ a {
padding
:
5px
20px
;
}
}
font-size
:
$font-size-base
-
1
;
font-size
:
$font-size-base
-
1
;
float
:
left
;
margin
:
10px
0
;
padding
:
5px
7px
;
...
...
@@ -234,7 +234,7 @@ label.lead {
.metadata
{
font-family
:
$font-family-sans-serif
;
font-size
:
0
.8em
;
color
:
#
888
;
color
:
#
555
;
.title
&
{
margin-left
:
5px
;
}
...
...
@@ -249,4 +249,4 @@ label.lead {
.licenseicon
{
padding
:
0
10px
5px
0
;
}
\ No newline at end of file
}
htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss
View file @
20cf4d20
...
...
@@ -22,7 +22,7 @@ $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
$brand-default
:
#ECECEC
!
default
;
$brand-primary
:
$theme-primary-color
!
default
;
$brand-success
:
#
629
600
!
default
;
// this is intially the same as brand-primary but needs to be divorced from the variable for semantic reasons
$brand-success
:
#
426
600
!
default
;
// this is intially the same as brand-primary but needs to be divorced from the variable for semantic reasons
$brand-info
:
#5bc0de
!
default
;
$brand-warning
:
#f0ad4e
!
default
;
$brand-danger
:
#d9534f
!
default
;
...
...
@@ -181,8 +181,8 @@ $btn-default-bg: #F9F9F9 !default;
$btn-default-border
:
#ccc
!
default
;
$btn-primary-color
:
#fff
!
default
;
$btn-primary-bg
:
$brand-primary
!
default
;
$btn-primary-border
:
darken
(
$b
tn
-primary
-bg
,
8%
)
!
default
;
$btn-primary-bg
:
darken
(
$brand-primary
,
5%
)
!
default
;
$btn-primary-border
:
darken
(
$b
rand
-primary
,
8%
)
!
default
;
$btn-success-color
:
#fff
!
default
;
$btn-success-bg
:
$brand-success
!
default
;
...
...
htdocs/theme/raw/templates/group/group.tpl
View file @
20cf4d20
...
...
@@ -6,7 +6,7 @@
{
$group
->
name
}
</h3>
{
if
$group
->
settingsdescription
}
<span
class=
"text-
light
tone"
>
<span
class=
"text-
mid
tone"
>
-
{
$group
->
settingsdescription
}
</span>
{/
if
}
...
...
htdocs/theme/raw/templates/group/topicrows.tpl
View file @
20cf4d20
...
...
@@ -2,9 +2,10 @@
<tr>
<td>
<h3
class=
"title"
><a
href=
"
{
$WWWROOT
}
interaction/forum/topic.php?id=
{
$topic
->
id
}
"
>
{
$topic
->
topicname
|
str_shorten_text
:
65
:
true
}
</a></h3>
<div
class=
"forumpath text-small text-lighttone"
>
<div
class=
"forumpath text-small text-midtone"
>
<a
href=
"
{
$topic
->
groupurl
}
"
class=
"topicgroup text-muted"
>
{
$topic
->
groupname
|
str_shorten_text
:
20
:
true
}
</a>
/
<a
href=
"
{
$WWWROOT
}
interaction/forum/view.php?id=
{
$topic
->
forumid
}
"
class=
"topicforum text-m
uted
"
>
{
$topic
->
forumname
|
str_shorten_text
:
20
:
true
}
</a>
<a
href=
"
{
$WWWROOT
}
interaction/forum/view.php?id=
{
$topic
->
forumid
}
"
class=
"topicforum text-m
idtone
"
>
{
$topic
->
forumname
|
str_shorten_text
:
20
:
true
}
</a>
</div>
</td>
...
...
@@ -13,7 +14,7 @@
{
$topic
->
body
|
str_shorten_html
:
80
:
true
|
strip_tags
|
safe
}
</p>