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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c9c53846
Commit
c9c53846
authored
Oct 13, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'redesign-files-page'
parents
1907f259
a0a488ed
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
87 additions
and
88 deletions
+87
-88
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/line_highlighter.js.coffee
app/assets/javascripts/line_highlighter.js.coffee
+3
-3
app/assets/stylesheets/framework/tables.scss
app/assets/stylesheets/framework/tables.scss
+1
-1
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+2
-0
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+13
-21
app/views/projects/blob/_blob.html.haml
app/views/projects/blob/_blob.html.haml
+1
-1
app/views/projects/repositories/_download_archive.html.haml
app/views/projects/repositories/_download_archive.html.haml
+2
-2
app/views/projects/tree/_readme.html.haml
app/views/projects/tree/_readme.html.haml
+7
-6
app/views/projects/tree/_tree.html.haml
app/views/projects/tree/_tree.html.haml
+54
-52
spec/javascripts/fixtures/line_highlighter.html.haml
spec/javascripts/fixtures/line_highlighter.html.haml
+1
-1
spec/javascripts/line_highlighter_spec.js.coffee
spec/javascripts/line_highlighter_spec.js.coffee
+1
-1
No files found.
CHANGELOG
View file @
c9c53846
...
@@ -49,6 +49,7 @@ v 8.1.0 (unreleased)
...
@@ -49,6 +49,7 @@ v 8.1.0 (unreleased)
- Add spellcheck=false to certain input fields
- Add spellcheck=false to certain input fields
- Invalidate stored service password if the endpoint URL is changed
- Invalidate stored service password if the endpoint URL is changed
- Project names are not fully shown if group name is too big, even on group page view
- Project names are not fully shown if group name is too big, even on group page view
- Apply new design for Files page
v 8.0.4
v 8.0.4
- Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)
- Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)
...
...
app/assets/javascripts/line_highlighter.js.coffee
View file @
c9c53846
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
#
#
# ### Example Markup
# ### Example Markup
#
#
# <div id="
tree
-content-holder">
# <div id="
blob
-content-holder">
# <div class="file-content">
# <div class="file-content">
# <div class="line-numbers">
# <div class="line-numbers">
# <a href="#L1" id="L1" data-line-number="1">1</a>
# <a href="#L1" id="L1" data-line-number="1">1</a>
...
@@ -53,7 +53,7 @@ class @LineHighlighter
...
@@ -53,7 +53,7 @@ class @LineHighlighter
$
.
scrollTo
(
"#L
#{
range
[
0
]
}
"
,
offset
:
-
150
)
$
.
scrollTo
(
"#L
#{
range
[
0
]
}
"
,
offset
:
-
150
)
bindEvents
:
->
bindEvents
:
->
$
(
'#
tree
-content-holder'
).
on
'mousedown'
,
'a[data-line-number]'
,
@
clickHandler
$
(
'#
blob
-content-holder'
).
on
'mousedown'
,
'a[data-line-number]'
,
@
clickHandler
# While it may seem odd to bind to the mousedown event and then throw away
# While it may seem odd to bind to the mousedown event and then throw away
# the click event, there is a method to our madness.
# the click event, there is a method to our madness.
...
@@ -62,7 +62,7 @@ class @LineHighlighter
...
@@ -62,7 +62,7 @@ class @LineHighlighter
# active state even when the event is cancelled, resulting in an ugly border
# active state even when the event is cancelled, resulting in an ugly border
# around the link and/or a persisted underline text decoration.
# around the link and/or a persisted underline text decoration.
$
(
'#
tree
-content-holder'
).
on
'click'
,
'a[data-line-number]'
,
(
event
)
->
$
(
'#
blob
-content-holder'
).
on
'click'
,
'a[data-line-number]'
,
(
event
)
->
event
.
preventDefault
()
event
.
preventDefault
()
clickHandler
:
(
event
)
=>
clickHandler
:
(
event
)
=>
...
...
app/assets/stylesheets/framework/tables.scss
View file @
c9c53846
...
@@ -28,7 +28,7 @@ table {
...
@@ -28,7 +28,7 @@ table {
border-bottom
:
1px
solid
$border-color
!
important
;
border-bottom
:
1px
solid
$border-color
!
important
;
}
}
td
{
td
{
border-color
:
#F1F1F1
!
important
;
border-color
:
$table-border-color
!
important
;
border-bottom
:
1px
solid
;
border-bottom
:
1px
solid
;
}
}
}
}
...
...
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
View file @
c9c53846
...
@@ -156,3 +156,5 @@ $nav-link-padding: 13px $gl-padding;
...
@@ -156,3 +156,5 @@ $nav-link-padding: 13px $gl-padding;
$pre-bg
:
#f8fafc
!
default
;
$pre-bg
:
#f8fafc
!
default
;
$pre-color
:
$gl-gray
!
default
;
$pre-color
:
$gl-gray
!
default
;
$pre-border-color
:
#e7e9ed
;
$pre-border-color
:
#e7e9ed
;
$table-bg-accent
:
$background-color
;
app/assets/stylesheets/framework/variables.scss
View file @
c9c53846
...
@@ -16,6 +16,7 @@ $avatar_radius: 50%;
...
@@ -16,6 +16,7 @@ $avatar_radius: 50%;
$code_font_size
:
13px
;
$code_font_size
:
13px
;
$code_line_height
:
1
.5
;
$code_line_height
:
1
.5
;
$border-color
:
#dce0e6
;
$border-color
:
#dce0e6
;
$table-border-color
:
#eef0f2
;
$background-color
:
#F7F8FA
;
$background-color
:
#F7F8FA
;
$header-height
:
58px
;
$header-height
:
58px
;
$fixed-layout-width
:
1200px
;
$fixed-layout-width
:
1200px
;
...
...
app/assets/stylesheets/pages/tree.scss
View file @
c9c53846
.tree-holder
{
.tree-holder
{
.tree-
content
-holder
{
.tree-
table
-holder
{
float
:
left
;
margin-left
:
-
$gl-padding
;
width
:
100%
;
margin-right
:
-
$gl-padding
;
}
}
.tree_progress
{
.tree_progress
{
...
@@ -13,10 +13,15 @@
...
@@ -13,10 +13,15 @@
}
}
.tree-table
{
.tree-table
{
@extend
.table
;
margin-bottom
:
0
;
@include
border-radius
(
0
);
tr
{
tr
{
>
td
,
>
th
{
padding
:
10px
$gl-padding
;
line-height
:
32px
;
border-color
:
$table-border-color
!
important
;
}
&
:hover
{
&
:hover
{
td
{
td
{
background
:
$hover
;
background
:
$hover
;
...
@@ -27,9 +32,9 @@
...
@@ -27,9 +32,9 @@
}
}
&
.selected
{
&
.selected
{
td
{
td
{
background
:
$
background-color
;
background
:
$
gray-dark
;
border-top
:
1px
solid
#EEE
;
border-top
:
1px
solid
$border-gray-dark
;
border-bottom
:
1px
solid
#EEE
;
border-bottom
:
1px
solid
$border-gray-dark
;
}
}
}
}
}
}
...
@@ -85,19 +90,6 @@
...
@@ -85,19 +90,6 @@
margin-right
:
15px
;
margin-right
:
15px
;
}
}
.readme-holder
{
margin
:
0
auto
;
.readme-file-title
{
font-size
:
14px
;
font-weight
:
bold
;
margin-bottom
:
20px
;
color
:
#777
;
border-bottom
:
1px
solid
#DDD
;
padding
:
10px
0
;
}
}
.blob-commit-info
{
.blob-commit-info
{
list-style
:
none
;
list-style
:
none
;
margin
:
0
;
margin
:
0
;
...
...
app/views/projects/blob/_blob.html.haml
View file @
c9c53846
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
-
blob_commit
=
@repository
.
last_commit_for_path
(
@commit
.
id
,
blob
.
path
)
-
blob_commit
=
@repository
.
last_commit_for_path
(
@commit
.
id
,
blob
.
path
)
=
render
blob_commit
,
project:
@project
=
render
blob_commit
,
project:
@project
%div
#
tree-content-holder
.tree
-content-holder
%div
#
blob-content-holder
.blob
-content-holder
%article
.file-holder
%article
.file-holder
.file-title
.file-title
=
blob_icon
blob
.
mode
,
blob
.
name
=
blob_icon
blob
.
mode
,
blob
.
name
...
...
app/views/projects/repositories/_download_archive.html.haml
View file @
c9c53846
...
@@ -3,10 +3,10 @@
...
@@ -3,10 +3,10 @@
-
split_button
=
split_button
||
false
-
split_button
=
split_button
||
false
-
if
split_button
==
true
-
if
split_button
==
true
%span
.btn-group
{
class:
btn_class
}
%span
.btn-group
{
class:
btn_class
}
=
link_to
archive_namespace_project_repository_path
(
@project
.
namespace
,
@project
,
ref:
ref
,
format:
'zip'
),
class:
'btn col-xs-10'
,
rel:
'nofollow'
do
=
link_to
archive_namespace_project_repository_path
(
@project
.
namespace
,
@project
,
ref:
ref
,
format:
'zip'
),
class:
'btn
btn-success
col-xs-10'
,
rel:
'nofollow'
do
%i
.fa.fa-download
%i
.fa.fa-download
%span
Download zip
%span
Download zip
%a
.col-xs-2.btn.dropdown-toggle
{
'data-toggle'
=>
'dropdown'
}
%a
.col-xs-2.btn.
btn-success.
dropdown-toggle
{
'data-toggle'
=>
'dropdown'
}
%span
.caret
%span
.caret
%span
.sr-only
%span
.sr-only
Select Archive Format
Select Archive Format
...
...
app/views/projects/tree/_readme.html.haml
View file @
c9c53846
%article
.readme-holder
#README
%article
.file-holder.readme-holder
#README
.file-title
=
link_to
'#README'
do
=
link_to
'#README'
do
%h4
.readme-file-title
%strong
%i
.fa.fa-file
%i
.fa.fa-file
=
readme
.
name
=
readme
.
name
.wiki
.
file-content.
wiki
=
render_readme
(
readme
)
=
render_readme
(
readme
)
app/views/projects/tree/_tree.html.haml
View file @
c9c53846
%ul
.breadcrumb.repo-breadcrumb
.gray-content-block
%ul
.breadcrumb.repo-breadcrumb
%li
%li
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@ref
)
do
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@ref
)
do
=
@project
.
path
=
@project
.
path
...
@@ -11,7 +12,7 @@
...
@@ -11,7 +12,7 @@
-
if
allowed_tree_edit?
-
if
allowed_tree_edit?
%li
%li
%span
.dropdown
%span
.dropdown
%a
.dropdown-toggle.btn.btn-xs
.add-to-tree
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%a
.dropdown-toggle.btn
.add-to-tree
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
=
icon
(
'plus'
)
=
icon
(
'plus'
)
%ul
.dropdown-menu
%ul
.dropdown-menu
%li
%li
...
@@ -28,8 +29,9 @@
...
@@ -28,8 +29,9 @@
=
icon
(
'folder fw'
)
=
icon
(
'folder fw'
)
New directory
New directory
%div
#tree-content-holder
.tree-content-holder.prepend-top-20
%div
#tree-content-holder
.tree-content-holder
%table
#tree-slider
{
class:
"table_#{@hex_path} tree-table"
}
.tree-table-holder
%table
.table
#tree-slider
{
class:
"table_#{@hex_path} tree-table table-striped"
}
%thead
%thead
%tr
%tr
%th
Name
%th
Name
...
...
spec/javascripts/fixtures/line_highlighter.html.haml
View file @
c9c53846
#
tree
-content-holder
#
blob
-content-holder
.file-content
.file-content
.line-numbers
.line-numbers
-
1
.
upto
(
25
)
do
|
i
|
-
1
.
upto
(
25
)
do
|
i
|
...
...
spec/javascripts/line_highlighter_spec.js.coffee
View file @
c9c53846
...
@@ -39,7 +39,7 @@ describe 'LineHighlighter', ->
...
@@ -39,7 +39,7 @@ describe 'LineHighlighter', ->
expect
(
spy
).
toHaveBeenPrevented
()
expect
(
spy
).
toHaveBeenPrevented
()
it
'handles garbage input from the hash'
,
->
it
'handles garbage input from the hash'
,
->
func
=
->
new
LineHighlighter
(
'#
tree
-content-holder'
)
func
=
->
new
LineHighlighter
(
'#
blob
-content-holder'
)
expect
(
func
).
not
.
toThrow
()
expect
(
func
).
not
.
toThrow
()
describe
'#clickHandler'
,
->
describe
'#clickHandler'
,
->
...
...
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