Skip to content

G
gitlab-ce
Commit b71195b9 authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Merge branch 'replace-all-snake-case-in-scss-variables' into 'master' 

Replace all snake case in scss variables

See merge request gitlab-org/gitlab-ee!6649
parents be010aab 834a708a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 180 deletions
app/assets/stylesheets/framework/avatar.scss
View file @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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,9 +44,9 @@
float: left;
a {
font-family: $monospace_font;
font-family: $monospace-font;
display: block;
font-size: $code_font_size !important;
font-size: $code-font-size !important;
min-height: 19px;
white-space: nowrap;
......
app/assets/stylesheets/framework/jquery.scss
View file @ b71195b9
.ui-widget {
font-family: $regular_font;
font-family: $regular-font;
font-size: $font-size-base;
.ui-state-default {
......
app/assets/stylesheets/framework/mixins.scss
View file @ b71195b9
......@@ -3,13 +3,13 @@
* Mixins with fixed values
*/
@mixin str-truncated($max_width: 82%) {
@mixin str-truncated($max-width: 82%) {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
white-space: nowrap;
max-width: $max_width;
max-width: $max-width;
}
/*
......@@ -255,7 +255,7 @@
}
}
@mixin build-trace-top-bar($height, $top_position) {
@mixin build-trace-top-bar($height, $top-position) {
height: $height;
min-height: $height;
background: $gray-light;
......@@ -263,21 +263,21 @@
color: $gl-text-color;
position: sticky;
position: -webkit-sticky;
top: $top_position;
top: $top-position;
padding: $grid-size;
}
/*
* Mixin that handles the position of the controls placed on the top bar
*/
@mixin build-controllers($control_font_size, $flex_direction, $with_grow, $flex_grow_size) {
@mixin build-controllers($control-font-size, $flex-direction, $with-grow, $flex-grow-size) {
display: flex;
font-size: $control_font_size;
justify-content: $flex_direction;
font-size: $control-font-size;
justify-content: $flex-direction;
align-items: center;
align-self: baseline;
@if $with_grow {
flex-grow: $flex_grow_size;
@if $with-grow {
flex-grow: $flex-grow-size;
}
svg {
......
app/assets/stylesheets/framework/sidebar.scss
View file @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -84,7 +84,7 @@
.soft-wrap-toggle {
display: inline-block;
vertical-align: top;
font-family: $regular_font;
font-family: $regular-font;
}
.soft-wrap-toggle {
......@@ -205,7 +205,7 @@
.template-type-selector {
display: inline-block;
vertical-align: top;
font-family: $regular_font;
font-family: $regular-font;
margin-top: -5px;
@media(max-width: map-get($grid-breakpoints, md)-1) {
......
app/assets/stylesheets/pages/environments.scss
View file @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -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 @ b71195b9
......@@ -961,7 +961,7 @@
overflow: hidden;
.note-textarea {
font-family: $monospace_font;
font-family: $monospace-font;
}
}
......
app/assets/stylesheets/snippets.scss
View file @ b71195b9
......@@ -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;
......
changelogs/unreleased/replace-all-snake-case-in-scss-variables.yml 0 → 100644
View file @ b71195b9
---
title: Replace snake case in SCSS variables
merge_request: 20799
author: George Tsiolis
type: other
ee/app/assets/stylesheets/pages/issues/related_issues.scss
View file @ b71195b9
$token_spacing_bottom: 0.5em;
$token-spacing-bottom: 0.5em;
.related-issues-block {
margin-top: 3 * $gl-vert-padding;
......@@ -45,7 +45,7 @@ $token_spacing_bottom: 0.5em;
}
.related-issues-loading-icon {
margin-bottom: $token_spacing_bottom;
margin-bottom: $token-spacing-bottom;
line-height: 1.75;
}
......@@ -59,7 +59,7 @@ $token_spacing_bottom: 0.5em;
.related-issues-token-list-item {
max-width: 100%;
margin-bottom: $token_spacing_bottom;
margin-bottom: $token-spacing-bottom;
margin-right: 5px;
}
......
ee/app/assets/stylesheets/pages/projects.scss
View file @ b71195b9
......@@ -26,7 +26,7 @@
}
.known-hosts {
font-family: $monospace_font;
font-family: $monospace-font;
}
.btn-show-advanced {
......
ee/app/assets/stylesheets/pages/roadmap.scss
View file @ b71195b9
......@@ -51,7 +51,7 @@ $column-right-gradient: linear-gradient(to right, rgba(0, 0, 0, 0.15) 0%, rgba(2
&.label-dark {
color: $theme-gray-900;
}
&.label-bold {
font-weight: 600;
}
......@@ -116,7 +116,7 @@ $column-right-gradient: linear-gradient(to right, rgba(0, 0, 0, 0.15) 0%, rgba(2
flex-grow: 1;
flex-basis: 0;
text-align: center;
font-size: $code_font_size;
font-size: $code-font-size;
line-height: 1.5;
padding: 2px 0;
}
......@@ -182,7 +182,7 @@ $column-right-gradient: linear-gradient(to right, rgba(0, 0, 0, 0.15) 0%, rgba(2
left: 0;
width: $details-cell-width;
padding: $gl-padding-8 $gl-padding;
font-size: $code_font_size;
font-size: $code-font-size;
background-color: $white-light;
z-index: 2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7