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
eb1b5513
Commit
eb1b5513
authored
Nov 10, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move reusable well styles into their own file
parent
ba1c5c05
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
52 deletions
+52
-52
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+1
-0
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-2
app/assets/stylesheets/framework/wells.scss
app/assets/stylesheets/framework/wells.scss
+45
-0
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+0
-46
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+3
-3
No files found.
app/assets/stylesheets/framework.scss
View file @
eb1b5513
...
@@ -39,3 +39,4 @@
...
@@ -39,3 +39,4 @@
@import
"framework/typography.scss"
;
@import
"framework/typography.scss"
;
@import
"framework/zen.scss"
;
@import
"framework/zen.scss"
;
@import
"framework/blank"
;
@import
"framework/blank"
;
@import
"framework/wells.scss"
;
app/assets/stylesheets/framework/variables.scss
View file @
eb1b5513
...
@@ -90,8 +90,8 @@ $table-border-color: #f0f0f0;
...
@@ -90,8 +90,8 @@ $table-border-color: #f0f0f0;
$background-color
:
$gray-light
;
$background-color
:
$gray-light
;
$dark-background-color
:
#f5f5f5
;
$dark-background-color
:
#f5f5f5
;
$table-text-gray
:
#8f8f8f
;
$table-text-gray
:
#8f8f8f
;
$w
idget
-expand-item
:
#e8f2f7
;
$w
ell
-expand-item
:
#e8f2f7
;
$w
idget
-inner-border
:
#eef0f2
;
$w
ell
-inner-border
:
#eef0f2
;
/*
/*
* Text
* Text
...
...
app/assets/stylesheets/framework/wells.scss
0 → 100644
View file @
eb1b5513
.info-well
{
background
:
$background-color
;
color
:
$gl-gray
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
.well-segment
{
padding
:
$gl-padding
;
&
:not
(
:last-of-type
)
{
border-bottom
:
1px
solid
$well-inner-border
;
}
&
.branch-info
{
.monospace
,
.commit-info
{
margin-left
:
4px
;
}
}
}
.icon-container
{
display
:
inline-block
;
margin-right
:
8px
;
svg
{
position
:
relative
;
top
:
2px
;
height
:
16px
;
width
:
16px
;
}
&
.commit-icon
{
svg
{
path
{
fill
:
$gl-text-color
;
}
}
}
}
.label.label-gray
{
background-color
:
$well-expand-item
;
}
}
app/assets/stylesheets/pages/commit.scss
View file @
eb1b5513
...
@@ -117,52 +117,6 @@
...
@@ -117,52 +117,6 @@
}
}
}
}
.commit-info-widget
{
background
:
$background-color
;
color
:
$gl-gray
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
.widget-row
{
padding
:
$gl-padding
;
&
:not
(
:last-of-type
)
{
border-bottom
:
1px
solid
$widget-inner-border
;
}
&
.branch-info
{
.monospace
,
.commit-info
{
margin-left
:
4px
;
}
}
}
.icon-container
{
display
:
inline-block
;
margin-right
:
8px
;
svg
{
position
:
relative
;
top
:
2px
;
height
:
16px
;
width
:
16px
;
}
&
.commit-icon
{
svg
{
path
{
fill
:
$gl-text-color
;
}
}
}
}
.label.label-gray
{
background-color
:
$widget-expand-item
;
}
}
.ci-status-link
{
.ci-status-link
{
svg
{
svg
{
overflow
:
visible
;
overflow
:
visible
;
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
eb1b5513
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
}
}
.ci_widget
{
.ci_widget
{
border-bottom
:
1px
solid
$w
idget
-inner-border
;
border-bottom
:
1px
solid
$w
ell
-inner-border
;
svg
{
svg
{
margin-right
:
4px
;
margin-right
:
4px
;
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
eb1b5513
...
@@ -55,8 +55,8 @@
...
@@ -55,8 +55,8 @@
%pre
.commit-description
%pre
.commit-description
=
preserve
(
markdown
(
@commit
.
description
,
pipeline: :single_line
,
author:
@commit
.
author
))
=
preserve
(
markdown
(
@commit
.
description
,
pipeline: :single_line
,
author:
@commit
.
author
))
.
commit-info-widget
.
info-well
.w
idget-row
.branch-info
.w
ell-segment
.branch-info
.icon-container.commit-icon
.icon-container.commit-icon
=
custom_icon
(
"icon_commit"
)
=
custom_icon
(
"icon_commit"
)
%span
.cgray
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
%span
.cgray
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
%i
.fa.fa-spinner.fa-spin
%i
.fa.fa-spinner.fa-spin
-
if
@commit
.
status
-
if
@commit
.
status
.w
idget-row
.pipeline-info
.w
ell-segment
.pipeline-info
.icon-container
.icon-container
=
ci_icon_for_status
(
@commit
.
status
)
=
ci_icon_for_status
(
@commit
.
status
)
Pipeline
Pipeline
...
...
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