diff options
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/_home_panel.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/clusters/_gcp_signup_offer_banner.html.haml | 14 | ||||
-rw-r--r-- | app/views/projects/deploy_tokens/_form.html.haml | 16 | ||||
-rw-r--r-- | app/views/projects/imports/new.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/pages/_destroy.haml | 4 |
5 files changed, 22 insertions, 19 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 89940512bc6..74ab8cf8250 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -12,6 +12,9 @@ .project-home-desc - if @project.description.present? = markdown_field(@project, :description) + - if can?(current_user, :read_project, @project) + .text-secondary.prepend-top-8 + = s_('ProjectPage|Project ID: %{project_id}') % { project_id: @project.id } - if @project.forked? %p diff --git a/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml b/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml index 9298d93663d..73b11d509d3 100644 --- a/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml +++ b/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml @@ -1,12 +1,12 @@ - link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer') -.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default{ role: 'alert' } +.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default{ role: 'alert' } %button.close{ type: "button", data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } } × - %div - .col-sm-2.gcp-logo - = image_tag 'illustrations/logos/google-cloud-platform_logo.svg' - .col-sm-10 - %h4= s_('ClusterIntegration|Redeem up to $500 in free credit for Google Cloud Platform') + .gcp-signup-offer--content + .gcp-signup-offer--icon.append-right-8 + = sprite_icon("information", size: 16) + .gcp-signup-offer--copy + %h4= s_('ClusterIntegration|Did you know?') %p= s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link } - %a.btn.btn-info{ href: 'https://goo.gl/AaJzRW', target: '_blank', rel: 'noopener noreferrer' } + %a.btn.btn-default{ href: 'https://goo.gl/AaJzRW', target: '_blank', rel: 'noopener noreferrer' } Apply for credit diff --git a/app/views/projects/deploy_tokens/_form.html.haml b/app/views/projects/deploy_tokens/_form.html.haml index f8db30df7b4..329b9e7e562 100644 --- a/app/views/projects/deploy_tokens/_form.html.haml +++ b/app/views/projects/deploy_tokens/_form.html.haml @@ -14,16 +14,16 @@ .form-group = f.label :scopes, class: 'label-light' - %fieldset - = f.check_box :read_repository - = label_tag ("deploy_token_read_repository"), 'read_repository' - %span= s_('DeployTokens|Allows read-only access to the repository') + %fieldset.form-group.form-check + = f.check_box :read_repository, class: 'form-check-input' + = label_tag ("deploy_token_read_repository"), 'read_repository', class: 'label-light form-check-label' + .text-secondary= s_('DeployTokens|Allows read-only access to the repository') - if container_registry_enabled?(project) - %fieldset - = f.check_box :read_registry - = label_tag ("deploy_token_read_registry"), 'read_registry' - %span= s_('DeployTokens|Allows read-only access to the registry images') + %fieldset.form-group.form-check + = f.check_box :read_registry, class: 'form-check-input' + = label_tag ("deploy_token_read_registry"), 'read_registry', class: 'label-light form-check-label' + .text-secondary= s_('DeployTokens|Allows read-only access to the registry images') .prepend-top-default = f.submit s_('DeployTokens|Create deploy token'), class: 'btn btn-success' diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml index ca82054d799..8ce822c43b7 100644 --- a/app/views/projects/imports/new.html.haml +++ b/app/views/projects/imports/new.html.haml @@ -5,8 +5,8 @@ %hr - if @project.import_failed? - .card.bg-danger - .card-header The repository could not be imported. + .card.border-danger + .card-header.bg-danger.text-white The repository could not be imported. .card-body %pre :preserve diff --git a/app/views/projects/pages/_destroy.haml b/app/views/projects/pages/_destroy.haml index 9b77c4e3494..ae8c801b705 100644 --- a/app/views/projects/pages/_destroy.haml +++ b/app/views/projects/pages/_destroy.haml @@ -1,7 +1,7 @@ - if @project.pages_deployed? - if can?(current_user, :remove_pages, @project) - .card.bg-danger - .card-header Remove pages + .card.border-danger + .card-header.bg-danger.text-white Remove pages .errors-holder .card-body %p |