BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
dde40e51
Commit
dde40e51
authored
Nov 14, 2017
by
Jacob Schatz
Committed by
Winnie Hellmann
Nov 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'slack_landing_page-ce-backport' into 'master'
slack landing page ce backport See merge request gitlab-org/gitlab-ce!15354 (cherry picked from commit
b79e19d9
)
d4d5e804
url_utility and style backport
81c62652
backport popup vars
parent
4906f4e6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
55 additions
and
0 deletions
+55
-0
url_utility.js
app/assets/javascripts/lib/utils/url_utility.js
+4
-0
framework.scss
app/assets/stylesheets/framework.scss
+1
-0
mixins.scss
app/assets/stylesheets/framework/mixins.scss
+28
-0
popup.scss
app/assets/stylesheets/framework/popup.scss
+15
-0
variables.scss
app/assets/stylesheets/framework/variables.scss
+7
-0
No files found.
app/assets/javascripts/lib/utils/url_utility.js
View file @
dde40e51
...
...
@@ -100,6 +100,10 @@ export function visitUrl(url, external = false) {
}
}
export
function
redirectTo
(
url
)
{
return
window
.
location
.
assign
(
url
);
}
window
.
gl
=
window
.
gl
||
{};
window
.
gl
.
utils
=
{
...(
window
.
gl
.
utils
||
{}),
...
...
app/assets/stylesheets/framework.scss
View file @
dde40e51
...
...
@@ -34,6 +34,7 @@
@import
"framework/modal"
;
@import
"framework/pagination"
;
@import
"framework/panels"
;
@import
"framework/popup"
;
@import
"framework/secondary-navigation-elements"
;
@import
"framework/selects"
;
@import
"framework/sidebar"
;
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
dde40e51
...
...
@@ -180,3 +180,31 @@
display
:
none
;
}
}
@mixin
triangle
(
$color
,
$border-color
,
$size
,
$border-size
)
{
&
:
:
before
,
&::
after
{
bottom
:
100%
;
left
:
50%
;
border
:
solid
transparent
;
content
:
''
;
height
:
0
;
width
:
0
;
position
:
absolute
;
pointer-events
:
none
;
}
&
:
:
before
{
border-color
:
transparent
;
border-bottom-color
:
$border-color
;
border-width
:
(
$size
+
$border-size
);
margin-left
:
-
(
$size
+
$border-size
);
}
&
:
:
after
{
border-color
:
transparent
;
border-bottom-color
:
$color
;
border-width
:
$size
;
margin-left
:
-
$size
;
}
}
app/assets/stylesheets/framework/popup.scss
0 → 100644
View file @
dde40e51
.popup
{
@include
triangle
(
$gray-lighter
,
$gray-darker
,
$popup-triangle-size
,
$popup-triangle-border-size
);
padding
:
$gl-padding
;
background-color
:
$gray-lighter
;
border
:
1px
solid
$gray-darker
;
border-radius
:
$border-radius-default
;
box-shadow
:
0
5px
8px
$popup-box-shadow-color
;
position
:
relative
;
}
app/assets/stylesheets/framework/variables.scss
View file @
dde40e51
...
...
@@ -719,3 +719,10 @@ Image Commenting cursor
*/
$image-comment-cursor-left-offset
:
12
;
$image-comment-cursor-top-offset
:
30
;
/*
Popup
*/
$popup-triangle-size
:
15px
;
$popup-triangle-border-size
:
1px
;
$popup-box-shadow-color
:
rgba
(
90
,
90
,
90
,
0
.05
);
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