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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
0a27a536
Commit
0a27a536
authored
May 17, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
f0e07296
e893abdd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
68 additions
and
2 deletions
+68
-2
app/assets/stylesheets/components/toast.scss
app/assets/stylesheets/components/toast.scss
+52
-2
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+11
-0
changelogs/unreleased/237-style-toast-component.yml
changelogs/unreleased/237-style-toast-component.yml
+5
-0
No files found.
app/assets/stylesheets/components/toast.scss
View file @
0a27a536
.toast-close
{
font-size
:
$default-icon-size
!
important
;
/*
* These styles are specific to the gl-toast component.
* Documentation: https://design.gitlab.com/components/toasts
* Note: Styles below are nested in order to override some of vue-toasted's default styling
*/
.toasted-container
{
max-width
:
$toast-max-width
;
@include
media-breakpoint-down
(
xs
)
{
width
:
100%
;
padding-right
:
$toast-padding-right
;
}
.toasted.gl-toast
{
border-radius
:
$border-radius-default
;
font-size
:
$gl-font-size
;
padding
:
$gl-padding-8
$gl-padding-24
;
margin-top
:
$toast-default-margin
;
line-height
:
$gl-line-height
;
background-color
:
rgba
(
$gray-900
,
$toast-background-opacity
);
@include
media-breakpoint-down
(
xs
)
{
.action
:first-child
{
// Ensures actions buttons are right aligned on mobile
margin-left
:
auto
;
}
}
.action
{
color
:
$blue-300
;
margin
:
0
0
0
$toast-action-margin-left
;
text-transform
:
none
;
font-size
:
$gl-font-size
;
&
:first-child
{
padding-right
:
0
;
}
}
.toast-close
{
font-size
:
$default-icon-size
;
margin-left
:
$toast-default-margin
;
padding-left
:
$gl-padding
;
}
}
}
// Overrides the default positioning of toasts
body
.toasted-container.bottom-left
{
bottom
:
$toast-offset
;
left
:
$toast-offset
;
}
app/assets/stylesheets/framework/variables.scss
View file @
0a27a536
...
...
@@ -497,6 +497,17 @@ $pagination-padding-x: 16px;
$pagination-line-height
:
20px
;
$pagination-disabled-color
:
#cdcdcd
;
/*
* Toasts
*/
$toast-offset
:
24px
;
$toast-height
:
48px
;
$toast-max-width
:
586px
;
$toast-padding-right
:
42px
;
$toast-default-margin
:
8px
;
$toast-action-margin-left
:
16px
;
$toast-background-opacity
:
0
.95
;
/*
* Status icons
*/
...
...
changelogs/unreleased/237-style-toast-component.yml
0 → 100644
View file @
0a27a536
---
title
:
Style the toast component according to design specs.
merge_request
:
27734
author
:
type
:
added
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