Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
0808f99d
Commit
0808f99d
authored
May 07, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove gray button style
parent
f9fcd2b4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
17 deletions
+12
-17
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+0
-8
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-2
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+2
-3
app/views/users/show.html.haml
app/views/users/show.html.haml
+4
-4
changelogs/unreleased/44319-remove-gray-buttons.yml
changelogs/unreleased/44319-remove-gray-buttons.yml
+5
-0
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
0808f99d
...
@@ -106,10 +106,6 @@
...
@@ -106,10 +106,6 @@
@include
btn-color
(
$red-500
,
$red-600
,
$red-600
,
$red-700
,
$red-700
,
$red-800
,
$white-light
);
@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
{
@mixin
btn-white
{
@include
btn-color
(
$white-light
,
$border-color
,
$white-normal
,
$border-white-normal
,
$white-dark
,
$border-gray-dark
,
$gl-text-color
);
@include
btn-color
(
$white-light
,
$border-color
,
$white-normal
,
$border-white-normal
,
$white-dark
,
$border-gray-dark
,
$gl-text-color
);
}
}
...
@@ -183,10 +179,6 @@
...
@@ -183,10 +179,6 @@
}
}
}
}
&
.btn-gray
{
@include
btn-gray
;
}
&
.btn-info
,
&
.btn-info
,
&
.btn-primary
,
&
.btn-primary
,
&
.btn-register
{
&
.btn-register
{
...
...
app/assets/stylesheets/pages/projects.scss
View file @
0808f99d
...
@@ -205,7 +205,6 @@
...
@@ -205,7 +205,6 @@
.project-repo-buttons
,
.project-repo-buttons
,
.group-buttons
{
.group-buttons
{
.btn
{
.btn
{
@include
btn-gray
;
padding
:
3px
10px
;
padding
:
3px
10px
;
&
:last-child
{
&
:last-child
{
...
@@ -294,7 +293,7 @@
...
@@ -294,7 +293,7 @@
}
}
.count
{
.count
{
@include
btn-
gray
;
@include
btn-
white
;
display
:
inline-block
;
display
:
inline-block
;
background
:
$white-light
;
background
:
$white-light
;
border-radius
:
2px
;
border-radius
:
2px
;
...
...
app/views/help/ui.html.haml
View file @
0808f99d
...
@@ -74,10 +74,10 @@
...
@@ -74,10 +74,10 @@
=
lorem
=
lorem
.cover-controls
.cover-controls
=
link_to
'#'
,
class:
'btn btn-
gray
'
do
=
link_to
'#'
,
class:
'btn btn-
default
'
do
=
icon
(
'pencil'
)
=
icon
(
'pencil'
)
=
link_to
'#'
,
class:
'btn btn-
gray
'
do
=
link_to
'#'
,
class:
'btn btn-
default
'
do
=
icon
(
'rss'
)
=
icon
(
'rss'
)
%h2
#lists
Lists
%h2
#lists
Lists
...
@@ -206,7 +206,6 @@
...
@@ -206,7 +206,6 @@
.example
.example
%button
.btn.btn-default
{
:type
=>
"button"
}
Default
%button
.btn.btn-default
{
:type
=>
"button"
}
Default
%button
.btn.btn-gray
{
:type
=>
"button"
}
Gray
%button
.btn.btn-primary
{
:type
=>
"button"
}
Primary
%button
.btn.btn-primary
{
:type
=>
"button"
}
Primary
%button
.btn.btn-success
{
:type
=>
"button"
}
Success
%button
.btn.btn-success
{
:type
=>
"button"
}
Success
%button
.btn.btn-info
{
:type
=>
"button"
}
Info
%button
.btn.btn-info
{
:type
=>
"button"
}
Info
...
...
app/views/users/show.html.haml
View file @
0808f99d
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
.cover-block.user-cover-block.top-area
.cover-block.user-cover-block.top-area
.cover-controls
.cover-controls
-
if
@user
==
current_user
-
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'
)
=
icon
(
'pencil'
)
-
elsif
current_user
-
elsif
current_user
-
if
@user
.
abuse_report
-
if
@user
.
abuse_report
...
@@ -20,13 +20,13 @@
...
@@ -20,13 +20,13 @@
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
}
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
}
=
icon
(
'exclamation-circle'
)
=
icon
(
'exclamation-circle'
)
-
else
-
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
title:
'Report abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'exclamation-circle'
)
=
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'
)
=
icon
(
'rss'
)
-
if
current_user
&&
current_user
.
admin?
-
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
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'users'
)
=
icon
(
'users'
)
...
...
changelogs/unreleased/44319-remove-gray-buttons.yml
0 → 100644
View file @
0808f99d
---
title
:
Remove gray button styles
merge_request
:
author
:
type
:
fixed
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