Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchParapheur
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchParapheur
Commits
5c554605
Verified
Commit
5c554605
authored
5 years ago
by
Alex ORLUC
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #12062 TIME 0:15 change tool button in edit mode
parent
883fc8b2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/frontend/app/overlay/overlay.component.html
+4
-4
4 additions, 4 deletions
src/frontend/app/overlay/overlay.component.html
src/frontend/core/styles.scss
+50
-1
50 additions, 1 deletion
src/frontend/core/styles.scss
with
54 additions
and
5 deletions
src/frontend/app/overlay/overlay.component.html
+
4
−
4
View file @
5c554605
<div>
<div>
<span
style=
"z-index:1;position: absolute;left:
0
;bottom:
10px;top: 1
0px;font-size: 25px;height:50px;"
>
<span
style=
"z-index:1;position: absolute;left:
20px
;bottom:
2
0px;font-size: 25px;height:50px;"
>
<button
class=
"btn blue"
(tap)=
"this.appDocumentNotePad.cancelAnnotation();"
><i
<button
class=
"btn
-filled
blue"
(tap)=
"this.appDocumentNotePad.cancelAnnotation();"
><i
class=
"fas fa-arrow-left fa-2x"
></i>
{{'lang.cancelAnnotation' | translate}}
</button>
class=
"fas fa-arrow-left fa-2x"
></i>
{{'lang.cancelAnnotation' | translate}}
</button>
</span>
</span>
<span
style=
"z-index:1;position: absolute;bottom:
5
px;
left: 50%;transform: translateX(-50%)
;font-size: 25px;"
>
<span
style=
"z-index:1;position: absolute;bottom:
20
px;
right: 20px
;font-size: 25px;"
>
<button
class=
"btn green"
(tap)=
"this.appDocumentNotePad.validateAnnotation();"
><i
<button
class=
"btn
-filled
green"
(tap)=
"this.appDocumentNotePad.validateAnnotation();"
><i
class=
"fas fa-check-circle fa-2x"
></i>
{{'lang.validateAnnotation' | translate}}
</button>
class=
"fas fa-check-circle fa-2x"
></i>
{{'lang.validateAnnotation' | translate}}
</button>
</span>
</span>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/frontend/core/styles.scss
+
50
−
1
View file @
5c554605
...
@@ -50,6 +50,56 @@ button:disabled {
...
@@ -50,6 +50,56 @@ button:disabled {
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
}
}
.btn-filled
{
height
:
50px
;
display
:
flex
;
align-items
:
center
;
justify-content
:
space-around
;
font-size
:
14px
;
font-weight
:
bold
;
border
:
1px
solid
black
;
color
:
white
;
background-color
:
#fff
;
padding
:
0
25px
;
border-radius
:
25px
!
important
;
cursor
:
pointer
;
outline
:
none
;
box-shadow
:
10px
10px
17px
-10px
rgba
(
0
,
0
,
0
,
0
.75
);
transition
:
all
0
.2
;
&
:active
{
transition
:
all
0
.2
;
box-shadow
:
none
;
}
&
.btn-xs
{
height
:
35px
;
}
&
.green
{
background-color
:
$accent
;
border
:
1px
solid
$accent
;
}
&
.red
{
background-color
:
$warn
;
border
:
1px
solid
$warn
;
}
&
.blue
{
background-color
:
$primary
;
border
:
1px
solid
$primary
;
&
.active
{
color
:
#fff
;
background
:
$primary
;
}
}
&
:disabled
{
opacity
:
0
.5
;
color
:
#000
;
border
:
1px
solid
#000
;
cursor
:
not
-
allowed
;
}
.fas
,
i
,
.material-icons
{
margin
:
0
5px
;
}
}
.btn
{
.btn
{
height
:
50px
;
height
:
50px
;
display
:
flex
;
display
:
flex
;
...
@@ -76,7 +126,6 @@ button:disabled {
...
@@ -76,7 +126,6 @@ button:disabled {
}
}
&
.blue
{
&
.blue
{
color
:
$primary
;
color
:
$primary
;
background
:
#fff
;
border
:
1px
solid
$primary
;
border
:
1px
solid
$primary
;
&
.active
{
&
.active
{
color
:
#fff
;
color
:
#fff
;
...
...
This diff is collapsed.
Click to expand it.
Alex ORLUC
@Alex
mentioned in commit
1e4479ec
·
5 years ago
mentioned in commit
1e4479ec
mentioned in commit 1e4479ec8119f902614d1e1546ad6a9e73d26db7
Toggle commit list
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment