Gitlab CSE Unil
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
M. Chardon
ADIM
Commits
cee06620
Commit
cee06620
authored
Feb 28, 2018
by
M. Chardon
Browse files
correction bug affichage fleche sur panel sur safari
parent
814894b6
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
adim_project/adim_app/static/_src/scss/adim.css
View file @
cee06620
...
...
@@ -806,11 +806,6 @@ body.home #dlg-about-adim .modal-dialog {
text-decoration
:
none
;
text-align
:
left
;
}
#side-col-panel-group
a
[
data-toggle
=
"collapse"
]
.icon-circleup
,
#side-col-panel-group
a
[
data-toggle
=
"collapse"
]
.icon-circleright
,
#alt-side-col-panel-group
a
[
data-toggle
=
"collapse"
]
.icon-circleright
{
margin-top
:
-20px
;
}
#side-col-panel-group
a
[
data-toggle
=
"collapse"
]
:hover
,
#alt-side-col-panel-group
a
[
data-toggle
=
"collapse"
]
:hover
,
.panel-group
.panel-heading
a
[
data-toggle
=
"collapse"
]
:hover
{
...
...
adim_project/adim_app/static/_src/scss/scss/adim_test.scss
deleted
100644 → 0
View file @
814894b6
This diff is collapsed.
Click to expand it.
adim_project/adim_app/static/_src/scss/scss/bootstrap-slider.scss
deleted
100644 → 0
View file @
814894b6
/*!
* Slider for Bootstrap
*
* Copyright 2012 Stefan Petre
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* using the fork at https://github.com/seiyria/bootstrap-slider
*/
//$import '../bower_components/bootstrap/less/variables.less';
$line-height-base
:
20px
;
$border-radius-base
:
4px
;
$
import
'../lib/bootstrap/less/mixins.less'
;
// BootStrap mixins
.slider
{
display
:
inline-block
;
vertical-align
:
middle
;
position
:
relative
;
&
.slider-horizontal
{
width
:
210px
;
height
:
$line-height-base
;
.slider-track
{
height
:
$line-height-base
/
2
;
width
:
100%
;
margin-top
:
-
$line-height-base
/
4
;
top
:
50%
;
left
:
0
;
}
.slider-selection
{
height
:
100%
;
top
:
0
;
bottom
:
0
;
}
.slider-handle
{
margin-left
:
-
$line-height-base
/
2
;
margin-top
:
-
$line-height-base
/
4
;
&
.triangle
{
border-width
:
0
$line-height-base
/
2
$line-height-base
/
2
$line-height-base
/
2
;
width
:
0
;
height
:
0
;
border-bottom-color
:
#0480be
;
margin-top
:
0
;
}
}
}
&
.slider-vertical
{
height
:
80px
;
width
:
$line-height-base
;
.slider-track
{
width
:
$line-height-base
/
2
;
height
:
100%
;
margin-left
:
-
$line-height-base
/
4
;
left
:
50%
;
top
:
0
;
}
.slider-selection
{
width
:
100%
;
left
:
0
;
top
:
0
;
bottom
:
0
;
}
.slider-handle
{
margin-left
:
-
$line-height-base
/
4
;
margin-top
:
-
$line-height-base
/
2
;
&
.triangle
{
border-width
:
$line-height-base
/
2
0
$line-height-base
/
2
$line-height-base
/
2
;
width
:
1px
;
height
:
1px
;
border-left-color
:
#0480be
;
margin-left
:
0
;
}
}
}
&
.slider-disabled
{
.slider-handle
{
#gradient
>
@
include
vertical
(
#dfdfdf
,
#bebebe
)
;
cursor
:
not
-
allowed
;
}
.slider-track
{
#gradient
>
@
include
vertical
(
#e5e5e5
,
#e9e9e9
)
;
cursor
:
not
-
allowed
;
}
}
input
{
display
:
none
;
}
.tooltip-inner
{
white-space
:
nowrap
;
}
}
.slider-track
{
position
:
absolute
;
cursor
:
pointer
;
#gradient
>
@
include
vertical
(
#f5f5f5
,
#f9f9f9
)
;
@include
box-shadow
(
inset
0
1px
2px
rgba
(
0
,
0
,
0
,.
1
));
border-radius
:
$border-radius-base
;
}
.slider-selection
{
position
:
absolute
;
#gradient
>
@
include
vertical
(
#f9f9f9
,
#f5f5f5
)
;
@include
box-shadow
(
inset
0
-1px
0
rgba
(
0
,
0
,
0
,.
15
));
@include
box-sizing
(
border-box
);
border-radius
:
$border-radius-base
;
}
.slider-handle
{
position
:
absolute
;
width
:
$line-height-base
;
height
:
$line-height-base
;
#gradient
>
@
include
vertical
(
#149bdf
,
#0480be
)
;
@mixin
box-shadow
(
~
"inset 0 1px 0 rgba(255,255,255,@mixin 2), 0 1px 2px rgba(0,0,0,.05)"
);
opacity
:
0
.8
;
border
:
0px
solid
transparent
;
&
.round
{
border-radius
:
50%
;
}
&
.triangle
{
background
:
transparent
none
;
}
}
adim_project/adim_app/static/_src/scss/scss/typeaheadjs.scss
deleted
100644 → 0
View file @
814894b6
$
import
(
reference
)
"../lib/bootstrap/less/mixins"
;
$
import
(
reference
)
"../lib/bootstrap/less/variables"
;
$
import
(
reference
)
"../lib/bootstrap/less/dropdowns"
;
$
import
(
reference
)
"../lib/bootstrap/less/forms"
;
span
.twitter-typeahead
{
width
:
100%
;
.tt-dropdown-menu
{
&
:extend
(@
include
dropdown-menu
)
;
}
.tt-suggestion
>
p
{
&
:extend
(
.dropdown-menu
>
li
>
a
)
;
&
:hover
,
&
:focus
{
&
:extend
(
.dropdown-menu
>
.active
>
a
)
;
}
}
.input-group
&
{
display
:
block
!
important
;
.tt-dropdown-menu
{
top
:
32px
!
important
;
}
.tt-input
,
.tt-hint
{
border-radius
:
4px
0
0
4px
!
important
;
@include
input-sm
();
}
.tt-hint
{
color
:
lighten
(
$input-color
,
10%
);
}
}
.input-group.input-group-lg
&
{
.tt-dropdown-menu
{
top
:
44px
!
important
;
}
}
.input-group.input-group-sm
&
{
.tt-dropdown-menu
{
top
:
28px
!
important
;
}
}
}
adim_project/templates/adim/base_annotation.html
View file @
cee06620
...
...
@@ -458,27 +458,29 @@ if (t === "light") {
{% if membership %}
<div
id=
"annotation-sharing-panel"
data-publish-state=
"{{ membership.publish_mode }}"
>
<a
data-toggle=
"collapse"
href=
"#annotationSharingPanel"
class=
"{{ collapsed|yesno:"
collapsed
,"
}}
btn
btn-secondary
btn-sm
btn-block
"
<a
data-toggle=
"collapse"
href=
"#annotationSharingPanel"
class=
"{{ collapsed|yesno:"
collapsed
,"
}}
btn
btn-secondary
btn-sm
btn-block
d-inline-flex
"
role=
"button"
aria-expanded=
"false"
aria-controls=
"annotationSharingPanel"
>
Publication
<span
class=
"publishStatus"
>
<span
class=
"badge badge-default"
style=
"display: none;"
data-toggle=
"tooltip"
data-publish-mode=
"0"
title=
"Les annotations ne sont visibles que par vous."
>
<span
class=
"fa fa-home"
></span>
</span>
<span
class=
"badge badge-warning"
style=
"display: none;"
data-toggle=
"tooltip"
data-publish-mode=
"1"
title=
"Les annotations sont visibles par le propriétaire de l'image"
>
<span
class=
"fa fa-user"
></span>
</span>
<span
class=
"badge badge-warning"
style=
"display: none;"
data-toggle=
"tooltip"
data-publish-mode=
"2"
title=
"Les annotations sont visibles pour tous les membres de cette image"
>
<span
class=
"fa fa-users"
></span>
<div>
Publication
<span
class=
"publishStatus"
>
<span
class=
"badge badge-default"
style=
"display: none;"
data-toggle=
"tooltip"
data-publish-mode=
"0"
title=
"Les annotations ne sont visibles que par vous."
>
<span
class=
"fa fa-home"
></span>
</span>
<span
class=
"badge badge-warning"
style=
"display: none;"
data-toggle=
"tooltip"
data-publish-mode=
"1"
title=
"Les annotations sont visibles par le propriétaire de l'image"
>
<span
class=
"fa fa-user"
></span>
</span>
<span
class=
"badge badge-warning"
style=
"display: none;"
data-toggle=
"tooltip"
data-publish-mode=
"2"
title=
"Les annotations sont visibles pour tous les membres de cette image"
>
<span
class=
"fa fa-users"
></span>
</span>
</span>
</
span
>
<i
class=
"icon-circleup
float-sm-right
"
></i>
</
div
>
<i
class=
"icon-circleup
ml-auto
"
></i>
</a>
<div
id=
"annotationSharingPanel"
class=
"panel-dark collapse {{ collapsed|yesno:"
,
in
"
}}"
>
<div
class=
"card card-body"
>
...
...
@@ -514,9 +516,10 @@ if (t === "light") {
{# ----- Property Panel ----- #}
{% block property-panel %}
<div
id=
"annotation-property-panel"
>
<a
class=
"btn btn-secondary btn-sm btn-block"
data-toggle=
"collapse"
href=
"#collapseProperties"
role=
"button"
<a
class=
"btn btn-secondary btn-sm btn-block
d-inline-flex
"
data-toggle=
"collapse"
href=
"#collapseProperties"
role=
"button"
aria-expanded=
"false"
aria-controls=
"collapseProperties"
>
Propriétés
<i
class=
"icon-circleup float-sm-right"
></i>
<div>
Propriétés
</div>
<i
class=
"icon-circleup ml-auto"
></i>
</a>
<div
class=
"collapse show panel-dark"
id=
"collapseProperties"
>
...
...
@@ -538,10 +541,10 @@ if (t === "light") {
{% block members-panel %}
{% if display_shared_annotations %}
<div
id=
"annotation-list-panel"
>
<a
data-toggle=
"collapse"
href=
"#collapseUsers"
class=
"{{ collapsed|yesno:"
collapsed
,"
}}
btn
btn-secondary
btn-sm
btn-block
"
<a
data-toggle=
"collapse"
href=
"#collapseUsers"
class=
"{{ collapsed|yesno:"
collapsed
,"
}}
btn
btn-secondary
btn-sm
btn-block
d-inline-flex
"
role=
"button"
aria-expanded=
"false"
aria-controls=
"collapseUsers"
>
Utilisateurs
<i
class=
"icon-circleup
float-sm-right
"
></i>
<div>
Utilisateurs
</div>
<i
class=
"icon-circleup
ml-auto
"
></i>
</a>
<div
id=
"collapseUsers"
class=
"collapse show panel-dark"
>
<div
class=
"card card-body"
>
...
...
adim_project/templates/adim/env/anodate/annotation.html
View file @
cee06620
...
...
@@ -113,9 +113,9 @@
{% with collapsed=1 %}{{ block.super }}{% endwith %}
{% endblock publication-panel %}
<a
class=
"btn btn-secondary btn-sm btn-block"
data-toggle=
"collapse"
href=
"#collapseDisplay"
role=
"button"
<a
class=
"btn btn-secondary btn-sm btn-block
d-inline-flex
"
data-toggle=
"collapse"
href=
"#collapseDisplay"
role=
"button"
aria-expanded=
"false"
aria-controls=
"collapseDisplay"
>
Afficher
<i
class=
"icon-circleup
float-sm-right
"
></i>
<div>
Afficher
</div>
<i
class=
"icon-circleup
ml-auto
"
></i>
</a>
<div
class=
"collapse show panel-dark"
id=
"collapseDisplay"
>
...
...
@@ -179,9 +179,9 @@
{% endblock %}
<div
id=
"annotation-markers-panel"
>
<a
class=
"btn btn-secondary btn-sm btn-block"
data-toggle=
"collapse"
href=
"#collapseMarkers"
role=
"button"
<a
class=
"btn btn-secondary btn-sm btn-block
d-inline-flex
"
data-toggle=
"collapse"
href=
"#collapseMarkers"
role=
"button"
aria-expanded=
"false"
aria-controls=
"collapseMarkers"
>
Labels
<i
class=
"icon-circleup
float-sm-right
"
></i>
<div>
Labels
</div>
<i
class=
"icon-circleup
ml-auto
"
></i>
</a>
<div
class=
"collapse show panel-dark"
id=
"collapseMarkers"
>
...
...
adim_project/templates/adim/env/cimaf/annotation.html
View file @
cee06620
...
...
@@ -119,9 +119,9 @@
{% block side-col-panel-group %}
{% block publication-panel %}{{ block.super }}{% endblock %}
<a
class=
"btn btn-secondary btn-sm btn-block"
data-toggle=
"collapse"
href=
"#collapseDisplay"
role=
"button"
<a
class=
"btn btn-secondary btn-sm btn-block
d-inline-flex
"
data-toggle=
"collapse"
href=
"#collapseDisplay"
role=
"button"
aria-expanded=
"false"
aria-controls=
"collapseDisplay"
>
Afficher
<i
class=
"icon-circleup
float-sm-right
"
></i>
<div>
Afficher
</div>
<i
class=
"icon-circleup
ml-auto
"
></i>
</a>
<div
id=
"annotation-display-panel"
>
...
...
adim_project/templates/adim/env/geomo/annotation.html
View file @
cee06620
...
...
@@ -90,9 +90,9 @@
{% with collapsed=1 %}{{ block.super }}{% endwith %}
{% endblock publication-panel %}
<a
class=
"btn btn-secondary btn-sm btn-block"
data-toggle=
"collapse"
href=
"#collapseDisplay"
role=
"button"
<a
class=
"btn btn-secondary btn-sm btn-block
d-inline-flex
"
data-toggle=
"collapse"
href=
"#collapseDisplay"
role=
"button"
aria-expanded=
"false"
aria-controls=
"collapseDisplay"
>
Afficher
<i
class=
"icon-circleup
float-sm-right
"
></i>
<div>
Afficher
</div>
<i
class=
"icon-circleup
ml-auto
"
></i>
</a>
<div
class=
"collapse show panel-dark"
id=
"collapseDisplay"
>
...
...
Write
Preview
Markdown
is supported
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