Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Memorekall Member New
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rekall
Memorekall Member New
Commits
7f16d071
Commit
7f16d071
authored
3 years ago
by
Sebastien
Browse files
Options
Downloads
Patches
Plain Diff
Remove unecessary id element for edit capsule button
parent
8ede2bb3
Loading
Loading
2 merge requests
!68
Tuleap 134 unify css
,
!64
Refactoring css
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
assets/styles/app.scss
+4
-24
4 additions, 24 deletions
assets/styles/app.scss
templates/capsule/index.html.twig
+1
-1
1 addition, 1 deletion
templates/capsule/index.html.twig
templates/capsule/no_edition_access.html.twig
+1
-1
1 addition, 1 deletion
templates/capsule/no_edition_access.html.twig
with
6 additions
and
26 deletions
assets/styles/app.scss
+
4
−
24
View file @
7f16d071
...
@@ -40,18 +40,15 @@ button[type=submit]{
...
@@ -40,18 +40,15 @@ button[type=submit]{
height
:
200px
;
height
:
200px
;
}
}
.btn-primary
{
background
:
rgba
(
0
,
0
,
0
,.
1
);
border
:
none
;
border-radius
:
3px
;
opacity
:
1
;
}
$orange-button-bt
:
#FA772E
;
$orange-button-bt
:
#FA772E
;
.btn-orange
{
.btn-orange
{
@include
button-variant
(
$orange-button-bt
,
$orange-button-bt
,
white
,
#f05b2b
,
#f05b2b
);
@include
button-variant
(
$orange-button-bt
,
$orange-button-bt
,
white
,
#f05b2b
,
#f05b2b
);
}
}
.btn-standard
{
@include
button-variant
(
#49AD9A
,
#49AD9A
,
white
,
#3B8C7E
,
#3B8C7E
);
}
.gray-600
{
.gray-600
{
color
:
$gray-600
;
color
:
$gray-600
;
}
}
...
@@ -72,23 +69,6 @@ $orange-button-bt: #FA772E;
...
@@ -72,23 +69,6 @@ $orange-button-bt: #FA772E;
color
:
rgba
(
255
,
255
,
255
,.
75
);
color
:
rgba
(
255
,
255
,
255
,.
75
);
}
}
.standard-button
{
line-height
:
40px
;
padding
:
0
.5em
2em
;
font-size
:
16px
;
font-weight
:
bold
;
border
:
none
;
color
:
#FFF
!
important
;
border-radius
:
3px
;
background
:
#49AD9A
;
box-shadow
:
0
-2px
0
#3B8C7E
inset
;
flex-basis
:
auto
;
}
.standard-button
:hover
{
background
:
#3B8C7E
;
}
.row-title-box
{
.row-title-box
{
border-bottom
:
2px
solid
rgba
(
0
,
0
,
0
,.
2
);
border-bottom
:
2px
solid
rgba
(
0
,
0
,
0
,.
2
);
margin-bottom
:
60px
;
margin-bottom
:
60px
;
...
...
This diff is collapsed.
Click to expand it.
templates/capsule/index.html.twig
+
1
−
1
View file @
7f16d071
...
@@ -109,7 +109,7 @@
...
@@ -109,7 +109,7 @@
{%
endif
%}
{%
endif
%}
<a
href=
"capsule/edit/
{{
capsule.getLinkPath
()
}}
"
class=
"list-item text-nowrap lh-md"
>
<a
href=
"capsule/edit/
{{
capsule.getLinkPath
()
}}
"
class=
"list-item text-nowrap lh-md"
>
<button
class=
"standard
-button p-2
"
>
<button
class=
"
bt btn-
standard
px-4 py-4 fw-bold rounded-3
"
>
{{
'capsule.edit.link'
|
trans
}}
{{
'capsule.edit.link'
|
trans
}}
</button>
</button>
</a>
</a>
...
...
This diff is collapsed.
Click to expand it.
templates/capsule/no_edition_access.html.twig
+
1
−
1
View file @
7f16d071
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<div
class=
"d-flex justify-content-center align-items-center"
>
<div
class=
"d-flex justify-content-center align-items-center"
>
<form>
<form>
<button
id=
"
btn-primary"
formaction=
"/capsule_list"
>
<button
class=
"btn
btn-primary"
formaction=
"/capsule_list"
>
{{
'general.go_back_to_home_page'
|
trans
}}
{{
'general.go_back_to_home_page'
|
trans
}}
</button>
</button>
</form>
</form>
...
...
This diff is collapsed.
Click to expand it.
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