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
425463c1
Commit
425463c1
authored
Jul 25, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace snake case in SCSS variables
parent
7d63c633
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
54 additions
and
54 deletions
+54
-54
app/assets/stylesheets/framework/avatar.scss
app/assets/stylesheets/framework/avatar.scss
+2
-2
app/assets/stylesheets/framework/forms.scss
app/assets/stylesheets/framework/forms.scss
+1
-1
app/assets/stylesheets/framework/highlight.scss
app/assets/stylesheets/framework/highlight.scss
+4
-4
app/assets/stylesheets/framework/jquery.scss
app/assets/stylesheets/framework/jquery.scss
+1
-1
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+6
-6
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+4
-4
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+10
-10
app/assets/stylesheets/mailers/highlighted_diff_email.scss
app/assets/stylesheets/mailers/highlighted_diff_email.scss
+2
-2
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+1
-1
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+1
-1
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+1
-1
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+3
-3
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+1
-1
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+1
-1
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+4
-4
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+1
-1
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+1
-1
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+1
-1
app/assets/stylesheets/snippets.scss
app/assets/stylesheets/snippets.scss
+8
-8
No files found.
app/assets/stylesheets/framework/avatar.scss
View file @
425463c1
...
...
@@ -7,7 +7,7 @@
.avatar-circle
{
float
:
left
;
margin-right
:
15px
;
border-radius
:
$avatar
_
radius
;
border-radius
:
$avatar
-
radius
;
border
:
1px
solid
$avatar-border
;
&
.s16
{
@include
avatar-size
(
16px
,
6px
);
}
&
.s18
{
@include
avatar-size
(
18px
,
6px
);
}
...
...
@@ -114,7 +114,7 @@
color
:
$white-light
;
border
:
1px
solid
$avatar-border
;
border-radius
:
1em
;
font-family
:
$regular
_
font
;
font-family
:
$regular
-
font
;
font-size
:
9px
;
line-height
:
16px
;
text-align
:
center
;
...
...
app/assets/stylesheets/framework/forms.scss
View file @
425463c1
...
...
@@ -80,7 +80,7 @@ label {
.form-control
{
height
:
29px
;
background
:
$white-light
;
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
}
.input-group-prepend
.btn
,
...
...
app/assets/stylesheets/framework/highlight.scss
View file @
425463c1
...
...
@@ -9,8 +9,8 @@
padding
:
10px
0
;
border
:
0
;
border-radius
:
0
;
font-family
:
$monospace
_
font
;
font-size
:
$code
_font_
size
;
font-family
:
$monospace
-
font
;
font-size
:
$code
-font-
size
;
line-height
:
19px
;
margin
:
0
;
overflow
:
auto
;
...
...
@@ -22,7 +22,7 @@
code
{
display
:
inline-block
;
min-width
:
100%
;
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
white-space
:
normal
;
word-wrap
:
normal
;
padding
:
0
;
...
...
@@ -44,7 +44,7 @@
float
:
left
;
a
{
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
display
:
block
;
font-size
:
$code_font_size
!
important
;
min-height
:
19px
;
...
...
app/assets/stylesheets/framework/jquery.scss
View file @
425463c1
.ui-widget
{
font-family
:
$regular
_
font
;
font-family
:
$regular
-
font
;
font-size
:
$font-size-base
;
.ui-state-default
{
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
425463c1
...
...
@@ -33,11 +33,11 @@
@include
media-breakpoint-up
(
sm
)
{
&
:not
(
.wiki-sidebar
)
:not
(
.build-sidebar
)
:not
(
.issuable-bulk-update-sidebar
)
.content-wrapper
{
padding-right
:
$gutter
_collapsed_
width
;
padding-right
:
$gutter
-collapsed-
width
;
}
.merge-request-tabs-holder.affix
{
right
:
$gutter
_collapsed_
width
;
right
:
$gutter
-collapsed-
width
;
}
}
...
...
@@ -67,21 +67,21 @@
@include
media-breakpoint-only
(
sm
)
{
&
:not
(
.wiki-sidebar
)
:not
(
.build-sidebar
)
:not
(
.issuable-bulk-update-sidebar
)
.content-wrapper
{
padding-right
:
$gutter
_collapsed_
width
;
padding-right
:
$gutter
-collapsed-
width
;
}
}
@include
media-breakpoint-up
(
md
)
{
.content-wrapper
{
padding-right
:
$gutter
_
width
;
padding-right
:
$gutter
-
width
;
}
&
:not
(
.with-overlay
)
.merge-request-tabs-holder.affix
{
right
:
$gutter
_
width
;
right
:
$gutter
-
width
;
}
&
.with-overlay
.merge-request-tabs-holder.affix
{
right
:
$gutter
_collapsed_
width
;
right
:
$gutter
-collapsed-
width
;
}
}
}
...
...
app/assets/stylesheets/framework/typography.scss
View file @
425463c1
...
...
@@ -44,7 +44,7 @@
// Single code lines should wrap
code
{
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
white-space
:
pre-wrap
;
word-wrap
:
normal
;
}
...
...
@@ -321,7 +321,7 @@ h6 {
/** CODE **/
pre
{
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
display
:
block
;
padding
:
$gl-padding-8
;
margin
:
0
0
$gl-padding-8
;
...
...
@@ -342,7 +342,7 @@ code {
}
.monospace
{
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
}
.weight-normal
{
...
...
@@ -381,7 +381,7 @@ code {
*
*/
textarea
.js-gfm-input
{
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
font-size
:
13px
;
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
425463c1
...
...
@@ -2,9 +2,9 @@
* Layout
*/
$grid-size
:
8px
;
$gutter
_collapsed_
width
:
62px
;
$gutter
_
width
:
290px
;
$gutter
_inner_
width
:
250px
;
$gutter
-collapsed-
width
:
62px
;
$gutter
-
width
:
290px
;
$gutter
-inner-
width
:
250px
;
$sidebar-transition-duration
:
0
.3s
;
$sidebar-breakpoint
:
1024px
;
$default-transition-duration
:
0
.15s
;
...
...
@@ -234,8 +234,8 @@ $md-area-border: #ddd;
/*
* Code
*/
$code
_font_
size
:
90%
;
$code
_line_
height
:
1
.6
;
$code
-font-
size
:
90%
;
$code
-line-
height
:
1
.6
;
/*
* Tooltips
...
...
@@ -383,9 +383,9 @@ $diff-jagged-border-gradient-color: darken($white-normal, 8%);
/*
* Fonts
*/
$monospace
_
font
:
'Menlo'
,
'DejaVu Sans Mono'
,
'Liberation Mono'
,
'Consolas'
,
'Ubuntu Mono'
,
$monospace
-
font
:
'Menlo'
,
'DejaVu Sans Mono'
,
'Liberation Mono'
,
'Consolas'
,
'Ubuntu Mono'
,
'Courier New'
,
'andale mono'
,
'lucida console'
,
monospace
;
$regular
_
font
:
-
apple-system
,
BlinkMacSystemFont
,
'Segoe UI'
,
Roboto
,
Oxygen-Sans
,
Ubuntu
,
Cantarell
,
$regular
-
font
:
-
apple-system
,
BlinkMacSystemFont
,
'Segoe UI'
,
Roboto
,
Oxygen-Sans
,
Ubuntu
,
Cantarell
,
'Helvetica Neue'
,
sans-serif
,
'Apple Color Emoji'
,
'Segoe UI Emoji'
,
'Segoe UI Symbol'
;
/*
...
...
@@ -538,7 +538,7 @@ $issue-board-list-difference-md: $issue-board-list-difference-sm + $issue-boards
/*
* Avatar
*/
$avatar
_
radius
:
50%
;
$avatar
-
radius
:
50%
;
$avatar-border
:
$gray-normal
;
$avatar-border-hover
:
$gray-darker
;
$avatar-background
:
$gray-lightest
;
...
...
@@ -869,8 +869,8 @@ $secondary: $gray-light;
$input-disabled-bg
:
$gray-light
;
$input-border-color
:
$theme-gray-200
;
$input-color
:
$gl-text-color
;
$font-family-sans-serif
:
$regular
_
font
;
$font-family-monospace
:
$monospace
_
font
;
$font-family-sans-serif
:
$regular
-
font
;
$font-family-monospace
:
$monospace
-
font
;
$input-line-height
:
20px
;
$btn-line-height
:
20px
;
$table-accent-bg
:
$gray-light
;
app/assets/stylesheets/mailers/highlighted_diff_email.scss
View file @
425463c1
...
...
@@ -77,13 +77,13 @@ $highlighted-gc-bg: #eaf2f5;
.code
{
background-color
:
$white-light
;
font-family
:
monospace
;
font-size
:
$code
_font_
size
;
font-size
:
$code
-font-
size
;
-premailer-cellpadding
:
0
;
-premailer-cellspacing
:
0
;
-premailer-width
:
100%
;
>
tr
{
line-height
:
$code
_line_
height
;
line-height
:
$code
-line-
height
;
}
}
...
...
app/assets/stylesheets/pages/boards.scss
View file @
425463c1
...
...
@@ -100,7 +100,7 @@
width
:
100%
;
&
.is-compact
{
width
:
calc
(
100%
-
#{
$gutter
_
width
}
);
width
:
calc
(
100%
-
#{
$gutter
-
width
}
);
}
}
}
...
...
app/assets/stylesheets/pages/commits.scss
View file @
425463c1
...
...
@@ -79,7 +79,7 @@
.commit-message-container
{
background-color
:
$body-bg
;
position
:
relative
;
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
$left
:
12px
;
overflow
:
hidden
;
// See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987
.max-width-marker
{
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
425463c1
...
...
@@ -368,7 +368,7 @@
.fa
{
color
:
$gl-text-color-secondary
;
font-size
:
$code
_font_
size
;
font-size
:
$code
-font-
size
;
}
}
}
...
...
app/assets/stylesheets/pages/diff.scss
View file @
425463c1
...
...
@@ -56,7 +56,7 @@
table
{
width
:
100%
;
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
border
:
0
;
border-collapse
:
separate
;
margin
:
0
;
...
...
@@ -73,8 +73,8 @@
}
.line_holder
td
{
line-height
:
$code
_line_
height
;
font-size
:
$code
_font_
size
;
line-height
:
$code
-line-
height
;
font-size
:
$code
-font-
size
;
&
.noteable_line
{
position
:
relative
;
...
...
app/assets/stylesheets/pages/editor.scss
View file @
425463c1
...
...
@@ -84,7 +84,7 @@
.soft-wrap-toggle
{
display
:
inline-block
;
vertical-align
:
top
;
font-family
:
$regular
_
font
;
font-family
:
$regular
-
font
;
}
.soft-wrap-toggle
{
...
...
app/assets/stylesheets/pages/environments.scss
View file @
425463c1
...
...
@@ -640,7 +640,7 @@
}
.deploy-info-text-link
{
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
fill
:
$gl-link-color
;
&
:hover
{
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
425463c1
...
...
@@ -166,7 +166,7 @@
border-bottom
:
1px
solid
$border-gray-normal
;
// This prevents the mess when resizing the sidebar
// of elements repositioning themselves..
width
:
$gutter
_inner_
width
;
width
:
$gutter
-inner-
width
;
// --
&
.issuable-sidebar-header
{
...
...
@@ -303,7 +303,7 @@
}
&
.right-sidebar-expanded
{
width
:
$gutter
_
width
;
width
:
$gutter
-
width
;
.value
{
line-height
:
1
;
...
...
@@ -390,11 +390,11 @@
display
:
block
;
}
width
:
$gutter
_collapsed_
width
;
width
:
$gutter
-collapsed-
width
;
padding
:
0
;
.block
{
width
:
$gutter
_collapsed_
width
-
2px
;
width
:
$gutter
-collapsed-
width
-
2px
;
padding
:
15px
0
0
;
border-bottom
:
0
;
overflow
:
hidden
;
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
425463c1
...
...
@@ -208,7 +208,7 @@
position
:
absolute
;
content
:
'...'
;
right
:
0
;
font-family
:
$regular
_
font
;
font-family
:
$regular
-
font
;
background-color
:
$gray-light
;
}
}
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
425463c1
...
...
@@ -42,7 +42,7 @@
display
:
block
;
padding
:
10px
0
;
color
:
$gl-text-color
;
font-family
:
$regular
_
font
;
font-family
:
$regular
-
font
;
border
:
0
;
&
:focus
{
...
...
app/assets/stylesheets/pages/notes.scss
View file @
425463c1
...
...
@@ -328,7 +328,7 @@ ul.notes {
}
.notes_holder
{
font-family
:
$regular
_
font
;
font-family
:
$regular
-
font
;
td
{
border
:
1px
solid
$white-normal
;
...
...
app/assets/stylesheets/pages/repo.scss
View file @
425463c1
...
...
@@ -961,7 +961,7 @@
overflow
:
hidden
;
.note-textarea
{
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
}
}
...
...
app/assets/stylesheets/snippets.scss
View file @
425463c1
...
...
@@ -6,9 +6,9 @@
$border-style
:
1px
solid
$border-color
;
font-family
:
$regular
_
font
;
font-family
:
$regular
-
font
;
font-size
:
$gl-font-size
;
line-height
:
$code
_line_
height
;
line-height
:
$code
-line-
height
;
color
:
$gl-text-color
;
margin
:
20px
;
font-weight
:
200
;
...
...
@@ -48,9 +48,9 @@
padding
:
10px
;
border
:
0
;
border-radius
:
0
;
font-family
:
$monospace
_
font
;
font-size
:
$code
_font_
size
;
line-height
:
$code
_line_
height
;
font-family
:
$monospace
-
font
;
font-size
:
$code
-font-
size
;
line-height
:
$code
-line-
height
;
margin
:
0
;
overflow
:
auto
;
overflow-y
:
hidden
;
...
...
@@ -66,10 +66,10 @@
float
:
left
;
.diff-line-num
{
font-family
:
$monospace
_
font
;
font-family
:
$monospace
-
font
;
display
:
block
;
font-size
:
$code
_font_
size
;
min-height
:
$code
_line_
height
;
font-size
:
$code
-font-
size
;
min-height
:
$code
-line-
height
;
white-space
:
nowrap
;
color
:
$black-transparent
;
min-width
:
30px
;
...
...
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