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
Léo-Paul Géneau
gitlab-ce
Commits
e7c9aa60
Commit
e7c9aa60
authored
Mar 16, 2017
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
29595 Customize experience callout design
parent
1cc2d2ec
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
60 additions
and
22 deletions
+60
-22
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+47
-12
app/views/shared/_user_callout.html.haml
app/views/shared/_user_callout.html.haml
+9
-10
changelogs/unreleased/29595-customize-experience-callout.yml
changelogs/unreleased/29595-customize-experience-callout.yml
+4
-0
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
e7c9aa60
...
@@ -289,8 +289,12 @@ table.u2f-registrations {
...
@@ -289,8 +289,12 @@ table.u2f-registrations {
margin
:
0
auto
;
margin
:
0
auto
;
.bordered-box
{
.bordered-box
{
border
:
1px
solid
$b
order-color
;
border
:
1px
solid
$b
lue-300
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
background-color
:
lighten
(
$blue-50
,
3%
);
position
:
relative
;
display
:
flex
;
justify-content
:
center
;
}
}
.landing
{
.landing
{
...
@@ -298,28 +302,59 @@ table.u2f-registrations {
...
@@ -298,28 +302,59 @@ table.u2f-registrations {
margin-bottom
:
$gl-padding
;
margin-bottom
:
$gl-padding
;
.close
{
.close
{
margin-right
:
20px
;
position
:
absolute
;
}
right
:
20px
;
opacity
:
1
;
.dismiss-icon
{
.dismiss-icon
{
float
:
right
;
float
:
right
;
cursor
:
pointer
;
cursor
:
pointer
;
color
:
$cycle-analytics-dismiss-icon-color
;
color
:
$blue-300
;
}
&
:hover
{
background-color
:
transparent
;
border
:
0
;
.dismiss-icon
{
color
:
$blue-400
;
}
}
}
}
.svg-container
{
.svg-container
{
text-align
:
center
;
margin-right
:
30px
;
display
:
inline-block
;
svg
{
svg
{
width
:
136
px
;
height
:
110
px
;
height
:
136px
;
vertical-align
:
top
;
}
}
}
}
.user-callout-copy
{
display
:
inline-block
;
vertical-align
:
top
;
}
}
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
.inner-content
{
text-align
:
center
;
padding-left
:
30px
;
.bordered-box
{
display
:
block
;
}
.landing
{
.svg-container
,
.user-callout-copy
{
margin
:
0
;
display
:
block
;
svg
{
height
:
75px
;
}
}
}
}
}
}
}
}
app/views/shared/_user_callout.html.haml
View file @
e7c9aa60
.user-callout
.user-callout
.bordered-box.landing.content-block
.bordered-box.landing.content-block
%button
.btn.btn-default.close.
js-close
-callout
{
type:
'button'
,
%button
.btn.btn-default.close.
close-user
-callout
{
type:
'button'
,
'aria-label'
=>
'Dismiss customize experience box'
}
'aria-label'
=>
'Dismiss customize experience box'
}
=
icon
(
'times'
,
class:
'dismiss-icon'
,
'aria-hidden'
=>
'true'
)
=
icon
(
'times'
,
class:
'dismiss-icon'
,
'aria-hidden'
=>
'true'
)
.row
.svg-container
.col-sm-3.col-xs-12.svg-container
=
custom_icon
(
'icon_customization'
)
=
custom_icon
(
'icon_customization'
)
.col-sm-8.col-xs-12.inner-content
.user-callout-copy
%h4
%h4
Customize your experience
Customize your experience
%p
%p
Change syntax themes, default project pages, and more in preferences.
Change syntax themes, default project pages, and more in preferences.
=
link_to
'Check it out'
,
profile_preferences_path
,
class:
'btn btn-default js-close-callout
'
=
link_to
'Check it out'
,
profile_preferences_path
,
class:
'btn btn-primary user-callout-btn
'
changelogs/unreleased/29595-customize-experience-callout.yml
0 → 100644
View file @
e7c9aa60
---
title
:
29595 Update callout design
merge_request
:
author
:
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