Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cdf988de
Commit
cdf988de
authored
Jun 06, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed the usage of two modal headers
parent
5c72a5b7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
23 deletions
+36
-23
app/assets/stylesheets/framework/modal.scss
app/assets/stylesheets/framework/modal.scss
+0
-17
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+29
-0
ee/app/views/projects/issues/export_issues/_csv_download.html.haml
...ews/projects/issues/export_issues/_csv_download.html.haml
+6
-6
No files found.
app/assets/stylesheets/framework/modal.scss
View file @
cdf988de
...
...
@@ -91,20 +91,3 @@ body.modal-open {
margin
:
0
;
}
}
.export-modal-header
{
justify-content
:
flex-start
;
.export-svg-container
{
flex-grow
:
1
;
>
svg
{
float
:
right
;
}
}
}
.export-modal-subheader
{
justify-content
:
flex-start
;
align-items
:
center
;
}
app/assets/stylesheets/framework/variables.scss
View file @
cdf988de
...
...
@@ -806,6 +806,7 @@ $border-color-settings: #e1e1e1;
Modals
*/
$modal-body-height
:
134px
;
$modal-border-color
:
#e9ecef
;
/*
Prometheus
...
...
app/assets/stylesheets/pages/issues.scss
View file @
cdf988de
...
...
@@ -161,6 +161,35 @@ ul.related-merge-requests > li {
}
.issues-export-modal
{
.modal-header
{
justify-content
:
flex-start
;
.export-svg-container
{
flex-grow
:
1
;
>
svg
{
float
:
right
;
}
}
}
.modal-body
{
padding
:
0
;
.export-modal-subheader
{
justify-content
:
flex-start
;
align-items
:
center
;
border-bottom
:
1px
solid
$modal-border-color
;
padding
:
14px
;
}
.export-modal-text
{
padding
:
24px
16px
;
line-height
:
1
.5
;
min-height
:
$modal-body-height
;
}
}
.export-svg-container
{
height
:
56px
;
padding
:
10px
10px
0
;
...
...
ee/app/views/projects/issues/export_issues/_csv_download.html.haml
View file @
cdf988de
...
...
@@ -2,18 +2,18 @@
.issues-export-modal.modal
.modal-dialog
.modal-content
.modal-header
.export-modal-header
.modal-header
%h3
Export issues
.export-svg-container
=
render
'projects/issues/export_issues/export_issues_list.svg'
%a
.close
{
href:
'#'
,
'data-dismiss'
=>
'modal'
}
×
.modal-header.export-modal-subheader
=
icon
(
'check'
,
{
class:
'export-checkmark'
})
%strong
.prepend-left-10
#{
pluralize
(
issuables_count_for_state
(
:issues
,
params
[
:state
]),
'issue'
)
}
selected
.modal-body
%div
.export-modal-subheader
=
icon
(
'check'
,
{
class:
'export-checkmark'
})
%strong
.prepend-left-10
#{
pluralize
(
issuables_count_for_state
(
:issues
,
params
[
:state
]),
'issue'
)
}
selected
.export-modal-text
The CSV export will be created in the background. Once finished, it will be sent to
%strong
=
@current_user
.
notification_email
in an attachment.
...
...
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