Skip to content

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

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

Replace snake case in SCSS variables

See merge request gitlab-org/gitlab-ce!20799
parents 61bed25a a26e19cb
Show whitespace changes
Inline Side-by-side
Showing with 163 additions and 164 deletions
app/assets/stylesheets/framework/avatar.scss
View file @ 9fe58f5a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.avatar-circle { .avatar-circle {
float: left; float: left;
margin-right: 15px; margin-right: 15px;
border-radius: $avatar_radius; border-radius: $avatar-radius;
border: 1px solid $avatar-border; border: 1px solid $avatar-border;
&.s16 { @include avatar-size(16px, 6px); } &.s16 { @include avatar-size(16px, 6px); }
&.s18 { @include avatar-size(18px, 6px); } &.s18 { @include avatar-size(18px, 6px); }
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
color: $white-light; color: $white-light;
border: 1px solid $avatar-border; border: 1px solid $avatar-border;
border-radius: 1em; border-radius: 1em;
font-family: $regular_font; font-family: $regular-font;
font-size: 9px; font-size: 9px;
line-height: 16px; line-height: 16px;
text-align: center; text-align: center;
......
app/assets/stylesheets/framework/forms.scss
View file @ 9fe58f5a
...@@ -80,7 +80,7 @@ label { ...@@ -80,7 +80,7 @@ label {
.form-control { .form-control {
height: 29px; height: 29px;
background: $white-light; background: $white-light;
font-family: $monospace_font; font-family: $monospace-font;
} }
.input-group-prepend .btn, .input-group-prepend .btn,
......
app/assets/stylesheets/framework/highlight.scss
View file @ 9fe58f5a
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
padding: 10px 0; padding: 10px 0;
border: 0; border: 0;
border-radius: 0; border-radius: 0;
font-family: $monospace_font; font-family: $monospace-font;
font-size: $code_font_size; font-size: $code-font-size;
line-height: 19px; line-height: 19px;
margin: 0; margin: 0;
overflow: auto; overflow: auto;
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
code { code {
display: inline-block; display: inline-block;
min-width: 100%; min-width: 100%;
font-family: $monospace_font; font-family: $monospace-font;
white-space: normal; white-space: normal;
word-wrap: normal; word-wrap: normal;
padding: 0; padding: 0;
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
float: left; float: left;
a { a {
font-family: $monospace_font; font-family: $monospace-font;
display: block; display: block;
font-size: $code_font_size !important; font-size: $code_font_size !important;
min-height: 19px; min-height: 19px;
......
app/assets/stylesheets/framework/jquery.scss
View file @ 9fe58f5a
.ui-widget { .ui-widget {
font-family: $regular_font; font-family: $regular-font;
font-size: $font-size-base; font-size: $font-size-base;
.ui-state-default { .ui-state-default {
......
app/assets/stylesheets/framework/mixins.scss
View file @ 9fe58f5a
...@@ -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/framework/sidebar.scss
View file @ 9fe58f5a
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
&:not(.wiki-sidebar):not(.build-sidebar):not(.issuable-bulk-update-sidebar) .content-wrapper { &: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 { .merge-request-tabs-holder.affix {
right: $gutter_collapsed_width; right: $gutter-collapsed-width;
} }
} }
...@@ -67,21 +67,21 @@ ...@@ -67,21 +67,21 @@
@include media-breakpoint-only(sm) { @include media-breakpoint-only(sm) {
&:not(.wiki-sidebar):not(.build-sidebar):not(.issuable-bulk-update-sidebar) .content-wrapper { &: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) { @include media-breakpoint-up(md) {
.content-wrapper { .content-wrapper {
padding-right: $gutter_width; padding-right: $gutter-width;
} }
&:not(.with-overlay) .merge-request-tabs-holder.affix { &:not(.with-overlay) .merge-request-tabs-holder.affix {
right: $gutter_width; right: $gutter-width;
} }
&.with-overlay .merge-request-tabs-holder.affix { &.with-overlay .merge-request-tabs-holder.affix {
right: $gutter_collapsed_width; right: $gutter-collapsed-width;
} }
} }
} }
......
app/assets/stylesheets/framework/typography.scss
View file @ 9fe58f5a
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// Single code lines should wrap // Single code lines should wrap
code { code {
font-family: $monospace_font; font-family: $monospace-font;
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: normal; word-wrap: normal;
} }
...@@ -321,7 +321,7 @@ h6 { ...@@ -321,7 +321,7 @@ h6 {
/** CODE **/ /** CODE **/
pre { pre {
font-family: $monospace_font; font-family: $monospace-font;
display: block; display: block;
padding: $gl-padding-8; padding: $gl-padding-8;
margin: 0 0 $gl-padding-8; margin: 0 0 $gl-padding-8;
...@@ -342,7 +342,7 @@ code { ...@@ -342,7 +342,7 @@ code {
} }
.monospace { .monospace {
font-family: $monospace_font; font-family: $monospace-font;
} }
.weight-normal { .weight-normal {
...@@ -381,7 +381,7 @@ code { ...@@ -381,7 +381,7 @@ code {
* *
*/ */
textarea.js-gfm-input { textarea.js-gfm-input {
font-family: $monospace_font; font-family: $monospace-font;
font-size: 13px; font-size: 13px;
} }
......
app/assets/stylesheets/framework/variables.scss
View file @ 9fe58f5a
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* Layout * Layout
*/ */
$grid-size: 8px; $grid-size: 8px;
$gutter_collapsed_width: 62px; $gutter-collapsed-width: 62px;
$gutter_width: 290px; $gutter-width: 290px;
$gutter_inner_width: 250px; $gutter-inner-width: 250px;
$sidebar-transition-duration: 0.3s; $sidebar-transition-duration: 0.3s;
$sidebar-breakpoint: 1024px; $sidebar-breakpoint: 1024px;
$default-transition-duration: 0.15s; $default-transition-duration: 0.15s;
...@@ -233,8 +233,8 @@ $md-area-border: #ddd; ...@@ -233,8 +233,8 @@ $md-area-border: #ddd;
/* /*
* Code * Code
*/ */
$code_font_size: 90%; $code-font-size: 90%;
$code_line_height: 1.6; $code-line-height: 1.6;
/* /*
* Tooltips * Tooltips
...@@ -371,9 +371,9 @@ $diff-jagged-border-gradient-color: darken($white-normal, 8%); ...@@ -371,9 +371,9 @@ $diff-jagged-border-gradient-color: darken($white-normal, 8%);
/* /*
* Fonts * 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; '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'; 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
/* /*
...@@ -526,7 +526,7 @@ $issue-board-list-difference-md: $issue-board-list-difference-sm + $issue-boards ...@@ -526,7 +526,7 @@ $issue-board-list-difference-md: $issue-board-list-difference-sm + $issue-boards
/* /*
* Avatar * Avatar
*/ */
$avatar_radius: 50%; $avatar-radius: 50%;
$avatar-border: $gray-normal; $avatar-border: $gray-normal;
$avatar-border-hover: $gray-darker; $avatar-border-hover: $gray-darker;
$avatar-background: $gray-lightest; $avatar-background: $gray-lightest;
...@@ -830,8 +830,8 @@ $secondary: $gray-light; ...@@ -830,8 +830,8 @@ $secondary: $gray-light;
$input-disabled-bg: $gray-light; $input-disabled-bg: $gray-light;
$input-border-color: $theme-gray-200; $input-border-color: $theme-gray-200;
$input-color: $gl-text-color; $input-color: $gl-text-color;
$font-family-sans-serif: $regular_font; $font-family-sans-serif: $regular-font;
$font-family-monospace: $monospace_font; $font-family-monospace: $monospace-font;
$input-line-height: 20px; $input-line-height: 20px;
$btn-line-height: 20px; $btn-line-height: 20px;
$table-accent-bg: $gray-light; $table-accent-bg: $gray-light;
app/assets/stylesheets/mailers/highlighted_diff_email.scss
View file @ 9fe58f5a
...@@ -77,13 +77,13 @@ $highlighted-gc-bg: #eaf2f5; ...@@ -77,13 +77,13 @@ $highlighted-gc-bg: #eaf2f5;
.code { .code {
background-color: $white-light; background-color: $white-light;
font-family: monospace; font-family: monospace;
font-size: $code_font_size; font-size: $code-font-size;
-premailer-cellpadding: 0; -premailer-cellpadding: 0;
-premailer-cellspacing: 0; -premailer-cellspacing: 0;
-premailer-width: 100%; -premailer-width: 100%;
> tr { > tr {
line-height: $code_line_height; line-height: $code-line-height;
} }
} }
......
app/assets/stylesheets/pages/boards.scss
View file @ 9fe58f5a
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
width: 100%; width: 100%;
&.is-compact { &.is-compact {
width: calc(100% - #{$gutter_width}); width: calc(100% - #{$gutter-width});
} }
} }
} }
......
app/assets/stylesheets/pages/commits.scss
View file @ 9fe58f5a
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
.commit-message-container { .commit-message-container {
background-color: $body-bg; background-color: $body-bg;
position: relative; position: relative;
font-family: $monospace_font; font-family: $monospace-font;
$left: 12px; $left: 12px;
overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987 overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987
.max-width-marker { .max-width-marker {
......
app/assets/stylesheets/pages/cycle_analytics.scss
View file @ 9fe58f5a
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
.fa { .fa {
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
font-size: $code_font_size; font-size: $code-font-size;
} }
} }
} }
......
app/assets/stylesheets/pages/diff.scss
View file @ 9fe58f5a
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
table { table {
width: 100%; width: 100%;
font-family: $monospace_font; font-family: $monospace-font;
border: 0; border: 0;
border-collapse: separate; border-collapse: separate;
margin: 0; margin: 0;
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
} }
.line_holder td { .line_holder td {
line-height: $code_line_height; line-height: $code-line-height;
font-size: $code_font_size; font-size: $code-font-size;
&.noteable_line { &.noteable_line {
position: relative; position: relative;
......
app/assets/stylesheets/pages/editor.scss
View file @ 9fe58f5a
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
.soft-wrap-toggle { .soft-wrap-toggle {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
font-family: $regular_font; font-family: $regular-font;
} }
.soft-wrap-toggle { .soft-wrap-toggle {
......
app/assets/stylesheets/pages/environments.scss
View file @ 9fe58f5a
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
} }
.deploy-info-text-link { .deploy-info-text-link {
font-family: $monospace_font; font-family: $monospace-font;
fill: $gl-link-color; fill: $gl-link-color;
&:hover { &:hover {
......
app/assets/stylesheets/pages/issuable.scss
View file @ 9fe58f5a
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
border-bottom: 1px solid $border-gray-normal; border-bottom: 1px solid $border-gray-normal;
// This prevents the mess when resizing the sidebar // This prevents the mess when resizing the sidebar
// of elements repositioning themselves.. // of elements repositioning themselves..
width: $gutter_inner_width; width: $gutter-inner-width;
// -- // --
&.issuable-sidebar-header { &.issuable-sidebar-header {
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
} }
&.right-sidebar-expanded { &.right-sidebar-expanded {
width: $gutter_width; width: $gutter-width;
.value { .value {
line-height: 1; line-height: 1;
...@@ -377,11 +377,11 @@ ...@@ -377,11 +377,11 @@
display: block; display: block;
} }
width: $gutter_collapsed_width; width: $gutter-collapsed-width;
padding: 0; padding: 0;
.block { .block {
width: $gutter_collapsed_width - 2px; width: $gutter-collapsed-width - 2px;
padding: 15px 0 0; padding: 15px 0 0;
border-bottom: 0; border-bottom: 0;
overflow: hidden; overflow: hidden;
......
app/assets/stylesheets/pages/merge_conflicts.scss
View file @ 9fe58f5a
// Disabled to use the color map for creating color schemes // Disabled to use the color map for creating color schemes
// scss-lint:disable ColorVariable // scss-lint:disable ColorVariable
$colors: ( $colors: (
white_header_head_neutral : #e1fad7, white-header-head-neutral : #e1fad7,
white_line_head_neutral : #effdec, white-line-head-neutral : #effdec,
white_button_head_neutral : #9adb84, white-button-head-neutral : #9adb84,
white_header_head_chosen : #baf0a8, white-header-head-chosen : #baf0a8,
white_line_head_chosen : #e1fad7, white-line-head-chosen : #e1fad7,
white_button_head_chosen : #52c22d, white-button-head-chosen : #52c22d,
white_header_origin_neutral : #e0f0ff, white-header-origin-neutral : #e0f0ff,
white_line_origin_neutral : #f2f9ff, white-line-origin-neutral : #f2f9ff,
white_button_origin_neutral : #87c2fa, white-button-origin-neutral : #87c2fa,
white_header_origin_chosen : #add8ff, white-header-origin-chosen : #add8ff,
white_line_origin_chosen : #e0f0ff, white-line-origin-chosen : #e0f0ff,
white_button_origin_chosen : #268ced, white-button-origin-chosen : #268ced,
white_header_not_chosen : #f0f0f0, white-header-not-chosen : #f0f0f0,
white_line_not_chosen : $gray-light, white-line-not-chosen : $gray-light,
dark-header-head-neutral : rgba(#3f3, .2),
dark-line-head-neutral : rgba(#3f3, .1),
dark-button-head-neutral : #40874f,
dark_header_head_neutral : rgba(#3f3, .2), dark-header-head-chosen : rgba(#3f3, .33),
dark_line_head_neutral : rgba(#3f3, .1), dark-line-head-chosen : rgba(#3f3, .2),
dark_button_head_neutral : #40874f, dark-button-head-chosen : #258537,
dark_header_head_chosen : rgba(#3f3, .33), dark-header-origin-neutral : rgba(#2878c9, .4),
dark_line_head_chosen : rgba(#3f3, .2), dark-line-origin-neutral : rgba(#2878c9, .3),
dark_button_head_chosen : #258537, dark-button-origin-neutral : #2a5c8c,
dark_header_origin_neutral : rgba(#2878c9, .4), dark-header-origin-chosen : rgba(#2878c9, .6),
dark_line_origin_neutral : rgba(#2878c9, .3), dark-line-origin-chosen : rgba(#2878c9, .4),
dark_button_origin_neutral : #2a5c8c, dark-button-origin-chosen : #1d6cbf,
dark_header_origin_chosen : rgba(#2878c9, .6), dark-header-not-chosen : rgba(#fff, .25),
dark_line_origin_chosen : rgba(#2878c9, .4), dark-line-not-chosen : rgba(#fff, .1),
dark_button_origin_chosen : #1d6cbf,
dark_header_not_chosen : rgba(#fff, .25), monokai-header-head-neutral : rgba(#a6e22e, .25),
dark_line_not_chosen : rgba(#fff, .1), monokai-line-head-neutral : rgba(#a6e22e, .1),
monokai-button-head-neutral : #376b20,
monokai-header-head-chosen : rgba(#a6e22e, .4),
monokai-line-head-chosen : rgba(#a6e22e, .25),
monokai-button-head-chosen : #39800d,
monokai_header_head_neutral : rgba(#a6e22e, .25), monokai-header-origin-neutral : rgba(#60d9f1, .35),
monokai_line_head_neutral : rgba(#a6e22e, .1), monokai-line-origin-neutral : rgba(#60d9f1, .15),
monokai_button_head_neutral : #376b20, monokai-button-origin-neutral : #38848c,
monokai_header_head_chosen : rgba(#a6e22e, .4), monokai-header-origin-chosen : rgba(#60d9f1, .5),
monokai_line_head_chosen : rgba(#a6e22e, .25), monokai-line-origin-chosen : rgba(#60d9f1, .35),
monokai_button_head_chosen : #39800d, monokai-button-origin-chosen : #3ea4b2,
monokai_header_origin_neutral : rgba(#60d9f1, .35), monokai-header-not-chosen : rgba(#76715d, .24),
monokai_line_origin_neutral : rgba(#60d9f1, .15), monokai-line-not-chosen : rgba(#76715d, .1),
monokai_button_origin_neutral : #38848c,
monokai_header_origin_chosen : rgba(#60d9f1, .5), solarized-light-header-head-neutral : rgba(#859900, .37),
monokai_line_origin_chosen : rgba(#60d9f1, .35), solarized-light-line-head-neutral : rgba(#859900, .2),
monokai_button_origin_chosen : #3ea4b2, solarized-light-button-head-neutral : #afb262,
monokai_header_not_chosen : rgba(#76715d, .24), solarized-light-header-head-chosen : rgba(#859900, .5),
monokai_line_not_chosen : rgba(#76715d, .1), solarized-light-line-head-chosen : rgba(#859900, .37),
solarized-light-button-head-chosen : #94993d,
solarized-light-header-origin-neutral : rgba(#2878c9, .37),
solarized-light-line-origin-neutral : rgba(#2878c9, .15),
solarized-light-button-origin-neutral : #60a1bf,
solarized_light_header_head_neutral : rgba(#859900, .37), solarized-light-header-origin-chosen : rgba(#2878c9, .6),
solarized_light_line_head_neutral : rgba(#859900, .2), solarized-light-line-origin-chosen : rgba(#2878c9, .37),
solarized_light_button_head_neutral : #afb262, solarized-light-button-origin-chosen : #2482b2,
solarized_light_header_head_chosen : rgba(#859900, .5), solarized-light-header-not-chosen : rgba(#839496, .37),
solarized_light_line_head_chosen : rgba(#859900, .37), solarized-light-line-not-chosen : rgba(#839496, .2),
solarized_light_button_head_chosen : #94993d,
solarized_light_header_origin_neutral : rgba(#2878c9, .37), solarized-dark-header-head-neutral : rgba(#859900, .35),
solarized_light_line_origin_neutral : rgba(#2878c9, .15), solarized-dark-line-head-neutral : rgba(#859900, .15),
solarized_light_button_origin_neutral : #60a1bf, solarized-dark-button-head-neutral : #376b20,
solarized_light_header_origin_chosen : rgba(#2878c9, .6), solarized-dark-header-head-chosen : rgba(#859900, .5),
solarized_light_line_origin_chosen : rgba(#2878c9, .37), solarized-dark-line-head-chosen : rgba(#859900, .35),
solarized_light_button_origin_chosen : #2482b2, solarized-dark-button-head-chosen : #39800d,
solarized_light_header_not_chosen : rgba(#839496, .37), solarized-dark-header-origin-neutral : rgba(#2878c9, .35),
solarized_light_line_not_chosen : rgba(#839496, .2), solarized-dark-line-origin-neutral : rgba(#2878c9, .15),
solarized-dark-button-origin-neutral : #086799,
solarized-dark-header-origin-chosen : rgba(#2878c9, .6),
solarized-dark-line-origin-chosen : rgba(#2878c9, .35),
solarized-dark-button-origin-chosen : #0082cc,
solarized_dark_header_head_neutral : rgba(#859900, .35), solarized-dark-header-not-chosen : rgba(#839496, .25),
solarized_dark_line_head_neutral : rgba(#859900, .15), solarized-dark-line-not-chosen : rgba(#839496, .15)
solarized_dark_button_head_neutral : #376b20,
solarized_dark_header_head_chosen : rgba(#859900, .5),
solarized_dark_line_head_chosen : rgba(#859900, .35),
solarized_dark_button_head_chosen : #39800d,
solarized_dark_header_origin_neutral : rgba(#2878c9, .35),
solarized_dark_line_origin_neutral : rgba(#2878c9, .15),
solarized_dark_button_origin_neutral : #086799,
solarized_dark_header_origin_chosen : rgba(#2878c9, .6),
solarized_dark_line_origin_chosen : rgba(#2878c9, .35),
solarized_dark_button_origin_chosen : #0082cc,
solarized_dark_header_not_chosen : rgba(#839496, .25),
solarized_dark_line_not_chosen : rgba(#839496, .15)
); );
// scss-lint:enable ColorVariable // scss-lint:enable ColorVariable
@mixin color-scheme($color) { @mixin color-scheme($color) {
.header.line_content, .header.line_content,
.diff-line-num { .diff-line-num {
&.origin { &.origin {
background-color: map-get($colors, #{$color}_header_origin_neutral); background-color: map-get($colors, #{$color}-header-origin-neutral);
border-color: map-get($colors, #{$color}_header_origin_neutral); border-color: map-get($colors, #{$color}-header-origin-neutral);
button { button {
background-color: map-get($colors, #{$color}_button_origin_neutral); background-color: map-get($colors, #{$color}-button-origin-neutral);
border-color: darken(map-get($colors, #{$color}_button_origin_neutral), 15); border-color: darken(map-get($colors, #{$color}-button-origin-neutral), 15);
} }
&.selected { &.selected {
background-color: map-get($colors, #{$color}_header_origin_chosen); background-color: map-get($colors, #{$color}-header-origin-chosen);
border-color: map-get($colors, #{$color}_header_origin_chosen); border-color: map-get($colors, #{$color}-header-origin-chosen);
button { button {
background-color: map-get($colors, #{$color}_button_origin_chosen); background-color: map-get($colors, #{$color}-button-origin-chosen);
border-color: darken(map-get($colors, #{$color}_button_origin_chosen), 15); border-color: darken(map-get($colors, #{$color}-button-origin-chosen), 15);
} }
} }
&.unselected { &.unselected {
background-color: map-get($colors, #{$color}_header_not_chosen); background-color: map-get($colors, #{$color}-header-not-chosen);
border-color: map-get($colors, #{$color}_header_not_chosen); border-color: map-get($colors, #{$color}-header-not-chosen);
button { button {
background-color: lighten(map-get($colors, #{$color}_button_origin_neutral), 15); background-color: lighten(map-get($colors, #{$color}-button-origin-neutral), 15);
border-color: map-get($colors, #{$color}_button_origin_neutral); border-color: map-get($colors, #{$color}-button-origin-neutral);
} }
} }
} }
&.head { &.head {
background-color: map-get($colors, #{$color}_header_head_neutral); background-color: map-get($colors, #{$color}-header-head-neutral);
border-color: map-get($colors, #{$color}_header_head_neutral); border-color: map-get($colors, #{$color}-header-head-neutral);
button { button {
background-color: map-get($colors, #{$color}_button_head_neutral); background-color: map-get($colors, #{$color}-button-head-neutral);
border-color: darken(map-get($colors, #{$color}_button_head_neutral), 15); border-color: darken(map-get($colors, #{$color}-button-head-neutral), 15);
} }
&.selected { &.selected {
background-color: map-get($colors, #{$color}_header_head_chosen); background-color: map-get($colors, #{$color}-header-head-chosen);
border-color: map-get($colors, #{$color}_header_head_chosen); border-color: map-get($colors, #{$color}-header-head-chosen);
button { button {
background-color: map-get($colors, #{$color}_button_head_chosen); background-color: map-get($colors, #{$color}-button-head-chosen);
border-color: darken(map-get($colors, #{$color}_button_head_chosen), 15); border-color: darken(map-get($colors, #{$color}-button-head-chosen), 15);
} }
} }
&.unselected { &.unselected {
background-color: map-get($colors, #{$color}_header_not_chosen); background-color: map-get($colors, #{$color}-header-not-chosen);
border-color: map-get($colors, #{$color}_header_not_chosen); border-color: map-get($colors, #{$color}-header-not-chosen);
button { button {
background-color: lighten(map-get($colors, #{$color}_button_head_neutral), 15); background-color: lighten(map-get($colors, #{$color}-button-head-neutral), 15);
border-color: map-get($colors, #{$color}_button_head_neutral); border-color: map-get($colors, #{$color}-button-head-neutral);
} }
} }
} }
...@@ -169,32 +164,31 @@ $colors: ( ...@@ -169,32 +164,31 @@ $colors: (
.line_content { .line_content {
&.origin { &.origin {
background-color: map-get($colors, #{$color}_line_origin_neutral); background-color: map-get($colors, #{$color}-line-origin-neutral);
&.selected { &.selected {
background-color: map-get($colors, #{$color}_line_origin_chosen); background-color: map-get($colors, #{$color}-line-origin-chosen);
} }
&.unselected { &.unselected {
background-color: map-get($colors, #{$color}_line_not_chosen); background-color: map-get($colors, #{$color}-line-not-chosen);
} }
} }
&.head { &.head {
background-color: map-get($colors, #{$color}_line_head_neutral); background-color: map-get($colors, #{$color}-line-head-neutral);
&.selected { &.selected {
background-color: map-get($colors, #{$color}_line_head_chosen); background-color: map-get($colors, #{$color}-line-head-chosen);
} }
&.unselected { &.unselected {
background-color: map-get($colors, #{$color}_line_not_chosen); background-color: map-get($colors, #{$color}-line-not-chosen);
} }
} }
} }
} }
#conflicts { #conflicts {
.white { .white {
...@@ -210,11 +204,11 @@ $colors: ( ...@@ -210,11 +204,11 @@ $colors: (
} }
.solarized-light { .solarized-light {
@include color-scheme('solarized_light') @include color-scheme('solarized-light')
} }
.solarized-dark { .solarized-dark {
@include color-scheme('solarized_dark') @include color-scheme('solarized-dark')
} }
.diff-wrap-lines .line_content { .diff-wrap-lines .line_content {
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ 9fe58f5a
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
position: absolute; position: absolute;
content: '...'; content: '...';
right: 0; right: 0;
font-family: $regular_font; font-family: $regular-font;
background-color: $gray-light; background-color: $gray-light;
} }
} }
......
app/assets/stylesheets/pages/note_form.scss
View file @ 9fe58f5a
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
display: block; display: block;
padding: 10px 0; padding: 10px 0;
color: $gl-text-color; color: $gl-text-color;
font-family: $regular_font; font-family: $regular-font;
border: 0; border: 0;
&:focus { &:focus {
......
app/assets/stylesheets/pages/notes.scss
View file @ 9fe58f5a
...@@ -328,7 +328,7 @@ ul.notes { ...@@ -328,7 +328,7 @@ ul.notes {
} }
.notes_holder { .notes_holder {
font-family: $regular_font; font-family: $regular-font;
td { td {
border: 1px solid $white-normal; border: 1px solid $white-normal;
......
app/assets/stylesheets/pages/repo.scss
View file @ 9fe58f5a
...@@ -961,7 +961,7 @@ ...@@ -961,7 +961,7 @@
overflow: hidden; overflow: hidden;
.note-textarea { .note-textarea {
font-family: $monospace_font; font-family: $monospace-font;
} }
} }
......
app/assets/stylesheets/snippets.scss
View file @ 9fe58f5a
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
$border-style: 1px solid $border-color; $border-style: 1px solid $border-color;
font-family: $regular_font; font-family: $regular-font;
font-size: $gl-font-size; font-size: $gl-font-size;
line-height: $code_line_height; line-height: $code-line-height;
color: $gl-text-color; color: $gl-text-color;
margin: 20px; margin: 20px;
font-weight: 200; font-weight: 200;
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
padding: 10px; padding: 10px;
border: 0; border: 0;
border-radius: 0; border-radius: 0;
font-family: $monospace_font; font-family: $monospace-font;
font-size: $code_font_size; font-size: $code-font-size;
line-height: $code_line_height; line-height: $code-line-height;
margin: 0; margin: 0;
overflow: auto; overflow: auto;
overflow-y: hidden; overflow-y: hidden;
...@@ -66,10 +66,10 @@ ...@@ -66,10 +66,10 @@
float: left; float: left;
.diff-line-num { .diff-line-num {
font-family: $monospace_font; font-family: $monospace-font;
display: block; display: block;
font-size: $code_font_size; font-size: $code-font-size;
min-height: $code_line_height; min-height: $code-line-height;
white-space: nowrap; white-space: nowrap;
color: $black-transparent; color: $black-transparent;
min-width: 30px; min-width: 30px;
......
changelogs/unreleased/replace-all-snake-case-in-scss-variables.yml 0 → 100644
View file @ 9fe58f5a
---
title: Replace snake case in SCSS variables
merge_request: 20799
author: George Tsiolis
type: other
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