Remove gray button style
This commit is contained in:
parent
f9fcd2b410
commit
0808f99da5
5 changed files with 12 additions and 17 deletions
|
@ -106,10 +106,6 @@
|
|||
@include btn-color($red-500, $red-600, $red-600, $red-700, $red-700, $red-800, $white-light);
|
||||
}
|
||||
|
||||
@mixin btn-gray {
|
||||
@include btn-color($gray-light, $border-gray-normal, $gray-normal, $border-gray-normal, $gray-dark, $border-gray-dark, $gl-text-color);
|
||||
}
|
||||
|
||||
@mixin btn-white {
|
||||
@include btn-color($white-light, $border-color, $white-normal, $border-white-normal, $white-dark, $border-gray-dark, $gl-text-color);
|
||||
}
|
||||
|
@ -183,10 +179,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
&.btn-gray {
|
||||
@include btn-gray;
|
||||
}
|
||||
|
||||
&.btn-info,
|
||||
&.btn-primary,
|
||||
&.btn-register {
|
||||
|
|
|
@ -205,7 +205,6 @@
|
|||
.project-repo-buttons,
|
||||
.group-buttons {
|
||||
.btn {
|
||||
@include btn-gray;
|
||||
padding: 3px 10px;
|
||||
|
||||
&:last-child {
|
||||
|
@ -294,7 +293,7 @@
|
|||
}
|
||||
|
||||
.count {
|
||||
@include btn-gray;
|
||||
@include btn-white;
|
||||
display: inline-block;
|
||||
background: $white-light;
|
||||
border-radius: 2px;
|
||||
|
|
|
@ -74,10 +74,10 @@
|
|||
= lorem
|
||||
|
||||
.cover-controls
|
||||
= link_to '#', class: 'btn btn-gray' do
|
||||
= link_to '#', class: 'btn btn-default' do
|
||||
= icon('pencil')
|
||||
|
||||
= link_to '#', class: 'btn btn-gray' do
|
||||
= link_to '#', class: 'btn btn-default' do
|
||||
= icon('rss')
|
||||
|
||||
%h2#lists Lists
|
||||
|
@ -206,7 +206,6 @@
|
|||
|
||||
.example
|
||||
%button.btn.btn-default{ :type => "button" } Default
|
||||
%button.btn.btn-gray{ :type => "button" } Gray
|
||||
%button.btn.btn-primary{ :type => "button" } Primary
|
||||
%button.btn.btn-success{ :type => "button" } Success
|
||||
%button.btn.btn-info{ :type => "button" } Info
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
.cover-block.user-cover-block.top-area
|
||||
.cover-controls
|
||||
- if @user == current_user
|
||||
= link_to profile_path, class: 'btn btn-gray has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do
|
||||
= link_to profile_path, class: 'btn btn-default has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do
|
||||
= icon('pencil')
|
||||
- elsif current_user
|
||||
- if @user.abuse_report
|
||||
|
@ -20,13 +20,13 @@
|
|||
data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } }
|
||||
= icon('exclamation-circle')
|
||||
- else
|
||||
= link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: 'btn btn-gray',
|
||||
= link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: 'btn',
|
||||
title: 'Report abuse', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
|
||||
= icon('exclamation-circle')
|
||||
= link_to user_path(@user, rss_url_options), class: 'btn btn-gray has-tooltip', title: 'Subscribe', 'aria-label': 'Subscribe' do
|
||||
= link_to user_path(@user, rss_url_options), class: 'btn btn-default has-tooltip', title: 'Subscribe', 'aria-label': 'Subscribe' do
|
||||
= icon('rss')
|
||||
- if current_user && current_user.admin?
|
||||
= link_to [:admin, @user], class: 'btn btn-gray', title: 'View user in admin area',
|
||||
= link_to [:admin, @user], class: 'btn btn-default', title: 'View user in admin area',
|
||||
data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
|
||||
= icon('users')
|
||||
|
||||
|
|
5
changelogs/unreleased/44319-remove-gray-buttons.yml
Normal file
5
changelogs/unreleased/44319-remove-gray-buttons.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove gray button styles
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
Loading…
Reference in a new issue