Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
f910fd07
authored
Jan 12, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
working on issue #702 icon
parent
57e82739
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletions
sails/src/assets/scripts/modules/student/views/collections.html
sails/src/assets/styles/main.css
sails/src/assets/scripts/modules/student/views/collections.html
View file @
f910fd07
...
@@ -174,10 +174,15 @@
...
@@ -174,10 +174,15 @@
aria-hidden=
"true"
aria-hidden=
"true"
title=
"{{ studentPicto.attributes.status | translate}}"
></i>
title=
"{{ studentPicto.attributes.status | translate}}"
></i>
</a>
</a>
<a
ng-click=
""
class=
"picto_cat_edit"
>
<i
class=
"glyphicon glyphicon-picture"
aria-hidden=
"true"
></i>
</a>
</div>
</div>
<div
<div
class=
"picto_options"
class=
"picto_options"
ng-if=
"studentPicto !== emptyStudentPicto&& studentPicto.attributes.coord_y == '0'"
>
ng-if=
"studentPicto !== emptyStudentPicto
&& studentPicto.attributes.coord_y == '0'"
>
<a
<a
ng-click=
"delete_picto(studentPicto)"
ng-click=
"delete_picto(studentPicto)"
class=
"picto_remove"
class=
"picto_remove"
...
...
sails/src/assets/styles/main.css
View file @
f910fd07
...
@@ -470,6 +470,8 @@ textarea.editable{
...
@@ -470,6 +470,8 @@ textarea.editable{
.picto
.picto_options
.picto_minus
{
position
:
absolute
;
top
:
2px
;
right
:
2px
;
}
.picto
.picto_options
.picto_minus
{
position
:
absolute
;
top
:
2px
;
right
:
2px
;
}
.picto
.picto_options
.picto_cat_edit
{
position
:
absolute
;
top
:
2px
;
left
:
2px
;
}
/* Picto legend */
/* Picto legend */
.picto-legend-normal
{
.picto-legend-normal
{
position
:
absolute
;
position
:
absolute
;
...
...
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