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
a417cded
Commit
a417cded
authored
Apr 20, 2015
by
Julien Furrer
Browse files
Minor fix in anobj name editiong area
parent
802114b7
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
adim_app/static/_src/less/adim.css
View file @
a417cded
...
...
@@ -208,6 +208,7 @@ body {
box-shadow
:
0
0
2px
0
#3d3d3d
;
}
#main-navbar
.adim-image-name
{
color
:
#dddddd
;
padding-top
:
10px
;
padding-bottom
:
10px
;
}
...
...
@@ -227,6 +228,16 @@ body {
top
:
-3px
;
transition
:
opacity
0s
ease
0s
;
}
#main-navbar
.adim-image-name.read-only
,
#main-navbar
.adim-image-name.read-only
:hover
{
cursor
:
default
;
}
#main-navbar
:hover
.adim-image-name
{
color
:
#ffffff
;
}
#main-navbar
:hover
.adim-image-name.read-only
{
color
:
#dddddd
;
}
#main-navbar
:hover
.adim-image-name
.glyphicon
{
opacity
:
0.75
;
transition
:
opacity
0.2s
ease
0.3s
;
...
...
@@ -253,9 +264,6 @@ input[type="radio"]:focus {
.navbar-inverse
.navbar-text
{
color
:
#dddddd
;
}
.navbar-inverse
.navbar-nav
>
li
>
a
{
color
:
#dddddd
;
}
/*
input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
...
...
adim_app/static/_src/less/adim.less
View file @
a417cded
...
...
@@ -14,6 +14,8 @@
// ----- Exercise -----
//@navbar-inverse-link-color: lighten(@navbar-inverse-link-color, 25%);
// Canvas
@canvas-ctnr-dark-color: #CCC;
@canvas-dark-border: #444444;
...
...
@@ -100,6 +102,8 @@ html, body {
}
.adim-image-name {
color: lighten(@navbar-inverse-link-color, 25%);
padding-top: 10px;
padding-bottom: 10px;
...
...
@@ -122,10 +126,17 @@ html, body {
transition: opacity 0s ease 0s;
}
&.read-only {
&, &:hover { cursor: default; }
}
}
&:hover .adim-image-name {
color: lighten(@navbar-inverse-link-color, 50%);
&.read-only {
color: lighten(@navbar-inverse-link-color, 25%);
}
.glyphicon {
opacity: 0.75;
transition: opacity 0.2s ease 0.3s;
...
...
@@ -163,7 +174,7 @@ input[type="radio"]:focus {
.navbar-nav {
> li > a {
color: lighten(@navbar-inverse-link-color, 25%);
//
color: lighten(@navbar-inverse-link-color, 25%);
}
}
}
...
...
@@ -327,7 +338,7 @@ body.home {
// Small
@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
background: url("../img/image-home-sm.jpg") 0% 50% no-repeat;
background-size: 720px 525px;
background-size: 720px 525px;
width: 720px;
height: 525px;
}
...
...
adim_app/static/css/adim.css
View file @
a417cded
This diff is collapsed.
Click to expand it.
adim_app/templates/adim_app/annotation.html
View file @
a417cded
...
...
@@ -3,7 +3,7 @@
{% block navbar_content %}
<ul
class=
"nav navbar-nav"
>
<li><a
href=
"#"
class=
"adim-image-name"
>
<li><a
href=
"#"
class=
"adim-image-name
{% if anobj.owner.id != user.id %}read-only{% endif %}
"
>
<span
class=
"text"
>
{{ anobj.name }}
</span>
{#
<span
class=
"glyphicon glyphicon-pencil"
style=
"font-size: 12px;"
></span>
#}
</a></li>
...
...
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