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
Boxiang Sun
gitlab-ce
Commits
7974e814
Commit
7974e814
authored
Nov 20, 2018
by
George Tsiolis
Committed by
Phil Hughes
Nov 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove instances of `@extend .monospace`
parent
2e520274
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
18 additions
and
33 deletions
+18
-33
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+0
-4
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+0
-8
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+0
-4
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-4
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+2
-2
app/views/projects/branches/new.html.haml
app/views/projects/branches/new.html.haml
+1
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+2
-2
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+1
-1
app/views/projects/merge_requests/creations/_new_compare.html.haml
.../projects/merge_requests/creations/_new_compare.html.haml
+2
-2
app/views/projects/pipelines/new.html.haml
app/views/projects/pipelines/new.html.haml
+1
-1
app/views/projects/protected_branches/shared/_dropdown.html.haml
...ws/projects/protected_branches/shared/_dropdown.html.haml
+1
-1
app/views/projects/protected_tags/shared/_dropdown.html.haml
app/views/projects/protected_tags/shared/_dropdown.html.haml
+1
-1
changelogs/unreleased/gt-remove-instances-of-extend-monospace.yml
...gs/unreleased/gt-remove-instances-of-extend-monospace.yml
+5
-0
spec/support/helpers/features/branches_helpers.rb
spec/support/helpers/features/branches_helpers.rb
+1
-1
No files found.
app/assets/stylesheets/framework/typography.scss
View file @
7974e814
...
@@ -360,10 +360,6 @@ code {
...
@@ -360,10 +360,6 @@ code {
font-size
:
95%
;
font-size
:
95%
;
}
}
.git-revision-dropdown-toggle
{
@extend
.monospace
;
}
.git-revision-dropdown
.dropdown-content
ul
li
a
{
.git-revision-dropdown
.dropdown-content
ul
li
a
{
@extend
.ref-name
;
@extend
.ref-name
;
}
}
...
...
app/assets/stylesheets/pages/editor.scss
View file @
7974e814
...
@@ -32,7 +32,6 @@
...
@@ -32,7 +32,6 @@
.file-title
{
.file-title
{
@extend
.monospace
;
@extend
.monospace
;
line-height
:
35px
;
line-height
:
35px
;
padding-top
:
7px
;
padding-top
:
7px
;
padding-bottom
:
7px
;
padding-bottom
:
7px
;
...
@@ -48,13 +47,6 @@
...
@@ -48,13 +47,6 @@
margin-right
:
10px
;
margin-right
:
10px
;
}
}
.editor-file-name
{
@extend
.monospace
;
float
:
left
;
margin-right
:
10px
;
}
.new-file-name
{
.new-file-name
{
display
:
inline-block
;
display
:
inline-block
;
max-width
:
420px
;
max-width
:
420px
;
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
7974e814
...
@@ -141,10 +141,6 @@
...
@@ -141,10 +141,6 @@
float
:
none
;
float
:
none
;
}
}
.api
{
@extend
.monospace
;
}
.branch-commit
{
.branch-commit
{
.ref-name
{
.ref-name
{
font-weight
:
$gl-font-weight-bold
;
font-weight
:
$gl-font-weight-bold
;
...
...
app/assets/stylesheets/pages/projects.scss
View file @
7974e814
...
@@ -352,10 +352,6 @@
...
@@ -352,10 +352,6 @@
.mobile-git-clone
{
.mobile-git-clone
{
margin-top
:
$gl-padding-8
;
margin-top
:
$gl-padding-8
;
.dropdown-menu-inner-content
{
@extend
.monospace
;
}
}
}
}
}
...
...
app/views/projects/blob/_editor.html.haml
View file @
7974e814
...
@@ -6,12 +6,12 @@
...
@@ -6,12 +6,12 @@
=
sprite_icon
(
'fork'
,
size:
12
)
=
sprite_icon
(
'fork'
,
size:
12
)
=
ref
=
ref
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
%span
.
editor-file-name
%span
.
pull-left.append-right-10
=
text_field_tag
'file_path'
,
(
params
[
:file_path
]
||
@path
),
=
text_field_tag
'file_path'
,
(
params
[
:file_path
]
||
@path
),
class:
'form-control new-file-path js-file-path-name-input'
class:
'form-control new-file-path js-file-path-name-input'
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
%span
.
editor-file-name
%span
.
pull-left.append-right-10
\/
\/
=
text_field_tag
'file_name'
,
params
[
:file_name
],
placeholder:
"File name"
,
=
text_field_tag
'file_name'
,
params
[
:file_name
],
placeholder:
"File name"
,
required:
true
,
class:
'form-control new-file-name js-file-path-name-input'
required:
true
,
class:
'form-control new-file-name js-file-path-name-input'
...
...
app/views/projects/branches/new.html.haml
View file @
7974e814
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.col-sm-10.create-from
.col-sm-10.create-from
.dropdown
.dropdown
=
hidden_field_tag
:ref
,
default_ref
=
hidden_field_tag
:ref
,
default_ref
=
button_tag
type:
'button'
,
title:
default_ref
,
class:
'dropdown-menu-toggle wide js-branch-select
git-revision-dropdown-toggl
e'
,
required:
true
,
data:
{
toggle:
'dropdown'
,
selected:
default_ref
,
field_name:
'ref'
}
do
=
button_tag
type:
'button'
,
title:
default_ref
,
class:
'dropdown-menu-toggle wide js-branch-select
monospac
e'
,
required:
true
,
data:
{
toggle:
'dropdown'
,
selected:
default_ref
,
field_name:
'ref'
}
do
.text-left.dropdown-toggle-text
=
default_ref
.text-left.dropdown-toggle-text
=
default_ref
=
icon
(
'chevron-down'
)
=
icon
(
'chevron-down'
)
=
render
'shared/ref_dropdown'
,
dropdown_class:
'wide'
=
render
'shared/ref_dropdown'
,
dropdown_class:
'wide'
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
7974e814
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
-
if
pipeline
.
user
-
if
pipeline
.
user
=
user_avatar
(
user:
pipeline
.
user
,
size:
20
)
=
user_avatar
(
user:
pipeline
.
user
,
size:
20
)
-
else
-
else
%span
.
api
API
%span
.
monospace
API
-
if
admin
-
if
admin
%td
%td
...
...
app/views/projects/compare/_form.html.haml
View file @
7974e814
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
.input-group-text
.input-group-text
=
s_
(
"CompareBranches|Source"
)
=
s_
(
"CompareBranches|Source"
)
=
hidden_field_tag
:to
,
params
[
:to
]
=
hidden_field_tag
:to
,
params
[
:to
]
=
button_tag
type:
'button'
,
title:
params
[
:to
],
class:
"form-control compare-dropdown-toggle js-compare-dropdown has-tooltip
git-revision-dropdown-toggl
e"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-to-dropdown"
,
selected:
params
[
:to
],
field_name: :to
}
do
=
button_tag
type:
'button'
,
title:
params
[
:to
],
class:
"form-control compare-dropdown-toggle js-compare-dropdown has-tooltip
monospac
e"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-to-dropdown"
,
selected:
params
[
:to
],
field_name: :to
}
do
.dropdown-toggle-text.str-truncated
=
params
[
:to
]
||
_
(
"Select branch/tag"
)
.dropdown-toggle-text.str-truncated
=
params
[
:to
]
||
_
(
"Select branch/tag"
)
=
render
'shared/ref_dropdown'
=
render
'shared/ref_dropdown'
.compare-ellipsis.inline
...
.compare-ellipsis.inline
...
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
.input-group-text
.input-group-text
=
s_
(
"CompareBranches|Target"
)
=
s_
(
"CompareBranches|Target"
)
=
hidden_field_tag
:from
,
params
[
:from
]
=
hidden_field_tag
:from
,
params
[
:from
]
=
button_tag
type:
'button'
,
title:
params
[
:from
],
class:
"form-control compare-dropdown-toggle js-compare-dropdown has-tooltip
git-revision-dropdown-toggl
e"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-from-dropdown"
,
selected:
params
[
:from
],
field_name: :from
}
do
=
button_tag
type:
'button'
,
title:
params
[
:from
],
class:
"form-control compare-dropdown-toggle js-compare-dropdown has-tooltip
monospac
e"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-from-dropdown"
,
selected:
params
[
:from
],
field_name: :from
}
do
.dropdown-toggle-text.str-truncated
=
params
[
:from
]
||
_
(
"Select branch/tag"
)
.dropdown-toggle-text.str-truncated
=
params
[
:from
]
||
_
(
"Select branch/tag"
)
=
render
'shared/ref_dropdown'
=
render
'shared/ref_dropdown'
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
7974e814
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
-
if
generic_commit_status
.
pipeline
.
user
-
if
generic_commit_status
.
pipeline
.
user
=
user_avatar
(
user:
generic_commit_status
.
pipeline
.
user
,
size:
20
)
=
user_avatar
(
user:
generic_commit_status
.
pipeline
.
user
,
size:
20
)
-
else
-
else
%span
.
api
API
%span
.
monospace
API
-
if
admin
-
if
admin
%td
%td
...
...
app/views/projects/merge_requests/creations/_new_compare.html.haml
View file @
7974e814
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
selected:
f
.
object
.
source_project_id
selected:
f
.
object
.
source_project_id
.merge-request-select.dropdown
.merge-request-select.dropdown
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:source_branch
=
dropdown_toggle
f
.
object
.
source_branch
||
_
(
"Select source branch"
),
{
toggle:
"dropdown"
,
'field-name'
:
"
#{
f
.
object_name
}
[source_branch]"
,
'refs-url'
:
refs_project_path
(
@source_project
),
selected:
f
.
object
.
source_branch
},
{
toggle_class:
"js-compare-dropdown js-source-branch
git-revision-dropdown-toggl
e"
}
=
dropdown_toggle
f
.
object
.
source_branch
||
_
(
"Select source branch"
),
{
toggle:
"dropdown"
,
'field-name'
:
"
#{
f
.
object_name
}
[source_branch]"
,
'refs-url'
:
refs_project_path
(
@source_project
),
selected:
f
.
object
.
source_branch
},
{
toggle_class:
"js-compare-dropdown js-source-branch
monospac
e"
}
.dropdown-menu.dropdown-menu-selectable.js-source-branch-dropdown.git-revision-dropdown
.dropdown-menu.dropdown-menu-selectable.js-source-branch-dropdown.git-revision-dropdown
=
dropdown_title
(
_
(
"Select source branch"
))
=
dropdown_title
(
_
(
"Select source branch"
))
=
dropdown_filter
(
_
(
"Search branches"
))
=
dropdown_filter
(
_
(
"Search branches"
))
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
selected:
f
.
object
.
target_project_id
selected:
f
.
object
.
target_project_id
.merge-request-select.dropdown
.merge-request-select.dropdown
=
f
.
hidden_field
:target_branch
=
f
.
hidden_field
:target_branch
=
dropdown_toggle
f
.
object
.
target_branch
,
{
toggle:
"dropdown"
,
'field-name'
:
"
#{
f
.
object_name
}
[target_branch]"
,
'refs-url'
:
refs_project_path
(
f
.
object
.
target_project
),
selected:
f
.
object
.
target_branch
},
{
toggle_class:
"js-compare-dropdown js-target-branch
git-revision-dropdown-toggl
e"
}
=
dropdown_toggle
f
.
object
.
target_branch
,
{
toggle:
"dropdown"
,
'field-name'
:
"
#{
f
.
object_name
}
[target_branch]"
,
'refs-url'
:
refs_project_path
(
f
.
object
.
target_project
),
selected:
f
.
object
.
target_branch
},
{
toggle_class:
"js-compare-dropdown js-target-branch
monospac
e"
}
.dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown.git-revision-dropdown
.dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown.git-revision-dropdown
=
dropdown_title
(
_
(
"Select target branch"
))
=
dropdown_title
(
_
(
"Select target branch"
))
=
dropdown_filter
(
_
(
"Search branches"
))
=
dropdown_filter
(
_
(
"Search branches"
))
...
...
app/views/projects/pipelines/new.html.haml
View file @
7974e814
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
f
.
label
:ref
,
s_
(
'Pipeline|Create for'
),
class:
'col-form-label'
=
f
.
label
:ref
,
s_
(
'Pipeline|Create for'
),
class:
'col-form-label'
=
hidden_field_tag
'pipeline[ref]'
,
params
[
:ref
]
||
@project
.
default_branch
=
hidden_field_tag
'pipeline[ref]'
,
params
[
:ref
]
||
@project
.
default_branch
=
dropdown_tag
(
params
[
:ref
]
||
@project
.
default_branch
,
=
dropdown_tag
(
params
[
:ref
]
||
@project
.
default_branch
,
options:
{
toggle_class:
'js-branch-select wide
git-revision-dropdown-toggl
e'
,
options:
{
toggle_class:
'js-branch-select wide
monospac
e'
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable git-revision-dropdown"
,
placeholder:
s_
(
"Pipeline|Search branches"
),
filter:
true
,
dropdown_class:
"dropdown-menu-selectable git-revision-dropdown"
,
placeholder:
s_
(
"Pipeline|Search branches"
),
data:
{
selected:
params
[
:ref
]
||
@project
.
default_branch
,
field_name:
'pipeline[ref]'
}
})
data:
{
selected:
params
[
:ref
]
||
@project
.
default_branch
,
field_name:
'pipeline[ref]'
}
})
.form-text.text-muted
.form-text.text-muted
...
...
app/views/projects/protected_branches/shared/_dropdown.html.haml
View file @
7974e814
=
f
.
hidden_field
(
:name
)
=
f
.
hidden_field
(
:name
)
=
dropdown_tag
(
'Select branch or create wildcard'
,
=
dropdown_tag
(
'Select branch or create wildcard'
,
options:
{
toggle_class:
'js-protected-branch-select js-filter-submit wide
git-revision-dropdown-toggl
e qa-protected-branch-select'
,
options:
{
toggle_class:
'js-protected-branch-select js-filter-submit wide
monospac
e qa-protected-branch-select'
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable git-revision-dropdown qa-protected-branch-dropdown"
,
placeholder:
"Search protected branches"
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable git-revision-dropdown qa-protected-branch-dropdown"
,
placeholder:
"Search protected branches"
,
footer_content:
true
,
footer_content:
true
,
data:
{
show_no:
true
,
show_any:
true
,
show_upcoming:
true
,
data:
{
show_no:
true
,
show_any:
true
,
show_upcoming:
true
,
...
...
app/views/projects/protected_tags/shared/_dropdown.html.haml
View file @
7974e814
=
f
.
hidden_field
(
:name
)
=
f
.
hidden_field
(
:name
)
=
dropdown_tag
(
'Select tag or create wildcard'
,
=
dropdown_tag
(
'Select tag or create wildcard'
,
options:
{
toggle_class:
'js-protected-tag-select js-filter-submit wide
git-revision-dropdown-toggl
e'
,
options:
{
toggle_class:
'js-protected-tag-select js-filter-submit wide
monospac
e'
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable capitalize-header git-revision-dropdown"
,
placeholder:
"Search protected tags"
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable capitalize-header git-revision-dropdown"
,
placeholder:
"Search protected tags"
,
footer_content:
true
,
footer_content:
true
,
data:
{
show_no:
true
,
show_any:
true
,
show_upcoming:
true
,
data:
{
show_no:
true
,
show_any:
true
,
show_upcoming:
true
,
...
...
changelogs/unreleased/gt-remove-instances-of-extend-monospace.yml
0 → 100644
View file @
7974e814
---
title
:
Remove monospace extend
merge_request
:
23089
author
:
George Tsiolis
type
:
performance
spec/support/helpers/features/branches_helpers.rb
View file @
7974e814
...
@@ -20,7 +20,7 @@ module Spec
...
@@ -20,7 +20,7 @@ module Spec
end
end
def
select_branch
(
branch_name
)
def
select_branch
(
branch_name
)
find
(
".
git-revision-dropdown-toggle
"
).
click
find
(
".
js-branch-select
"
).
click
page
.
within
(
"#new-branch-form .dropdown-menu"
)
do
page
.
within
(
"#new-branch-form .dropdown-menu"
)
do
click_link
(
branch_name
)
click_link
(
branch_name
)
...
...
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