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
Jérome Perrin
gitlab-ce
Commits
3238b0bc
Commit
3238b0bc
authored
Jan 13, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace nav-tabs with nav-links
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
cf1a62e2
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
13 additions
and
79 deletions
+13
-79
app/assets/javascripts/merge_request_tabs.js.coffee
app/assets/javascripts/merge_request_tabs.js.coffee
+1
-1
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+0
-17
app/assets/stylesheets/framework/mobile.scss
app/assets/stylesheets/framework/mobile.scss
+1
-1
app/assets/stylesheets/framework/tw_bootstrap.scss
app/assets/stylesheets/framework/tw_bootstrap.scss
+0
-31
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-22
app/views/admin/logs/show.html.haml
app/views/admin/logs/show.html.haml
+3
-2
app/views/admin/users/_head.html.haml
app/views/admin/users/_head.html.haml
+2
-1
app/views/devise/shared/_signin_box.html.haml
app/views/devise/shared/_signin_box.html.haml
+1
-1
app/views/search/_category.html.haml
app/views/search/_category.html.haml
+1
-1
app/views/search/_results.html.haml
app/views/search/_results.html.haml
+1
-1
app/views/search/show.html.haml
app/views/search/show.html.haml
+3
-1
No files found.
app/assets/javascripts/merge_request_tabs.js.coffee
View file @
3238b0bc
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#
#
# ### Example Markup
# ### Example Markup
#
#
# <ul class="nav
nav-tab
s merge-request-tabs">
# <ul class="nav
-link
s merge-request-tabs">
# <li class="notes-tab active">
# <li class="notes-tab active">
# <a data-action="notes" data-target="#notes" data-toggle="tab" href="/foo/bar/merge_requests/1">
# <a data-action="notes" data-target="#notes" data-toggle="tab" href="/foo/bar/merge_requests/1">
# Discussion
# Discussion
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
3238b0bc
...
@@ -78,23 +78,6 @@
...
@@ -78,23 +78,6 @@
box-shadow
:
none
;
box-shadow
:
none
;
}
}
.new_note
,
.edit_note
,
.detail-page-description
,
.milestone-description
,
.wiki-content
,
.merge-request-form
{
.nav-tabs
{
margin-bottom
:
0
;
border
:
none
;
li
a
,
li
.active
a
{
border
:
1px
solid
#DDD
;
}
}
}
.markdown-area
{
.markdown-area
{
@include
border-radius
(
0
);
@include
border-radius
(
0
);
background
:
#FFF
;
background
:
#FFF
;
...
...
app/assets/stylesheets/framework/mobile.scss
View file @
3238b0bc
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
padding-right
:
5px
;
padding-right
:
5px
;
}
}
.nav
.nav-tab
s
>
li
>
a
{
.nav
-link
s
>
li
>
a
{
padding
:
10px
;
padding
:
10px
;
font-size
:
12px
;
font-size
:
12px
;
margin-right
:
3px
;
margin-right
:
3px
;
...
...
app/assets/stylesheets/framework/tw_bootstrap.scss
View file @
3238b0bc
...
@@ -99,38 +99,7 @@
...
@@ -99,38 +99,7 @@
}
}
}
}
// Nav tabs
.nav.nav-tabs
{
margin-bottom
:
15px
;
li
{
>
a
{
margin-right
:
5px
;
line-height
:
20px
;
border-color
:
#EEE
;
color
:
#888
;
border-bottom
:
1px
solid
#ddd
;
.badge
{
background-color
:
#eee
;
color
:
#888
;
text-shadow
:
0
1px
1px
#fff
;
}
i
.fa
{
line-height
:
14px
;
}
}
&
.active
{
>
a
{
border-color
:
#CCC
;
border-bottom
:
1px
solid
#fff
;
color
:
#333
;
font-weight
:
bold
;
}
}
}
}
.nav-tabs
>
li
>
a
,
.nav-pills
>
li
>
a
{
.nav-pills
>
li
>
a
{
color
:
#666
;
color
:
#666
;
}
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
3238b0bc
...
@@ -352,28 +352,6 @@
...
@@ -352,28 +352,6 @@
color
:
#555
;
color
:
#555
;
}
}
ul
.nav.nav-projects-tabs
{
@extend
.nav-tabs
;
padding-left
:
8px
;
li
{
a
{
padding
:
6px
25px
;
margin-top
:
2px
;
border-color
:
#DDD
;
background-color
:
#EEE
;
text-shadow
:
0
1px
1px
white
;
color
:
#555
;
}
&
.active
{
a
{
font-weight
:
bold
;
}
}
}
}
.project_member_row
form
{
.project_member_row
form
{
margin
:
0px
;
margin
:
0px
;
}
}
...
...
app/views/admin/logs/show.html.haml
View file @
3238b0bc
-
page_title
"Logs"
-
page_title
"Logs"
-
loggers
=
[
Gitlab
::
GitLogger
,
Gitlab
::
AppLogger
,
-
loggers
=
[
Gitlab
::
GitLogger
,
Gitlab
::
AppLogger
,
Gitlab
::
ProductionLogger
,
Gitlab
::
SidekiqLogger
]
Gitlab
::
ProductionLogger
,
Gitlab
::
SidekiqLogger
]
%ul
.nav
.nav-tab
s.log-tabs
%ul
.nav
-link
s.log-tabs
-
loggers
.
each
do
|
klass
|
-
loggers
.
each
do
|
klass
|
%li
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
)
}
%li
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
)
}
=
link_to
klass
::
file_name
,
"#
#{
klass
::
file_name_noext
}
"
,
=
link_to
klass
::
file_name
,
"#
#{
klass
::
file_name_noext
}
"
,
'data-toggle'
=>
'tab'
'data-toggle'
=>
'tab'
%p
.light
To prevent performance issues admin logs output the last 2000 lines
.gray-content-block
To prevent performance issues admin logs output the last 2000 lines
.tab-content
.tab-content
-
loggers
.
each
do
|
klass
|
-
loggers
.
each
do
|
klass
|
.tab-pane
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
),
.tab-pane
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
),
...
...
app/views/admin/users/_head.html.haml
View file @
3238b0bc
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
Edit
Edit
%hr
%hr
%ul
.nav
.nav-tab
s
%ul
.nav
-link
s
=
nav_link
(
path:
'users#show'
)
do
=
nav_link
(
path:
'users#show'
)
do
=
link_to
"Account"
,
admin_user_path
(
@user
)
=
link_to
"Account"
,
admin_user_path
(
@user
)
=
nav_link
(
path:
'users#groups'
)
do
=
nav_link
(
path:
'users#groups'
)
do
...
@@ -23,3 +23,4 @@
...
@@ -23,3 +23,4 @@
=
link_to
"SSH keys"
,
keys_admin_user_path
(
@user
)
=
link_to
"SSH keys"
,
keys_admin_user_path
(
@user
)
=
nav_link
(
controller: :identities
)
do
=
nav_link
(
controller: :identities
)
do
=
link_to
"Identities"
,
admin_user_identities_path
(
@user
)
=
link_to
"Identities"
,
admin_user_identities_path
(
@user
)
.append-bottom-default
app/views/devise/shared/_signin_box.html.haml
View file @
3238b0bc
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
%h3
Sign in
%h3
Sign in
.login-body
.login-body
-
if
form_based_providers
.
any?
-
if
form_based_providers
.
any?
%ul
.nav
.nav-tab
s
%ul
.nav
-link
s
-
if
crowd_enabled?
-
if
crowd_enabled?
%li
.active
%li
.active
=
link_to
"Crowd"
,
"#tab-crowd"
,
'data-toggle'
=>
'tab'
=
link_to
"Crowd"
,
"#tab-crowd"
,
'data-toggle'
=>
'tab'
...
...
app/views/search/_category.html.haml
View file @
3238b0bc
%ul
.nav
.nav-tab
s.search-filter
%ul
.nav
-link
s.search-filter
-
if
@project
-
if
@project
%li
{
class:
(
"active"
if
@scope
==
'blobs'
)}
%li
{
class:
(
"active"
if
@scope
==
'blobs'
)}
=
link_to
search_filter_path
(
scope:
'blobs'
)
do
=
link_to
search_filter_path
(
scope:
'blobs'
)
do
...
...
app/views/search/_results.html.haml
View file @
3238b0bc
-
if
@search_results
.
empty?
-
if
@search_results
.
empty?
=
render
partial:
"search/results/empty"
=
render
partial:
"search/results/empty"
-
else
-
else
%p
.light
.gray-content-block
Search results for
Search results for
%code
%code
=
@search_term
=
@search_term
...
...
app/views/search/show.html.haml
View file @
3238b0bc
-
page_title
@search_term
-
page_title
@search_term
=
render
'search/form'
.prepend-top-default
=
render
'search/form'
-
if
@search_term
-
if
@search_term
=
render
'search/category'
=
render
'search/category'
=
render
'search/results'
=
render
'search/results'
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