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
64360f4f
Commit
64360f4f
authored
Jun 05, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move styles out of components
parent
95b3ff05
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
25 deletions
+20
-25
app/assets/javascripts/ide/components/merge_requests/dropdown.vue
...ts/javascripts/ide/components/merge_requests/dropdown.vue
+1
-9
app/assets/javascripts/ide/components/merge_requests/item.vue
...assets/javascripts/ide/components/merge_requests/item.vue
+1
-4
app/assets/javascripts/ide/components/merge_requests/list.vue
...assets/javascripts/ide/components/merge_requests/list.vue
+0
-11
app/assets/javascripts/ide/index.js
app/assets/javascripts/ide/index.js
+0
-1
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+18
-0
No files found.
app/assets/javascripts/ide/components/merge_requests/dropdown.vue
View file @
64360f4f
...
...
@@ -25,7 +25,7 @@ export default {
</
script
>
<
template
>
<div
class=
"dropdown-menu ide-merge-requests-dropdown"
>
<div
class=
"dropdown-menu ide-merge-requests-dropdown
p-0
"
>
<tabs
stop-propagation
>
<tab
active
>
<template
slot=
"title"
>
...
...
@@ -56,11 +56,3 @@ export default {
</tabs>
</div>
</template>
<
style
scoped
>
.dropdown-menu
{
width
:
350px
;
padding
:
0
;
max-height
:
initial
!important
;
}
</
style
>
app/assets/javascripts/ide/components/merge_requests/item.vue
View file @
64360f4f
...
...
@@ -44,10 +44,7 @@ export default {
class=
"btn-link d-flex align-items-center"
@
click.prevent.stop=
"clickItem"
>
<span
class=
"d-flex append-right-default"
style=
"min-width: 18px"
>
<span
class=
"d-flex append-right-default ide-merge-request-current-icon"
>
<icon
v-if=
"isActive"
name=
"mobile-issue-close"
...
...
app/assets/javascripts/ide/components/merge_requests/list.vue
View file @
64360f4f
...
...
@@ -132,14 +132,3 @@ export default {
</div>
</div>
</template>
<
style
scoped
>
.ide-merge-requests-empty
{
height
:
230px
;
}
.ide-merge-requests-dropdown-content
{
min-height
:
230px
;
max-height
:
470px
;
}
</
style
>
app/assets/javascripts/ide/index.js
View file @
64360f4f
...
...
@@ -9,7 +9,6 @@ Vue.use(Translate);
export
function
initIde
(
el
)
{
if
(
!
el
)
return
null
;
window
.
store
=
store
;
return
new
Vue
({
el
,
...
...
app/assets/stylesheets/pages/repo.scss
View file @
64360f4f
...
...
@@ -1135,6 +1135,11 @@
.avatar
{
flex
:
0
0
40px
;
}
.ide-merge-requests-dropdown.dropdown-menu
{
width
:
350px
;
max-height
:
initial
;
}
}
.ide-sidebar-project-title
{
...
...
@@ -1294,3 +1299,16 @@
}
}
}
.ide-merge-request-current-icon
{
min-width
:
18px
;
}
.ide-merge-requests-empty
{
height
:
230px
;
}
.ide-merge-requests-dropdown-content
{
min-height
:
230px
;
max-height
:
470px
;
}
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