BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 3bfd5314 by Dmitriy Zaporozhets
Options

Replace bs-callout with alert

parent 3cf4359b
Showing with 14 additions and 60 deletions
app/assets/stylesheets/gl_bootstrap.scss
......@@ -161,52 +161,6 @@ $brand-danger: $bg_danger;
font-size: 12px;
}
/*
* Callouts from Bootstrap3 docs
*
* Not quite alerts, but custom and helpful notes for folks reading the docs.
* Requires a base and modifier class.
*/
/* Common styles for all types */
.bs-callout {
margin: 20px 0;
padding: 20px;
border-left: 3px solid #eee;
color: #666;
background: #f9f9f9;
}
.bs-callout h4 {
margin-top: 0;
margin-bottom: 5px;
}
.bs-callout p:last-child {
margin-bottom: 0;
}
/* Variations */
.bs-callout-danger {
background-color: #fdf7f7;
border-color: #eed3d7;
color: #b94a48;
}
.bs-callout-warning {
background-color: #faf8f0;
border-color: #faebcc;
color: #8a6d3b;
}
.bs-callout-info {
background-color: #f4f8fa;
border-color: #bce8f1;
color: #34789a;
}
.bs-callout-success {
background-color: #dff0d8;
border-color: #5cA64d;
color: #3c763d;
}
/**
* fix to keep tooltips position in top navigation bar
*
......
app/views/admin/groups/_form.html.haml
......@@ -14,7 +14,7 @@
.form-group
.col-sm-2
.col-sm-10
.bs-callout.bs-callout-info
.alert.alert-info
= render 'shared/group_tips'
.form-actions
= f.submit 'Create group', class: "btn btn-create"
......
app/views/admin/services/_form.html.haml
......@@ -10,7 +10,7 @@
- @service.errors.full_messages.each do |msg|
%p= msg
- if @service.help.present?
.bs-callout
.alert.alert-info
= preserve do
= markdown @service.help
......
app/views/profiles/show.html.haml
......@@ -89,7 +89,7 @@
= link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-avatar"
- if @user.public_profile?
.bs-callout.bs-callout-info
.alert.alert-info
%h4 Public profile
%p Your profile is publicly visible because you joined public project(s)
......
app/views/projects/blob/_blob.html.haml
......@@ -15,7 +15,7 @@
- else
= link_to title, '#'
%ul.blob-commit-info.bs-callout.bs-callout-info.hidden-xs
%ul.blob-commit-info.alert.alert-info.hidden-xs
- blob_commit = @repository.last_commit_for_path(@commit.id, blob.path)
= render blob_commit, project: @project
......
app/views/projects/diffs/_warning.html.haml
.bs-callout.bs-callout-warning
.alert.alert-warning
%h4
Too many changes.
.pull-right
......
app/views/projects/imports/new.html.haml
......@@ -12,7 +12,7 @@
%span Import existing git repo
.col-sm-10
= f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
.bs-callout.bs-callout-info
.alert.alert-info
This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
%br
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
......
app/views/projects/labels/_form.html.haml
......@@ -2,7 +2,7 @@
-if @label.errors.any?
.row
.col-sm-10.col-sm-offset-2
.bs-callout.bs-callout-danger
.alert.alert-danger
- @label.errors.full_messages.each do |msg|
%span= msg
%br
......
app/views/projects/merge_requests/_new_submit.html.haml
......@@ -99,11 +99,11 @@
- if @diffs.present?
= render "projects/diffs/diffs", diffs: @diffs, project: @project
- elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
.bs-callout.bs-callout-danger
.alert.alert-danger
%h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits.
%p To preserve performance the line changes are not shown.
- else
.bs-callout.bs-callout-danger
.alert.alert-danger
%h4 This comparison includes a huge diff.
%p To preserve performance the line changes are not shown.
......
app/views/projects/merge_requests/show/_diffs.html.haml
......@@ -3,7 +3,7 @@
- elsif @merge_request_diff.empty?
.nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
- else
.bs-callout.bs-callout-warning
.alert.alert-warning
%h4
Changes view for this comparison is extremely large.
%p
......
app/views/projects/new.html.haml
......@@ -34,7 +34,7 @@
%span Import existing git repo
.col-sm-10
= f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
.bs-callout.bs-callout-info
.alert.alert-info
This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
%br
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
......
app/views/projects/protected_branches/index.html.haml
......@@ -2,7 +2,7 @@
%p.light Keep stable branches secure and force developers to use Merge Requests
%hr
.bs-callout.bs-callout-info
.alert.alert-info
%p Protected branches are designed to
%ul
%li prevent pushes from everybody except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"}
......
app/views/projects/services/_form.html.haml
......@@ -18,7 +18,7 @@
%li= msg
- if @service.help.present?
.bs-callout
.alert.alert-info
= preserve do
= markdown @service.help
......
app/views/shared/_group_form.html.haml
......@@ -15,7 +15,7 @@
= f.text_field :path, placeholder: 'open-source', class: 'form-control',
autofocus: local_assigns[:autofocus] || false
- if @group.persisted?
.bs-callout.bs-callout-danger
.alert.alert-danger
%ul
%li Changing group path can have unintended side effects.
%li Renaming group path will rename directory for all related projects
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment