diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index e5bb5e21bb067bcd62bcaa3c70b52d357521f4c2..2f9f09b4c6f4340daabbd558e46b24f3462fe78c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -39,7 +39,7 @@ * Page specific styles (issues, projects etc): */ -@import "sections/*"; +@import "pages/*"; /** * Code highlight diff --git a/app/assets/stylesheets/gl_variables.scss b/app/assets/stylesheets/gl_variables.scss index 4f54551a22ca2abda0c83195f4ca1ca4a810f861..090eff7f29b3438a17a4e2f2f3d5f5acd8e8f127 100644 --- a/app/assets/stylesheets/gl_variables.scss +++ b/app/assets/stylesheets/gl_variables.scss @@ -444,21 +444,21 @@ $font-size-base: $gl-font-size; // //## -// $pagination-color: $link-color -// $pagination-bg: #fff -// $pagination-border: #ddd +$pagination-color: #fff; +$pagination-bg: $brand-success; +$pagination-border: transparent; -// $pagination-hover-color: $link-hover-color -// $pagination-hover-bg: $gray-lighter -// $pagination-hover-border: #ddd +$pagination-hover-color: #fff; +$pagination-hover-bg: darken($brand-success, 15%); +$pagination-hover-border: transparent; -// $pagination-active-color: #fff -// $pagination-active-bg: $brand-primary -// $pagination-active-border: $brand-primary +$pagination-active-color: #fff; +$pagination-active-bg: darken($brand-success, 15%); +$pagination-active-border: transparent; -// $pagination-disabled-color: $gray-light -// $pagination-disabled-bg: #fff -// $pagination-disabled-border: #ddd +$pagination-disabled-color: #b4bcc2; +$pagination-disabled-bg: lighten($brand-success, 15%); +$pagination-disabled-border: transparent; //== Pager @@ -492,21 +492,22 @@ $font-size-base: $gl-font-size; // //## Define colors for form feedback states and, by default, alerts. -// $state-success-text: #3c763d -// $state-success-bg: #dff0d8 -// $state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) -// $state-info-text: #31708f -// $state-info-bg: #d9edf7 -// $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) +$state-success-text: #fff; +$state-success-bg: $brand-success; +$state-success-border: $brand-success; -// $state-warning-text: #8a6d3b -// $state-warning-bg: #fcf8e3 -// $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) +$state-info-text: #fff; +$state-info-bg: $brand-info; +$state-info-border: $brand-info; -// $state-danger-text: #a94442 -// $state-danger-bg: #f2dede -// $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) +$state-warning-text: #fff; +$state-warning-bg: $brand-warning; +$state-warning-border: $brand-warning; + +$state-danger-text: #fff; +$state-danger-bg: $brand-danger; +$state-danger-border: $brand-danger; //== Tooltips diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss index d751678f1b3f79bc590b36d4764f99defa410ab1..30e084ecd6252c56fb1810c1764ccaf6d9f6b60f 100644 --- a/app/assets/stylesheets/main/variables.scss +++ b/app/assets/stylesheets/main/variables.scss @@ -19,6 +19,11 @@ $gl-primary: #446e9b; $gl-info: #029ACF; $gl-warning: #EB9532; +$gl-primary: #2C3E50; +$gl-success: #18BC9C; +$gl-info: #3498DB; +$gl-warning: #F39C12; +$gl-danger: #E74C3C; /* * Commit Diff Colors */ diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 3a912d234fa1b9f16839d695d5ada4a036bafed7..98ce4150ff22931586e37dfe24617e41a640f196 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -101,23 +101,9 @@ .btn, .form-control { - border: 1px solid #E1E1E1; - box-shadow: none; padding: 6px 9px; } - .btn { - background: none; - color: $gl-link-color; - - &.active { - background-color: #f5f5f5; - border: 1px solid rgba(0,0,0,0.195); - color: #333; - font-weight: bold; - } - } - .form-control { cursor: auto; @extend .monospace; diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 5daf8470d8853531909b422e731c4235f76c6d5c..00b912742b287858ff6eb017c9539709bb1f3e59 100644 --- a/app/views/projects/new.html.haml +++ b/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' - .alert.alert-info + .alert.alert-info.prepend-top-10 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. @@ -65,7 +65,7 @@ %i.fa.fa-bitbucket Import projects from Bitbucket = render 'bitbucket_import_modal' - + - unless request.host == 'gitlab.com' .project-import.form-group .col-sm-2 diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 787cfd9304fa853d4ca289640edd441841e18e6f..74b07395650e9e3654c527b234fe78311d186776 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -40,7 +40,7 @@ %p Repository is read-only - if @project.forked_from_project - .alert.alert-success + .well %i.fa.fa-code-fork.project-fork-icon Forked from: %br diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml index 1a2946baccb75a04d9e02d378238aa340feafa79..089179e677aee39c0b6d91b7859d8e4a9afb149b 100644 --- a/app/views/shared/_no_ssh.html.haml +++ b/app/views/shared/_no_ssh.html.haml @@ -1,8 +1,8 @@ - if cookies[:hide_no_ssh_message].blank? && !current_user.hide_no_ssh_key && current_user.require_ssh_key? .no-ssh-key-message.alert.alert-warning.hidden-xs - 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 + 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, class: 'alert-link'} to your profile .pull-right - = link_to "Don't show again", profile_path(user: {hide_no_ssh_key: true}), method: :put + = link_to "Don't show again", profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link' | - = link_to 'Remind later', '#', class: 'hide-no-ssh-message' + = link_to 'Remind later', '#', class: 'hide-no-ssh-message alert-link'