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
a26e19cb
Commit
a26e19cb
authored
Jul 25, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace snake case in mixins and merge_conflicts variables
parent
96a47d42
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
109 additions
and
110 deletions
+109
-110
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+2
-2
app/assets/stylesheets/pages/merge_conflicts.scss
app/assets/stylesheets/pages/merge_conflicts.scss
+102
-108
changelogs/unreleased/replace-all-snake-case-in-scss-variables.yml
...s/unreleased/replace-all-snake-case-in-scss-variables.yml
+5
-0
No files found.
app/assets/stylesheets/framework/mixins.scss
View file @
a26e19cb
...
@@ -3,13 +3,13 @@
...
@@ -3,13 +3,13 @@
* Mixins with fixed values
* Mixins with fixed values
*/
*/
@mixin
str-truncated
(
$max
_
width
:
82%
)
{
@mixin
str-truncated
(
$max
-
width
:
82%
)
{
display
:
inline-block
;
display
:
inline-block
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
vertical-align
:
top
;
vertical-align
:
top
;
white-space
:
nowrap
;
white-space
:
nowrap
;
max-width
:
$max
_
width
;
max-width
:
$max
-
width
;
}
}
/*
/*
...
...
app/assets/stylesheets/pages/merge_conflicts.scss
View file @
a26e19cb
This diff is collapsed.
Click to expand it.
changelogs/unreleased/replace-all-snake-case-in-scss-variables.yml
0 → 100644
View file @
a26e19cb
---
title
:
Replace snake case in SCSS variables
merge_request
:
20799
author
:
George Tsiolis
type
:
other
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