BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6cbadc95
Unverified
Commit
6cbadc95
authored
Dec 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
css class .hide has \!important so use gl-hide instead
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
5c3e0f61
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
44 additions
and
41 deletions
+44
-41
common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+4
-0
index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+2
-2
_activities.html.haml
app/views/dashboard/_activities.html.haml
+1
-1
show.html.haml
app/views/groups/show.html.haml
+1
-1
_shortcuts.html.haml
app/views/help/_shortcuts.html.haml
+1
-1
_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+1
-1
_public_head_panel.html.haml
app/views/layouts/_public_head_panel.html.haml
+1
-1
_search.html.haml
app/views/layouts/_search.html.haml
+1
-1
show.html.haml
app/views/profiles/accounts/show.html.haml
+1
-1
show.html.haml
app/views/profiles/notifications/show.html.haml
+1
-1
_remove.html.haml
app/views/projects/blob/_remove.html.haml
+1
-1
_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
_image.html.haml
app/views/projects/commits/_image.html.haml
+6
-7
create.js.haml
app/views/projects/create.js.haml
+1
-1
edit.html.haml
app/views/projects/edit.html.haml
+2
-2
show.html.haml
app/views/projects/graphs/show.html.haml
+2
-2
_issues.html.haml
app/views/projects/issues/_issues.html.haml
+1
-1
update.js.haml
app/views/projects/issues/update.js.haml
+1
-1
_commits.html.haml
app/views/projects/merge_requests/show/_commits.html.haml
+1
-1
_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+2
-2
_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
new.html.haml
app/views/projects/new.html.haml
+2
-2
_discussion.html.haml
app/views/projects/notes/_discussion.html.haml
+2
-2
show.html.haml
app/views/projects/show.html.haml
+1
-1
_blob_item.html.haml
app/views/projects/tree/_blob_item.html.haml
+1
-1
_tree_item.html.haml
app/views/projects/tree/_tree_item.html.haml
+1
-1
update.js.haml
app/views/projects/update.js.haml
+1
-1
_new.html.haml
app/views/projects/wikis/_new.html.haml
+1
-1
_no_ssh.html.haml
app/views/shared/_no_ssh.html.haml
+1
-1
_users_group.html.haml
app/views/users_groups/_users_group.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @
6cbadc95
...
...
@@ -131,3 +131,7 @@ pre.well-pre {
.dropdown-menu
>
li
>
a
:focus
{
background
:
#29b
;
}
.gl-hide
{
display
:
none
;
}
app/views/admin/broadcast_messages/index.html.haml
View file @
6cbadc95
...
...
@@ -18,12 +18,12 @@
%div
=
link_to
'#'
,
class:
'js-toggle-colors-link'
do
Customize colors
.control-group.js-toggle-colors-container.hide
.control-group.js-toggle-colors-container.
gl-
hide
=
f
.
label
:color
,
"Background Color"
.controls
=
f
.
text_field
:color
,
placeholder:
"#AA33EE"
.light
Hex values as 3 double digit numbers, starting with a # sign.
.control-group.js-toggle-colors-container.hide
.control-group.js-toggle-colors-container.
gl-
hide
=
f
.
label
:font
,
"Font Color"
.controls
=
f
.
text_field
:font
,
placeholder:
"#224466"
...
...
app/views/dashboard/_activities.html.haml
View file @
6cbadc95
...
...
@@ -5,4 +5,4 @@
.content_list
-
else
%p
.nothing_here_message
Projects activity will be displayed here
.loading.hide
.loading.
gl-
hide
app/views/groups/show.html.haml
View file @
6cbadc95
...
...
@@ -11,7 +11,7 @@
.content_list
-
else
%p
.nothing_here_message
Project activity will be displayed here
.loading.hide
.loading.
gl-
hide
.side.col-md-4
-
if
@group
.
description
.
present?
.description-block
...
...
app/views/help/_shortcuts.html.haml
View file @
6cbadc95
#modal-shortcuts
.modal.hide
#modal-shortcuts
.modal.
gl-
hide
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
Keyboard Shortcuts
...
...
app/views/layouts/_head_panel.html.haml
View file @
6cbadc95
...
...
@@ -10,7 +10,7 @@
%ul
.nav.navbar-nav
%li
%a
%div
.hide.turbolink-spinner
%div
.
gl-
hide.turbolink-spinner
%i
.icon-refresh.icon-spin
Loading...
%li
...
...
app/views/layouts/_public_head_panel.html.haml
View file @
6cbadc95
...
...
@@ -15,7 +15,7 @@
%ul
.nav
%li
%a
%div
.hide.turbolink-spinner
%div
.
gl-
hide.turbolink-spinner
%i
.icon-refresh.icon-spin
Loading...
%li
...
...
app/views/layouts/_search.html.haml
View file @
6cbadc95
...
...
@@ -7,4 +7,4 @@
=
hidden_field_tag
:search_code
,
true
=
hidden_field_tag
:repository_ref
,
@ref
=
submit_tag
'Go'
if
ENV
[
'RAILS_ENV'
]
==
'test'
.search-autocomplete-json.hide
{
:'data-autocomplete-opts'
=>
search_autocomplete_source
}
.search-autocomplete-json.
gl-
hide
{
:'data-autocomplete-opts'
=>
search_autocomplete_source
}
app/views/profiles/accounts/show.html.haml
View file @
6cbadc95
...
...
@@ -49,7 +49,7 @@
%div
=
f
.
text_field
:username
,
required:
true
,
class:
'input-xlarge input-xpadding'
%span
.loading-gif.hide
=
image_tag
"ajax_loader.gif"
%span
.loading-gif.
gl-
hide
=
image_tag
"ajax_loader.gif"
%p
.light
=
user_url
(
@user
)
%div
...
...
app/views/profiles/notifications/show.html.haml
View file @
6cbadc95
...
...
@@ -43,7 +43,7 @@
%span
.btn.btn-tiny
%i
.icon-chevron-down
%span
Advanced notifications settings
.js-toggle-visibility-container.hide
.js-toggle-visibility-container.
gl-
hide
%hr
%h4
Groups:
%ul
.bordered-list
...
...
app/views/projects/blob/_remove.html.haml
View file @
6cbadc95
%div
#modal-remove-blob
.modal.hide
%div
#modal-remove-blob
.modal.
gl-
hide
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
Remove
#{
@blob
.
name
}
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
6cbadc95
...
...
@@ -47,7 +47,7 @@
-
if
@branches
.
any?
and in
=
link_to
(
"
#{
pluralize
(
@branches
.
count
,
"other branch"
)
}
"
,
"#"
,
class:
"js-details-expand"
)
%span
.js-details-contain.hide
%span
.js-details-contain.
gl-
hide
=
commit_branches_links
(
@project
,
@branches
)
.commit-box
...
...
app/views/projects/commits/_image.html.haml
View file @
6cbadc95
...
...
@@ -11,7 +11,7 @@
.frame.deleted
%a
{
href:
project_blob_path
(
@project
,
tree_join
(
@commit
.
parent_id
,
diff
.
old_path
))}
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
%p
.image-info.hide
%p
.image-info.
gl-
hide
%span
.meta-filesize
=
"
#{
number_to_human_size
old_file
.
size
}
"
|
%b
W:
...
...
@@ -23,7 +23,7 @@
.frame.added
%a
{
href:
project_blob_path
(
@project
,
tree_join
(
@commit
.
id
,
diff
.
new_path
))}
%img
{
src:
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
%p
.image-info.hide
%p
.image-info.
gl-
hide
%span
.meta-filesize
=
"
#{
number_to_human_size
file
.
size
}
"
|
%b
W:
...
...
@@ -32,7 +32,7 @@
%b
H:
%span
.meta-height
%div
.swipe.view.hide
%div
.swipe.view.
gl-
hide
.swipe-frame
.frame.deleted
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
...
...
@@ -43,7 +43,7 @@
%span
.top-handle
%span
.bottom-handle
%div
.onion-skin.view.hide
%div
.onion-skin.view.
gl-
hide
.onion-skin-frame
.frame.deleted
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
...
...
@@ -56,8 +56,8 @@
.opaque
.view-modes.hide
.view-modes.
gl-
hide
%ul
.view-modes-menu
%li
.two-up
{
data:
{
mode:
'two-up'
}}
2-up
%li
.swipe
{
data:
{
mode:
'swipe'
}}
Swipe
%li
.onion-skin
{
data:
{
mode:
'onion-skin'
}}
Onion skin
\ No newline at end of file
%li
.onion-skin
{
data:
{
mode:
'onion-skin'
}}
Onion skin
app/views/projects/create.js.haml
View file @
6cbadc95
...
...
@@ -5,5 +5,5 @@
:plain
$(".project-edit-errors").html("
#{
escape_javascript
(
render
(
'errors'
))
}
");
$('.project-submit').enable();
$('.save-project-loader').hide();
$('.save-project-loader').
gl-
hide();
$('.project-edit-container').show();
app/views/projects/edit.html.haml
View file @
6cbadc95
...
...
@@ -97,7 +97,7 @@
Show it to me
%i
.icon-chevron-down
.js-toggle-visibility-container.hide
.js-toggle-visibility-container.
gl-
hide
-
if
can?
current_user
,
:archive_project
,
@project
.ui-box.ui-box-danger
.title
...
...
@@ -182,7 +182,7 @@
-
else
%p
.nothing_here_message
Only project owner can remove a project
.save-project-loader.hide
.save-project-loader.
gl-
hide
%center
=
image_tag
"ajax_loader.gif"
%h3
Saving project.
...
...
app/views/projects/graphs/show.html.haml
View file @
6cbadc95
...
...
@@ -21,14 +21,14 @@
%ol
.contributors-list.clearfix
:javascript
$
(
".stat-graph"
).
hide
();
$
(
".stat-graph"
).
gl
-
hide
();
$
.
ajax
({
type
:
"GET"
,
url
:
location
.
href
,
complete
:
function
()
{
$
(
".stat-graph"
).
fadeIn
();
$
(
".loading-graph"
).
hide
();
$
(
".loading-graph"
).
gl
-
hide
();
},
dataType
:
"script"
});
app/views/projects/issues/_issues.html.haml
View file @
6cbadc95
...
...
@@ -2,7 +2,7 @@
.title
=
check_box_tag
"check_all_issues"
,
nil
,
false
,
class:
"check_all_issues left"
.clearfix
.issues_bulk_update.hide
.issues_bulk_update.
gl-
hide
=
form_tag
bulk_update_project_issues_path
(
@project
),
method: :post
do
%span
Update selected issues with
=
select_tag
(
'update[status]'
,
options_for_select
([
'open'
,
'closed'
]),
prompt:
"Status"
)
...
...
app/views/projects/issues/update.js.haml
View file @
6cbadc95
...
...
@@ -6,7 +6,7 @@
$('.issue-box .context').html("
#{
escape_javascript
(
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
})
}
");
$('.issue-box .context').effect('highlight');
$('.chosen').chosen();
$('.edit-issue.inline-update input[type="submit"]').hide();
$('.edit-issue.inline-update input[type="submit"]').
gl-
hide();
-
if
@issue
.
milestone
$('.milestone-nav-link').replaceWith("
#{
escape_javascript
(
link_to
"| #{@issue.milestone.title}"
,
project_milestone_path
(
@issue
.
project
,
@issue
.
milestone
),
:class
=>
'milestone-nav-link'
)
}
")
-
else
...
...
app/views/projects/merge_requests/show/_commits.html.haml
View file @
6cbadc95
...
...
@@ -12,7 +12,7 @@
8 of
#{
@commits
.
count
}
commits displayed.
%strong
%a
.show-all-commits
Click here to show all
%ul
.all-commits.hide.well-list
%ul
.all-commits.
gl-
hide.well-list
-
@commits
.
each
do
|
commit
|
=
render
"projects/commits/commit"
,
commit:
commit
,
project:
@merge_request
.
source_project
...
...
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
6cbadc95
%div
#modal_merge_info
.modal.hide
%div
#modal_merge_info
.modal.
gl-
hide
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
How to merge
...
...
@@ -46,6 +46,6 @@
modal
.
show
();
});
$
(
'.modal-header .close'
).
bind
(
"click"
,
function
(){
modal
.
hide
();
modal
.
gl
-
hide
();
})
})
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
6cbadc95
...
...
@@ -46,7 +46,7 @@
.alert.alert-info
%strong
This merge request already can not be merged. Try to reload page.
.merge-in-progress.hide
.merge-in-progress.
gl-
hide
%span
.cgray
%i
.icon-refresh.icon-spin
...
...
app/views/projects/new.html.haml
View file @
6cbadc95
...
...
@@ -13,7 +13,7 @@
=
link_to
"#"
,
class:
'js-toggle-visibility-link'
do
%span
Customize repository name?
.control-group.js-toggle-visibility-container.hide
.control-group.js-toggle-visibility-container.
gl-
hide
=
f
.
label
:path
do
%span
Repository name
.controls
...
...
@@ -59,7 +59,7 @@
=
link_to
new_group_path
,
class:
"btn btn-tiny"
do
Create a group
.save-project-loader.hide
.save-project-loader.
gl-
hide
%center
=
image_tag
"ajax_loader.gif"
%h3
Creating project
&
repository.
...
...
app/views/projects/notes/_discussion.html.haml
View file @
6cbadc95
...
...
@@ -40,7 +40,7 @@
.file
=
render
"projects/notes/discussion_diff"
,
discussion_notes:
discussion_notes
,
note:
note
-
else
=
link_to
'show outdated discussion'
,
'#'
,
class:
'js-show-outdated-discussion'
%div
.hide.outdated-discussion
%div
.
gl-
hide.outdated-discussion
.content
.notes
{
rel:
discussion_notes
.
first
.
discussion_id
}
=
render
discussion_notes
...
...
@@ -53,7 +53,7 @@
=
render
"projects/notes/discussion_reply_button"
,
note:
discussion_notes
.
first
-# will be shown when the other one is hidden
.discussion-hidden.content.hide
.discussion-hidden.content.
gl-
hide
.note
%em
Hidden discussion.
=
link_to
"javascript:;"
,
class:
"js-details-target js-toggler-target"
do
...
...
app/views/projects/show.html.haml
View file @
6cbadc95
...
...
@@ -5,7 +5,7 @@
=
render
"events/event_last_push"
,
event:
@last_push
=
render
'shared/event_filter'
.content_list
.loading.hide
.loading.
gl-
hide
.col-md-3.project-side
.clearfix
-
if
@project
.
archived?
...
...
app/views/projects/tree/_blob_item.html.haml
View file @
6cbadc95
...
...
@@ -3,7 +3,7 @@
=
tree_icon
(
type
)
%span
=
link_to
truncate
(
blob_item
.
name
,
length:
40
),
project_blob_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
blob_item
.
name
))
%td
.tree_time_ago.cgray
%span
.log_loading.hide
%span
.log_loading.
gl-
hide
Loading commit data...
=
image_tag
"ajax_loader_tree.gif"
,
width:
14
%td
.tree_commit
{
colspan:
2
}
app/views/projects/tree/_tree_item.html.haml
View file @
6cbadc95
...
...
@@ -3,7 +3,7 @@
=
tree_icon
(
type
)
%span
=
link_to
truncate
(
tree_item
.
name
,
length:
40
),
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
tree_item
.
name
))
%td
.tree_time_ago.cgray
%span
.log_loading.hide
%span
.log_loading.
gl-
hide
Loading commit data...
=
image_tag
"ajax_loader_tree.gif"
,
width:
14
%td
.tree_commit
{
colspan:
2
}
app/views/projects/update.js.haml
View file @
6cbadc95
...
...
@@ -4,6 +4,6 @@
-
else
:plain
$(".project-edit-errors").html("
#{
escape_javascript
(
render
(
'errors'
))
}
");
$('.save-project-loader').hide();
$('.save-project-loader').
gl-
hide();
$('.project-edit-container').show();
$('.project-edit-content .btn-save').enableButton();
app/views/projects/wikis/_new.html.haml
View file @
6cbadc95
%div
#modal-new-wiki
.modal.hide
%div
#modal-new-wiki
.modal.
gl-
hide
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
New Wiki Page
...
...
app/views/shared/_no_ssh.html.haml
View file @
6cbadc95
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
current_user
.
require_ssh_key?
&&
!
current_user
.
hide_no_ssh_key
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
current_user
.
require_ssh_key?
&&
!
current_user
.
gl
-
hide_no_ssh_key
.no-ssh-key-message
.container
You won't be able to pull or push project code via SSH until you
#{
link_to
'add an SSH key'
,
new_profile_key_path
}
to your profile
...
...
app/views/users_groups/_users_group.html.haml
View file @
6cbadc95
...
...
@@ -16,7 +16,7 @@
=
link_to
group_users_group_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-tiny btn btn-remove"
,
title:
'Remove user from group'
do
%i
.icon-minus.icon-white
.edit-member.hide.js-toggle-content
.edit-member.
gl-
hide.js-toggle-content
=
form_for
[
@group
,
member
],
remote:
true
do
|
f
|
.alert.prepend-top-20
=
f
.
select
:group_access
,
options_for_select
(
UsersGroup
.
group_access_roles
,
member
.
group_access
)
...
...
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