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
subugoe
emo
TIDO
Commits
6e934fc9
Commit
6e934fc9
authored
Jun 21, 2021
by
schneider210
Browse files
Merge branch 'develop' into issue/
#265
-move-misc-icons
parents
1445f40e
aeae4358
Pipeline
#205141
passed with stages
in 6 minutes and 28 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/App.vue
View file @
6e934fc9
...
...
@@ -58,7 +58,7 @@ export default {
config
:
{},
contentTypes
:
[],
contentUrls
:
[],
fontsize
:
1
4
,
fontsize
:
1
6
,
imageurl
:
''
,
isCollection
:
false
,
item
:
{},
...
...
@@ -394,6 +394,7 @@ export default {
display
:
flex
;
flex
:
1
;
flex-direction
:
column
;
font-size
:
16px
;
overflow
:
hidden
;
}
...
...
src/components/annotations/annotations.vue
View file @
6e934fc9
...
...
@@ -118,7 +118,7 @@ export default {
};
});
this
.
a
nnotations
.
forEach
((
curr
)
=>
{
this
.
configuredA
nnotations
.
forEach
((
curr
)
=>
{
const
contentType
=
curr
.
body
.[
'
x-content-type
'
];
if
(
contentTypes
[
contentType
])
{
annotationTab
[
contentTypes
[
contentType
]].
type
.
push
(
contentType
);
...
...
@@ -141,9 +141,10 @@ export default {
const
interval
=
setInterval
(()
=>
{
if
(
this
.
annotationLoading
)
{
this
.
configuredAnnotations
=
this
.
filterAnnotationTypes
();
const
firstTab
=
this
.
annotationTabs
.
find
((
x
)
=>
x
.
type
.
length
)?.
key
||
''
;
this
.
configuredAnnotations
=
this
.
filterAnnotationTypes
();
this
.
highlightActiveTabContent
(
this
.
annotationTabConfig
[
firstTab
]
||
[]);
this
.
currentTab
=
firstTab
;
clearInterval
(
interval
);
...
...
src/components/content.vue
View file @
6e934fc9
...
...
@@ -24,6 +24,7 @@
flat
round
size=
"sm"
:disable=
"fontsize >= fontSizeLimits.max"
:title=
"$t('Increase')"
@
click=
"increase()"
>
...
...
@@ -39,6 +40,7 @@
flat
round
size=
"sm"
:disable=
"fontsize
<
=
fontSizeLimits.min
"
:title=
"$t('Decrease')"
:color=
"$q.dark.isActive ? 'white' : 'accent'"
@
click=
"decrease()"
...
...
@@ -80,7 +82,7 @@ export default {
},
fontsize
:
{
type
:
Number
,
default
:
()
=>
1
4
,
default
:
()
=>
1
6
,
},
manifests
:
{
type
:
Array
,
...
...
@@ -98,6 +100,10 @@ export default {
data
:
()
=>
({
activeTab
:
null
,
content
:
''
,
fontSizeLimits
:
{
min
:
14
,
max
:
24
,
},
sequenceindex
:
0
,
}),
computed
:
{
...
...
@@ -144,17 +150,21 @@ export default {
},
methods
:
{
decrease
()
{
const
min
=
8
;
const
{
min
}
=
this
.
fontSizeLimits
;
let
textsize
=
this
.
fontsize
;
textsize
-=
textsize
>
min
?
1
:
0
;
textsize
-=
textsize
>
min
?
2
:
0
;
if
(
textsize
<
min
)
textsize
=
min
;
this
.
$root
.
$emit
(
'
update-fontsize
'
,
textsize
);
},
increase
()
{
const
max
=
32
;
const
{
max
}
=
this
.
fontSizeLimits
;
let
textsize
=
this
.
fontsize
;
textsize
+=
textsize
<
max
?
1
:
0
;
textsize
+=
textsize
<
max
?
2
:
0
;
if
(
textsize
>
max
)
textsize
=
max
;
this
.
$root
.
$emit
(
'
update-fontsize
'
,
textsize
);
},
getSupport
(
support
)
{
...
...
src/views/mainview.vue
View file @
6e934fc9
...
...
@@ -107,7 +107,7 @@ export default {
},
fontsize
:
{
type
:
Number
,
default
:
()
=>
1
4
,
default
:
()
=>
1
6
,
},
imageurl
:
{
type
:
String
,
...
...
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