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
df4c4833
Commit
df4c4833
authored
8 years ago
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant mixins
parent
6678fab3
Changes
22
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
40 additions
and
50 deletions
+40
-50
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/framework/avatar.scss
app/assets/stylesheets/framework/avatar.scss
+2
-2
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+1
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+4
-4
app/assets/stylesheets/framework/forms.scss
app/assets/stylesheets/framework/forms.scss
+1
-1
app/assets/stylesheets/framework/issue_box.scss
app/assets/stylesheets/framework/issue_box.scss
+1
-1
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+1
-1
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+0
-11
app/assets/stylesheets/framework/mobile.scss
app/assets/stylesheets/framework/mobile.scss
+1
-1
app/assets/stylesheets/framework/selects.scss
app/assets/stylesheets/framework/selects.scss
+7
-7
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+3
-3
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+1
-1
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+1
-1
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+1
-1
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+1
-1
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+2
-2
app/assets/stylesheets/pages/login.scss
app/assets/stylesheets/pages/login.scss
+3
-3
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+1
-1
app/assets/stylesheets/pages/profiles/preferences.scss
app/assets/stylesheets/pages/profiles/preferences.scss
+2
-2
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+4
-4
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+1
-1
No files found.
CHANGELOG
View file @
df4c4833
...
@@ -30,6 +30,7 @@ v 8.13.0 (unreleased)
...
@@ -30,6 +30,7 @@ v 8.13.0 (unreleased)
- Add word-wrap to issue title on issue and milestone boards (ClemMakesApps)
- Add word-wrap to issue title on issue and milestone boards (ClemMakesApps)
- Fix todos page mobile viewport layout (ClemMakesApps)
- Fix todos page mobile viewport layout (ClemMakesApps)
- Fix inconsistent highlighting of already selected activity nav-links (ClemMakesApps)
- Fix inconsistent highlighting of already selected activity nav-links (ClemMakesApps)
- Remove redundant mixins (ClemMakesApps)
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Close open merge request without source project (Katarzyna Kobierska Ula Budziszewska)
- Close open merge request without source project (Katarzyna Kobierska Ula Budziszewska)
- Fix that manual jobs would no longer block jobs in the next stage. !6604
- Fix that manual jobs would no longer block jobs in the next stage. !6604
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/avatar.scss
View file @
df4c4833
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
width
:
40px
;
width
:
40px
;
height
:
40px
;
height
:
40px
;
padding
:
0
;
padding
:
0
;
@include
border-radius
(
$avatar_radius
)
;
border-radius
:
$avatar_radius
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.1
);
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.1
);
&
.avatar-inline
{
&
.avatar-inline
{
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
}
}
&
.avatar-tile
{
&
.avatar-tile
{
@include
border-radius
(
0
)
;
border-radius
:
0
;
border
:
none
;
border
:
none
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/blocks.scss
View file @
df4c4833
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
}
}
.identicon
{
.identicon
{
@include
border-radius
(
50%
)
;
border-radius
:
50%
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/buttons.scss
View file @
df4c4833
@mixin
btn-default
{
@mixin
btn-default
{
@include
border-radius
(
3px
)
;
border-radius
:
3px
;
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
font-weight
:
500
;
font-weight
:
500
;
padding
:
$gl-vert-padding
$gl-btn-padding
;
padding
:
$gl-vert-padding
$gl-btn-padding
;
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
&
:active
{
&
:active
{
outline
:
none
;
outline
:
none
;
background-color
:
$btn-active-gray
;
background-color
:
$btn-active-gray
;
@include
box-shadow
(
$gl-btn-active-background
)
;
box-shadow
:
$gl-btn-active-background
;
}
}
}
}
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
&
:active
,
&
:active
,
&
.active
{
&
.active
{
@include
box-shadow
(
$gl-btn-active-background
)
;
box-shadow
:
$gl-btn-active-background
;
background-color
:
$dark
;
background-color
:
$dark
;
border-color
:
$border-dark
;
border-color
:
$border-dark
;
...
@@ -279,7 +279,7 @@
...
@@ -279,7 +279,7 @@
}
}
.active
{
.active
{
@include
box-shadow
(
$gl-btn-active-background
)
;
box-shadow
:
$gl-btn-active-background
;
border
:
1px
solid
#c6cacf
!
important
;
border
:
1px
solid
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
background-color
:
#e4e7ed
!
important
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/forms.scss
View file @
df4c4833
...
@@ -73,7 +73,7 @@ label {
...
@@ -73,7 +73,7 @@ label {
}
}
.form-control
{
.form-control
{
@include
box-shadow
(
none
)
;
box-shadow
:
none
;
border-radius
:
3px
;
border-radius
:
3px
;
padding
:
$gl-vert-padding
$gl-input-padding
;
padding
:
$gl-vert-padding
$gl-input-padding
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/issue_box.scss
View file @
df4c4833
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
margin-top
:
5px
;
margin-top
:
5px
;
}
}
@include
border-radius
(
3px
)
;
border-radius
:
3px
;
display
:
block
;
display
:
block
;
float
:
left
;
float
:
left
;
margin-right
:
10px
;
margin-right
:
10px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/markdown_area.scss
View file @
df4c4833
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
}
}
.markdown-area
{
.markdown-area
{
@include
border-radius
(
0
)
;
border-radius
:
0
;
background
:
#fff
;
background
:
#fff
;
border
:
1px
solid
#ddd
;
border
:
1px
solid
#ddd
;
min-height
:
140px
;
min-height
:
140px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/mixins.scss
View file @
df4c4833
/**
* Generic mixins
*/
@mixin
box-shadow
(
$shadow
)
{
box-shadow
:
$shadow
;
}
@mixin
border-radius
(
$radius
)
{
border-radius
:
$radius
;
}
/**
/**
* Prefilled mixins
* Prefilled mixins
* Mixins with fixed values
* Mixins with fixed values
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/mobile.scss
View file @
df4c4833
...
@@ -133,5 +133,5 @@
...
@@ -133,5 +133,5 @@
font-size
:
20px
;
font-size
:
20px
;
color
:
#777
;
color
:
#777
;
z-index
:
100
;
z-index
:
100
;
@include
box-shadow
(
0
1px
2px
#ddd
)
;
box-shadow
:
0
1px
2px
#ddd
;
}
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/selects.scss
View file @
df4c4833
...
@@ -46,8 +46,8 @@
...
@@ -46,8 +46,8 @@
}
}
.select2-drop
{
.select2-drop
{
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0
0
1px
0
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0
2px
18px
0
)
;
box-shadow
:
rgba
(
76
,
86
,
103
,
0
.247059
)
0
0
1px
0
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0
2px
18px
0
;
@include
border-radius
(
$border-radius-default
)
;
border-radius
:
$border-radius-default
;
border
:
none
;
border
:
none
;
min-width
:
175px
;
min-width
:
175px
;
}
}
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
.select2-container-active
{
.select2-container-active
{
.select2-choice
,
.select2-choices
{
.select2-choice
,
.select2-choices
{
@include
box-shadow
(
none
)
;
box-shadow
:
none
;
}
}
}
}
...
@@ -82,13 +82,13 @@
...
@@ -82,13 +82,13 @@
outline
:
0
;
outline
:
0
;
background-image
:
none
;
background-image
:
none
;
background-color
:
$white-dark
;
background-color
:
$white-dark
;
@include
box-shadow
(
$gl-btn-active-gradient
)
;
box-shadow
:
$gl-btn-active-gradient
;
}
}
}
}
.select2-container-multi
{
.select2-container-multi
{
.select2-choices
{
.select2-choices
{
@include
border-radius
(
$border-radius-default
)
;
border-radius
:
$border-radius-default
;
border-color
:
$input-border
;
border-color
:
$input-border
;
background
:
none
;
background
:
none
;
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
&
.select2-container-active
.select2-choices
,
&
.select2-container-active
.select2-choices
,
&
.select2-dropdown-open
.select2-choices
{
&
.select2-dropdown-open
.select2-choices
{
border-color
:
$border-white-normal
;
border-color
:
$border-white-normal
;
@include
box-shadow
(
$gl-btn-active-gradient
)
;
box-shadow
:
$gl-btn-active-gradient
;
}
}
}
}
...
@@ -157,7 +157,7 @@
...
@@ -157,7 +157,7 @@
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-position
:
right
0
bottom
6px
;
background-position
:
right
0
bottom
6px
;
border
:
1px
solid
$input-border
;
border
:
1px
solid
$input-border
;
@include
border-radius
(
$border-radius-default
)
;
border-radius
:
$border-radius-default
;
transition
:
border-color
ease-in-out
0
.15s
,
box-shadow
ease-in-out
0
.15s
;
transition
:
border-color
ease-in-out
0
.15s
,
box-shadow
ease-in-out
0
.15s
;
&
:focus
{
&
:focus
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/sidebar.scss
View file @
df4c4833
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
&
.page-sidebar-pinned
{
&
.page-sidebar-pinned
{
.sidebar-wrapper
{
.sidebar-wrapper
{
@include
box-shadow
(
none
)
;
box-shadow
:
none
;
}
}
}
}
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
width
:
0
;
width
:
0
;
overflow
:
hidden
;
overflow
:
hidden
;
transition
:
width
$sidebar-transition-duration
;
transition
:
width
$sidebar-transition-duration
;
@include
box-shadow
(
2px
0
16px
0
$black-transparent
)
;
box-shadow
:
2px
0
16px
0
$black-transparent
;
}
}
}
}
...
@@ -100,7 +100,7 @@
...
@@ -100,7 +100,7 @@
.count
{
.count
{
float
:
right
;
float
:
right
;
padding
:
0
8px
;
padding
:
0
8px
;
@include
border-radius
(
6px
)
;
border-radius
:
6px
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/typography.scss
View file @
df4c4833
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
font-size
:
13px
;
font-size
:
13px
;
line-height
:
1
.6em
;
line-height
:
1
.6em
;
overflow-x
:
auto
;
overflow-x
:
auto
;
@include
border-radius
(
2px
)
;
border-radius
:
2px
;
}
}
p
>
code
{
p
>
code
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
df4c4833
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
.bordered-box
{
.bordered-box
{
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
@include
border-radius
(
$border-radius-default
)
;
border-radius
:
$border-radius-default
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/editor.scss
View file @
df4c4833
.file-editor
{
.file-editor
{
#editor
{
#editor
{
border
:
none
;
border
:
none
;
@include
border-radius
(
0
)
;
border-radius
:
0
;
height
:
500px
;
height
:
500px
;
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/events.scss
View file @
df4c4833
...
@@ -91,7 +91,7 @@
...
@@ -91,7 +91,7 @@
float
:
right
;
float
:
right
;
border
:
1px
solid
#eee
;
border
:
1px
solid
#eee
;
padding
:
5px
;
padding
:
5px
;
@include
border-radius
(
5px
)
;
border-radius
:
5px
;
background
:
$gray-light
;
background
:
$gray-light
;
margin-left
:
10px
;
margin-left
:
10px
;
top
:
-6px
;
top
:
-6px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/labels.scss
View file @
df4c4833
.suggest-colors
{
.suggest-colors
{
margin-top
:
5px
;
margin-top
:
5px
;
a
{
a
{
@include
border-radius
(
4px
)
;
border-radius
:
4px
;
width
:
30px
;
width
:
30px
;
height
:
30px
;
height
:
30px
;
display
:
inline-block
;
display
:
inline-block
;
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
overflow
:
hidden
;
overflow
:
hidden
;
a
{
a
{
@include
border-radius
(
0
)
;
border-radius
:
0
;
width
:
(
100%
/
7
);
width
:
(
100%
/
7
);
margin-right
:
0
;
margin-right
:
0
;
margin-bottom
:
-5px
;
margin-bottom
:
-5px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/login.scss
View file @
df4c4833
...
@@ -73,12 +73,12 @@
...
@@ -73,12 +73,12 @@
height
:
auto
;
height
:
auto
;
&
.top
{
&
.top
{
@include
border-radius
(
5px
5px
0
0
)
;
border-radius
:
5px
5px
0
0
;
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
&
.bottom
{
&
.bottom
{
@include
border-radius
(
0
0
5px
5px
)
;
border-radius
:
0
0
5px
5px
;
border-top
:
0
;
border-top
:
0
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
&
.middle
{
&
.middle
{
border-top
:
0
;
border-top
:
0
;
margin-bottom
:
0
;
margin-bottom
:
0
;
@include
border-radius
(
0
)
;
border-radius
:
0
;
}
}
&
:active
,
&
:focus
{
&
:active
,
&
:focus
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/merge_requests.scss
View file @
df4c4833
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
background
:
$background-color
;
background
:
$background-color
;
color
:
$gl-gray
;
color
:
$gl-gray
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
@include
border-radius
(
2px
)
;
border-radius
:
2px
;
form
{
form
{
margin-bottom
:
0
;
margin-bottom
:
0
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/notes.scss
View file @
df4c4833
...
@@ -334,7 +334,7 @@ ul.notes {
...
@@ -334,7 +334,7 @@ ul.notes {
.add-diff-note
{
.add-diff-note
{
margin-top
:
-4px
;
margin-top
:
-4px
;
@include
border-radius
(
40px
)
;
border-radius
:
40px
;
background
:
#fff
;
background
:
#fff
;
padding
:
4px
;
padding
:
4px
;
font-size
:
16px
;
font-size
:
16px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/profiles/preferences.scss
View file @
df4c4833
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
text-align
:
center
;
text-align
:
center
;
.preview
{
.preview
{
@include
border-radius
(
4px
)
;
border-radius
:
4px
;
height
:
80px
;
height
:
80px
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
width
:
160px
;
width
:
160px
;
img
{
img
{
@include
border-radius
(
4px
)
;
border-radius
:
4px
;
max-width
:
100%
;
max-width
:
100%
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/projects.scss
View file @
df4c4833
...
@@ -354,7 +354,7 @@ a.deploy-project-label {
...
@@ -354,7 +354,7 @@ a.deploy-project-label {
justify-content
:
flex-start
;
justify-content
:
flex-start
;
.fork-thumbnail
{
.fork-thumbnail
{
@include
border-radius
(
$border-radius-base
)
;
border-radius
:
$border-radius-base
;
background-color
:
$white-light
;
background-color
:
$white-light
;
border
:
1px
solid
$border-white-light
;
border
:
1px
solid
$border-white-light
;
height
:
202px
;
height
:
202px
;
...
@@ -371,7 +371,7 @@ a.deploy-project-label {
...
@@ -371,7 +371,7 @@ a.deploy-project-label {
background-color
:
$gray-light
;
background-color
:
$gray-light
;
border
:
1px
solid
$gray-dark
;
border
:
1px
solid
$gray-dark
;
margin
:
0
auto
;
margin
:
0
auto
;
@include
border-radius
(
50%
)
;
border-radius
:
50%
;
i
{
i
{
font-size
:
100px
;
font-size
:
100px
;
color
:
$gray-dark
;
color
:
$gray-dark
;
...
@@ -390,7 +390,7 @@ a.deploy-project-label {
...
@@ -390,7 +390,7 @@ a.deploy-project-label {
}
}
img
{
img
{
@include
border-radius
(
50%
)
;
border-radius
:
50%
;
max-width
:
100px
;
max-width
:
100px
;
}
}
}
}
...
@@ -496,7 +496,7 @@ pre.light-well {
...
@@ -496,7 +496,7 @@ pre.light-well {
}
}
.light-well
{
.light-well
{
@include
border-radius
(
2px
)
;
border-radius
:
2px
;
color
:
#5b6169
;
color
:
#5b6169
;
font-size
:
13px
;
font-size
:
13px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/status.scss
View file @
df4c4833
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
margin-right
:
10px
;
margin-right
:
10px
;
border
:
1px
solid
#eee
;
border
:
1px
solid
#eee
;
white-space
:
nowrap
;
white-space
:
nowrap
;
@include
border-radius
(
4px
)
;
border-radius
:
4px
;
&
:hover
{
&
:hover
{
text-decoration
:
none
;
text-decoration
:
none
;
...
...
This diff is collapsed.
Click to expand it.
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