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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
7ad4521f
Commit
7ad4521f
authored
Oct 05, 2015
by
Andrey
Committed by
Dmitriy Zaporozhets
Oct 07, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes to dropdown, font colors for new project and merge request
parent
0611a189
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
262 additions
and
150 deletions
+262
-150
app/assets/stylesheets/generic/buttons.scss
app/assets/stylesheets/generic/buttons.scss
+134
-95
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+8
-0
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/forms.scss
+21
-3
app/assets/stylesheets/generic/issue_box.scss
app/assets/stylesheets/generic/issue_box.scss
+1
-1
app/assets/stylesheets/generic/selects.scss
app/assets/stylesheets/generic/selects.scss
+35
-7
app/assets/stylesheets/generic/timeline.scss
app/assets/stylesheets/generic/timeline.scss
+2
-2
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+5
-4
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+14
-9
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+4
-4
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+1
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+25
-12
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+10
-10
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/buttons.scss
View file @
7ad4521f
body
{
body
{
text-rendering
:
geometricPrecision
;
text-rendering
:
geometricPrecision
;
}
}
.btn
{
@extend
.btn-default
;
&
.btn-new
{
@extend
.btn-success
;
}
&
.btn-create
{
@extend
.btn-success
;
}
&
.btn-save
{
@extend
.btn-success
;
}
&
.btn-remove
{
@extend
.btn-danger
;
}
&
.btn-cancel
{
float
:
right
;
}
&
.btn-close
{
color
:
$gl-danger
;
border-color
:
$gl-danger
;
&
:hover
{
color
:
#B94A48
;
}
}
&
.btn-reopen
{
color
:
$gl-success
;
border-color
:
$gl-success
;
&
:hover
{
color
:
#468847
;
}
}
&
.btn-grouped
{
margin-right
:
7px
;
float
:
left
;
&
:last-child
{
margin-right
:
0px
;
}
}
&
.btn-save
{
@extend
.btn-primary
;
}
&
.btn-new
,
&
.btn-create
{
@extend
.btn-success
;
}
}
.btn-block
{
width
:
100%
;
margin
:
0
;
margin-bottom
:
15px
;
&
.btn
{
padding
:
6px
0
;
}
}
.btn-group
{
&
.btn-grouped
{
margin-right
:
7px
;
float
:
left
;
&
:last-child
{
margin-right
:
0px
;
}
}
}
.btn-group-next
{
@mixin
btn-default
{
.btn
{
padding
:
9px
0px
;
font-size
:
15px
;
color
:
#7f8fa4
;
border-color
:
#e7e9ed
;
width
:
140px
;
&
.active
{
border-color
:
$gl-info
;
background
:
$gl-info
;
color
:
#fff
;
}
}
}
@mixin
btn-info
{
@include
border-radius
(
2px
);
@include
border-radius
(
2px
);
border-width
:
1px
;
border-width
:
1px
;
...
@@ -179,7 +89,7 @@ body {
...
@@ -179,7 +89,7 @@ body {
/*Butons*/
/*Butons*/
@mixin
b
nt
-project
{
@mixin
b
tn
-project
{
background-color
:
#f0f2f5
;
background-color
:
#f0f2f5
;
border-color
:
#dce0e5
;
border-color
:
#dce0e5
;
color
:
#313236
;
color
:
#313236
;
...
@@ -199,9 +109,35 @@ body {
...
@@ -199,9 +109,35 @@ body {
&
:active
{
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
color
:
#313236
!
important
;
color
:
#313236
!
important
;
border-color
:
#c6cacf
!
important
;
border-color
:
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
background-color
:
#e4e7ed
!
important
;
}
}
@mixin
btn-light
{
background-color
:
#fff
;
border-color
:
#dce0e5
;
color
:
#313236
;
&
:hover
{
border-color
:
#dce0e5
;
background-color
:
#f0f2f5
;
color
:
#313236
;
}
&
:focus
{
border-color
:
#dce0e5
;
background-color
:
#f0f2f5
;
color
:
#313236
;
}
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
color
:
#313236
!
important
;
border-color
:
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
}
}
}
}
...
@@ -225,4 +161,107 @@ body {
...
@@ -225,4 +161,107 @@ body {
border-color
:
#e12554
!
important
;
border-color
:
#e12554
!
important
;
}
}
}
.btn-info
{
@include
btn-default
;
@include
btn-project
;
}
.btn-success
{
@include
btn-default
;
@include
btn-green
;
}
.btn
{
@include
btn-default
;
&
.btn-new
{
@extend
.btn-success
;
}
&
.btn-create
{
@extend
.btn-success
;
}
&
.btn-save
{
@extend
.btn-success
;
}
&
.btn-remove
{
@extend
.btn-danger
;
}
&
.btn-cancel
{
float
:
right
;
}
&
.btn-close
{
color
:
$gl-danger
;
border-color
:
$gl-danger
;
&
:hover
{
color
:
#B94A48
;
}
}
&
.btn-reopen
{
color
:
$gl-success
;
border-color
:
$gl-success
;
&
:hover
{
color
:
#468847
;
}
}
&
.btn-grouped
{
margin-right
:
7px
;
float
:
left
;
&
:last-child
{
margin-right
:
0px
;
}
}
&
.btn-save
{
@extend
.btn-primary
;
}
&
.btn-new
,
&
.btn-create
{
@extend
.btn-success
;
}
}
.btn-block
{
width
:
100%
;
margin
:
0
;
margin-bottom
:
15px
;
&
.btn
{
padding
:
6px
0
;
}
}
.btn-group
{
&
.btn-grouped
{
margin-right
:
7px
;
float
:
left
;
&
:last-child
{
margin-right
:
0px
;
}
}
}
.btn-group-next
{
.btn
{
padding
:
9px
0px
;
font-size
:
15px
;
color
:
#7f8fa4
;
border-color
:
#e7e9ed
;
width
:
140px
;
&
.active
{
border-color
:
$gl-info
;
background
:
$gl-info
;
color
:
#fff
;
}
}
}
}
\ No newline at end of file
app/assets/stylesheets/generic/common.scss
View file @
7ad4521f
...
@@ -394,3 +394,11 @@ table {
...
@@ -394,3 +394,11 @@ table {
.dropzone
.dz-preview
.dz-progress
.dz-upload
{
.dropzone
.dz-preview
.dz-progress
.dz-upload
{
background
:
$gl-success
!
important
;
background
:
$gl-success
!
important
;
}
}
.space-right
{
margin-right
:
10px
;
}
.in-line
{
display
:
inline-block
;
}
app/assets/stylesheets/generic/forms.scss
View file @
7ad4521f
...
@@ -30,9 +30,6 @@ input[type='text'].danger {
...
@@ -30,9 +30,6 @@ input[type='text'].danger {
}
}
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
.form-actions
{
padding-left
:
17%
;
}
}
}
label
{
label
{
...
@@ -84,3 +81,24 @@ label {
...
@@ -84,3 +81,24 @@ label {
.wiki-content
{
.wiki-content
{
margin-top
:
35px
;
margin-top
:
35px
;
}
}
.form-group
.control-label
{
font-weight
:
normal
;
font-color
:
#313236
!
important
;
}
.form-control
{
@include
border-radius
(
2px
);
}
.
form-control
:
:-
webkit-input-placeholder
{
color
:
#7f8fa4
;
}
.input-group
{
@include
border-radius
(
2px
);
.input-group-addon
{
background-color
:
#f7f8fa
;
}
}
app/assets/stylesheets/generic/issue_box.scss
View file @
7ad4521f
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
*/
*/
.issue-box
{
.issue-box
{
@include
border-radius
(
3
px
);
@include
border-radius
(
2
px
);
display
:
inline-block
;
display
:
inline-block
;
padding
:
10px
$gl-padding
;
padding
:
10px
$gl-padding
;
...
...
app/assets/stylesheets/generic/selects.scss
View file @
7ad4521f
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
line-height
:
1
.42857143
;
line-height
:
1
.42857143
;
@include
border-radius
(
4
px
);
@include
border-radius
(
2
px
);
.select2-arrow
{
.select2-arrow
{
background
:
#FFF
;
background
:
#FFF
;
...
@@ -18,8 +18,39 @@
...
@@ -18,8 +18,39 @@
}
}
}
}
.select2-container
.select2-choice
,
.select2-container.select2-drop-above
.select2-choice
{
color
:
#7f8fa4
;
border
:
1px
solid
#e7e9ed
;
}
.select2-drop
{
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
border-radius
(
0px
);
padding
:
16px
20px
;
border
:
none
!
important
;
}
.select2-results
.select2-result-label
{
padding
:
16px
20px
;
}
.select2-drop
{
color
:
#7f8fa4
;
}
.select2-highlighted
{
background
:
#3084bb
!
important
;
}
.select2-results
li
.select2-result-with-children
>
.select2-result-label
{
font-weight
:
600
;
color
:
#313236
;
}
.select2-container-multi
.select2-choices
{
.select2-container-multi
.select2-choices
{
@include
border-radius
(
4
px
);
@include
border-radius
(
2
px
);
border-color
:
#CCC
;
border-color
:
#CCC
;
}
}
...
@@ -63,7 +94,7 @@
...
@@ -63,7 +94,7 @@
.ajax-users-dropdown
,
.ajax-project-users-dropdown
{
.ajax-users-dropdown
,
.ajax-project-users-dropdown
{
.select2-search
{
.select2-search
{
padding-top
:
4
px
;
padding-top
:
2
px
;
}
}
}
}
...
@@ -97,9 +128,6 @@
...
@@ -97,9 +128,6 @@
}
}
.user-name
{
.user-name
{
}
}
.user-username
{
color
:
#999
;
}
}
}
.namespace-result
{
.namespace-result
{
...
@@ -115,4 +143,4 @@
...
@@ -115,4 +143,4 @@
.ajax-users-dropdown
{
.ajax-users-dropdown
{
min-width
:
225px
!
important
;
min-width
:
225px
!
important
;
}
}
\ No newline at end of file
app/assets/stylesheets/generic/timeline.scss
View file @
7ad4521f
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
margin-left
:
-
$gl-padding
;
margin-left
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
color
:
$gl-gray
;
color
:
$gl-gray
;
border-bottom
:
1px
solid
#
f1f2f4
;
border-bottom
:
1px
solid
#
ECEEF1
;
border-right
:
1px
solid
#
f1f2f4
;
border-right
:
1px
solid
#
ECEEF1
;
&
:last-child
{
&
:last-child
{
border-bottom
:
none
;
border-bottom
:
none
;
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
7ad4521f
...
@@ -54,21 +54,22 @@
...
@@ -54,21 +54,22 @@
margin-top
:
-15px
;
margin-top
:
-15px
;
padding
:
10px
0
;
padding
:
10px
0
;
margin-bottom
:
0
;
margin-bottom
:
0
;
color
:
$gl-gray
;
color
:
#5c5d5e
;
font-size
:
16px
;
font-size
:
16px
;
.author
{
.author
{
color
:
$gl-gray
;
color
:
#5c5d5e
;
}
}
.issue-id
{
.issue-id
{
font-size
:
19px
;
color
:
#5c5d5e
;
color
:
$gl-text-color
;
}
}
}
}
.issue-title
{
.issue-title
{
margin
:
0
;
margin
:
0
;
font-size
:
23px
;
color
:
#313236
;
}
}
.description
{
.description
{
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
7ad4521f
...
@@ -3,12 +3,11 @@
...
@@ -3,12 +3,11 @@
*
*
*/
*/
.mr-state-widget
{
.mr-state-widget
{
background
:
#
f8fafc
;
background
:
#
F7F8FA
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
color
:
$gl-gray
;
color
:
$gl-gray
;
border
:
1px
solid
#eef0f2
;
border
:
1px
solid
#dce0e6
;
@include
box-shadow
(
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.05
));
@include
border-radius
(
2px
);
@include
border-radius
(
3px
);
form
{
form
{
margin-bottom
:
0
;
margin-bottom
:
0
;
...
@@ -76,11 +75,17 @@
...
@@ -76,11 +75,17 @@
.mr-widget-footer
{
.mr-widget-footer
{
padding
:
15px
;
padding
:
15px
;
}
}
.normal
{
color
:
#5c5d5e
;
}
.mr-widget-body
{
.mr-widget-body
{
h4
{
h4
{
font-weight
:
bold
;
font-weight
:
600
;
font-size
:
17px
;
margin
:
5px
0
;
margin
:
5px
0
;
color
:
#313236
;
}
}
p
:last-child
{
p
:last-child
{
...
@@ -102,9 +107,7 @@
...
@@ -102,9 +107,7 @@
margin
:
-
$gl-padding
;
margin
:
-
$gl-padding
;
padding
:
$gl-padding
;
padding
:
$gl-padding
;
text-align
:
center
;
text-align
:
center
;
border-top
:
1px
solid
#e7e9ed
;
margin-bottom
:
1px
;
margin-top
:
18px
;
margin-bottom
:
3px
;
}
}
.mr_source_commit
,
.mr_source_commit
,
...
@@ -120,10 +123,12 @@
...
@@ -120,10 +123,12 @@
}
}
.label-branch
{
.label-branch
{
color
:
#
222
;
color
:
#
313236
;
font-family
:
$monospace_font
;
font-family
:
$monospace_font
;
font-weight
:
bold
;
font-weight
:
bold
;
overflow
:
hidden
;
overflow
:
hidden
;
font-size
:
14px
;
margin
:
0
3px
;
}
}
.mr-list
{
.mr-list
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
7ad4521f
...
@@ -72,12 +72,12 @@
...
@@ -72,12 +72,12 @@
.common-note-form
{
.common-note-form
{
margin
:
0
;
margin
:
0
;
background
:
#
f8fafc
;
background
:
#
F7F8FA
;
padding
:
$gl-padding
;
padding
:
$gl-padding
;
margin-left
:
-
$gl-padding
;
margin-left
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
border-right
:
1px
solid
#
f1f2f4
;
border-right
:
1px
solid
#
ECEEF1
;
border-top
:
1px
solid
#
f1f2f4
;
border-top
:
1px
solid
#
ECEEF1
;
margin-bottom
:
-
$gl-padding
;
margin-bottom
:
-
$gl-padding
;
}
}
...
@@ -168,7 +168,7 @@
...
@@ -168,7 +168,7 @@
.comment-hints
{
.comment-hints
{
color
:
#999
;
color
:
#999
;
background
:
#FFF
;
background
:
#FFF
;
padding
:
5
px
;
padding
:
7
px
;
margin-top
:
-11px
;
margin-top
:
-11px
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
font-size
:
13px
;
font-size
:
13px
;
...
...
app/assets/stylesheets/pages/notes.scss
View file @
7ad4521f
...
@@ -18,7 +18,7 @@ ul.notes {
...
@@ -18,7 +18,7 @@ ul.notes {
font-size
:
14px
;
font-size
:
14px
;
padding-top
:
10px
;
padding-top
:
10px
;
padding-bottom
:
10px
;
padding-bottom
:
10px
;
background
:
#
f8fafc
;
background
:
#
FDFDFD
;
.timeline-icon
{
.timeline-icon
{
.avatar
{
.avatar
{
...
...
app/assets/stylesheets/pages/projects.scss
View file @
7ad4521f
...
@@ -13,11 +13,19 @@
...
@@ -13,11 +13,19 @@
.edit_project
{
.edit_project
{
fieldset
.features
{
fieldset
.features
{
.control-label
{
.control-label
{
font-weight
:
bold
;
font-weight
:
normal
;
}
}
}
}
}
}
.btn
,
.commits-compare-switch
{
@include
btn-light
;
}
.project-edit-content
{
padding
:
7px
;
}
.project-name-holder
{
.project-name-holder
{
.help-inline
{
.help-inline
{
vertical-align
:
top
;
vertical-align
:
top
;
...
@@ -92,8 +100,8 @@
...
@@ -92,8 +100,8 @@
margin-bottom
:
0px
;
margin-bottom
:
0px
;
.btn
{
.btn
{
@include
b
nt
-project
;
@include
b
tn
-project
;
@include
btn-
info
;
@include
btn-
default
;
.count
{
.count
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -139,7 +147,11 @@
...
@@ -139,7 +147,11 @@
}
}
}
}
}
}
.btn-green
{
@include
btn-green
;
cursor
:
pointer
;
}
.projects-search-form
{
.projects-search-form
{
.input-group
.form-control
{
.input-group
.form-control
{
...
@@ -149,7 +161,7 @@
...
@@ -149,7 +161,7 @@
.input-group-btn
{
.input-group-btn
{
.btn
{
.btn
{
@include
b
nt
-project
;
@include
b
tn
-project
;
@include
btn-middle
;
@include
btn-middle
;
&
:hover
{
&
:hover
{
...
@@ -183,8 +195,8 @@
...
@@ -183,8 +195,8 @@
margin
:
0
12px
0
12px
;
margin
:
0
12px
0
12px
;
.btn
{
.btn
{
@include
b
nt
-project
;
@include
b
tn
-project
;
@include
btn-
info
;
@include
btn-
default
;
}
}
.dropdown-toggle
{
.dropdown-toggle
{
...
@@ -251,18 +263,19 @@
...
@@ -251,18 +263,19 @@
margin-bottom
:
10px
;
margin-bottom
:
10px
;
i
{
i
{
margin
:
0
3px
;
margin
:
2px
0
;
font-size
:
20px
;
font-size
:
20px
;
}
}
.option-title
{
.option-title
{
font-weight
:
bold
;
font-weight
:
normal
;
display
:
inline-block
;
display
:
inline-block
;
color
:
#313236
;
}
}
.option-descr
{
.option-descr
{
margin-left
:
36
px
;
margin-left
:
29
px
;
color
:
$gray
;
color
:
#54565b
;
}
}
}
}
}
}
...
@@ -376,8 +389,8 @@ table.table.protected-branches-list tr.no-border {
...
@@ -376,8 +389,8 @@ table.table.protected-branches-list tr.no-border {
}
}
.nav
>
li
>
a
{
.nav
>
li
>
a
{
@include
btn-
info
;
@include
btn-
default
;
@include
b
nt
-project
;
@include
b
tn
-project
;
background-color
:
transparent
;
background-color
:
transparent
;
border
:
1px
solid
#f7f8fa
;
border
:
1px
solid
#f7f8fa
;
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
7ad4521f
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
%ul
.dropdown-menu
%ul
.dropdown-menu
%li
=
link_to
"Email Patches"
,
merge_request_path
(
@merge_request
,
format: :patch
)
%li
=
link_to
"Email Patches"
,
merge_request_path
(
@merge_request
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
merge_request_path
(
@merge_request
,
format: :diff
)
%li
=
link_to
"Plain Diff"
,
merge_request_path
(
@merge_request
,
format: :diff
)
.
light
.
normal
%span
Request to merge
%span
Request to merge
%span
.label-branch
#{
source_branch_with_namespace
(
@merge_request
)
}
%span
.label-branch
#{
source_branch_with_namespace
(
@merge_request
)
}
%span
into
%span
into
...
...
app/views/projects/new.html.haml
View file @
7ad4521f
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
form_for
@project
,
html:
{
class:
'new_project form-horizontal js-requires-input'
}
do
|
f
|
=
form_for
@project
,
html:
{
class:
'new_project form-horizontal js-requires-input'
}
do
|
f
|
.form-group.project-name-holder
.form-group.project-name-holder
=
f
.
label
:path
,
class:
'control-label'
do
=
f
.
label
:path
,
class:
'control-label'
do
%strong
Project path
Project path
.col-sm-10
.col-sm-10
.input-group
.input-group
=
f
.
text_field
:path
,
placeholder:
"my-awesome-project"
,
class:
"form-control"
,
tabindex:
1
,
autofocus:
true
,
required:
true
=
f
.
text_field
:path
,
placeholder:
"my-awesome-project"
,
class:
"form-control"
,
tabindex:
1
,
autofocus:
true
,
required:
true
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
=
f
.
select
:namespace_id
,
namespaces_options
(
params
[
:namespace_id
]
||
:current_user
),
{},
{
class:
'select2'
,
tabindex:
2
}
=
f
.
select
:namespace_id
,
namespaces_options
(
params
[
:namespace_id
]
||
:current_user
),
{},
{
class:
'select2'
,
tabindex:
2
}
-
if
import_sources_enabled?
-
if
import_sources_enabled?
%hr
.project-import.js-toggle-container
.project-import.js-toggle-container
.form-group
.form-group
...
@@ -35,7 +34,7 @@
...
@@ -35,7 +34,7 @@
%i
.fa.fa-github
%i
.fa.fa-github
GitHub
GitHub
-
else
-
else
=
link_to
'#'
,
class:
'how_to_import_link
light
btn import_github'
do
=
link_to
'#'
,
class:
'how_to_import_link btn import_github'
do
%i
.fa.fa-github
%i
.fa.fa-github
GitHub
GitHub
=
render
'github_import_modal'
=
render
'github_import_modal'
...
@@ -46,7 +45,7 @@
...
@@ -46,7 +45,7 @@
%i
.fa.fa-bitbucket
%i
.fa.fa-bitbucket
Bitbucket
Bitbucket
-
else
-
else
=
link_to
status_import_bitbucket_path
,
class:
'how_to_import_link
light
btn import_bitbucket'
,
"data-no-turbolink"
=>
"true"
do
=
link_to
status_import_bitbucket_path
,
class:
'how_to_import_link btn import_bitbucket'
,
"data-no-turbolink"
=>
"true"
do
%i
.fa.fa-bitbucket
%i
.fa.fa-bitbucket
Bitbucket
Bitbucket
=
render
'bitbucket_import_modal'
=
render
'bitbucket_import_modal'
...
@@ -57,7 +56,7 @@
...
@@ -57,7 +56,7 @@
%i
.fa.fa-heart
%i
.fa.fa-heart
GitLab.com
GitLab.com
-
else
-
else
=
link_to
status_import_gitlab_path
,
class:
'how_to_import_link
light
btn import_gitlab'
do
=
link_to
status_import_gitlab_path
,
class:
'how_to_import_link btn import_gitlab'
do
%i
.fa.fa-heart
%i
.fa.fa-heart
GitLab.com
GitLab.com
=
render
'gitlab_import_modal'
=
render
'gitlab_import_modal'
...
@@ -97,7 +96,7 @@
...
@@ -97,7 +96,7 @@
%li
%li
To migrate an SVN repository, check out
#{
link_to
"this document"
,
"http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html"
}
.
To migrate an SVN repository, check out
#{
link_to
"this document"
,
"http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html"
}
.
%hr
.prepend-botton-10
.prepend-botton-10
.form-group
.form-group
=
f
.
label
:description
,
class:
'control-label'
do
=
f
.
label
:description
,
class:
'control-label'
do
...
@@ -112,10 +111,11 @@
...
@@ -112,10 +111,11 @@
-
if
current_user
.
can_create_group?
-
if
current_user
.
can_create_group?
.pull-right
.pull-right
.light
.light.in-line
Need a group for several dependent projects?
.space-right
=
link_to
new_group_path
,
class:
"btn btn-xs"
do
Need a group for several dependent projects?
Create a group
=
link_to
new_group_path
,
class:
"btn btn-xs"
do
Create a group
.save-project-loader.hide
.save-project-loader.hide
.center
.center
...
...
app/views/projects/notes/_form.html.haml
View file @
7ad4521f
...
@@ -14,6 +14,6 @@
...
@@ -14,6 +14,6 @@
.note-form-actions
.note-form-actions
.buttons.clearfix
.buttons.clearfix
=
f
.
submit
'Add Comment'
,
class:
"btn comment-btn btn-grouped js-comment-button"
=
f
.
submit
'Add Comment'
,
class:
"btn
btn-green
comment-btn btn-grouped js-comment-button"
=
yield
(
:note_actions
)
=
yield
(
:note_actions
)
%a
.btn.grouped.js-close-discussion-note-form
Cancel
%a
.btn.grouped.js-close-discussion-note-form
Cancel
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