Skip to content

G
gitlab-ce
Commit 125809ce authored by Clement Ho's avatar Clement Ho
Browse files
Options

Merge branch 'scss-variables-2' into 'master' 

Remove scss variables, part 2

See merge request gitlab-org/gitlab-ce!21169
parents e610b41e 65827c42
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 74 deletions
app/assets/stylesheets/bootstrap_migration.scss
View file @ 125809ce
...@@ -85,7 +85,7 @@ strong { ...@@ -85,7 +85,7 @@ strong {
} }
a { a {
color: $gl-link-color; color: $blue-600;
} }
hr { hr {
......
app/assets/stylesheets/framework/buttons.scss
View file @ 125809ce
...@@ -434,7 +434,7 @@ ...@@ -434,7 +434,7 @@
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
color: $gl-link-color; color: $blue-600;
text-decoration: none; text-decoration: none;
} }
} }
...@@ -445,7 +445,7 @@ ...@@ -445,7 +445,7 @@
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
color: $gl-link-color; color: $blue-600;
text-decoration: none; text-decoration: none;
} }
} }
......
app/assets/stylesheets/framework/common.scss
View file @ 125809ce
...@@ -114,7 +114,7 @@ hr { ...@@ -114,7 +114,7 @@ hr {
.item-title { font-weight: $gl-font-weight-bold; } .item-title { font-weight: $gl-font-weight-bold; }
.author-link { .author-link {
color: $gl-link-color; color: $blue-600;
} }
.back-link { .back-link {
......
app/assets/stylesheets/framework/files.scss
View file @ 125809ce
...@@ -286,19 +286,19 @@ span.idiff { ...@@ -286,19 +286,19 @@ span.idiff {
.new-file { .new-file {
a { a {
color: $gl-text-green; color: $green-600;
} }
} }
.renamed-file { .renamed-file {
a { a {
color: $gl-text-orange; color: $orange-600;
} }
} }
.deleted-file { .deleted-file {
a { a {
color: $gl-text-red; color: $red-500;
} }
} }
......
app/assets/stylesheets/framework/flash.scss
View file @ 125809ce
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
color: $gl-text-color; color: $gl-text-color;
a { a {
color: $gl-link-color; color: $blue-600;
&:hover { &:hover {
color: $gl-link-hover-color; color: $blue-800;
text-decoration: none; text-decoration: none;
} }
} }
......
app/assets/stylesheets/framework/forms.scss
View file @ 125809ce
...@@ -170,7 +170,7 @@ label { ...@@ -170,7 +170,7 @@ label {
} }
.form-control::-webkit-input-placeholder { .form-control::-webkit-input-placeholder {
color: $placeholder-text-color; color: $gl-text-color-tertiary;
} }
.input-group { .input-group {
......
app/assets/stylesheets/framework/markdown_area.scss
View file @ 125809ce
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
&:hover, &:hover,
&:focus { &:focus {
svg { svg {
fill: $gl-link-color; fill: $blue-600;
} }
} }
} }
......
app/assets/stylesheets/framework/typography.scss
View file @ 125809ce
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
} }
a > code { a > code {
color: $gl-link-color; color: $blue-600;
} }
dd { dd {
...@@ -423,25 +423,25 @@ h4 { ...@@ -423,25 +423,25 @@ h4 {
input, input,
textarea { textarea {
&::-webkit-input-placeholder { &::-webkit-input-placeholder {
color: $placeholder-text-color; color: $gl-text-color-tertiary;
} }
// support firefox 19+ vendor prefix // support firefox 19+ vendor prefix
&::-moz-placeholder { &::-moz-placeholder {
color: $placeholder-text-color; color: $gl-text-color-tertiary;
opacity: 1; // FF defaults to 0.54 opacity: 1; // FF defaults to 0.54
} }
// scss-lint:disable PseudoElement // scss-lint:disable PseudoElement
// support Edge vendor prefix // support Edge vendor prefix
&::-ms-input-placeholder { &::-ms-input-placeholder {
color: $placeholder-text-color; color: $gl-text-color-tertiary;
} }
// scss-lint:disable PseudoElement // scss-lint:disable PseudoElement
// support IE vendor prefix // support IE vendor prefix
&:-ms-input-placeholder { &:-ms-input-placeholder {
color: $placeholder-text-color; color: $gl-text-color-tertiary;
} }
} }
......
app/assets/stylesheets/framework/variables.scss
View file @ 125809ce
...@@ -195,19 +195,10 @@ $gl-text-color-quaternary: #d6d6d6; ...@@ -195,19 +195,10 @@ $gl-text-color-quaternary: #d6d6d6;
$gl-text-color-inverted: rgba(255, 255, 255, 1); $gl-text-color-inverted: rgba(255, 255, 255, 1);
$gl-text-color-secondary-inverted: rgba(255, 255, 255, 0.85); $gl-text-color-secondary-inverted: rgba(255, 255, 255, 0.85);
$gl-text-color-disabled: #919191; $gl-text-color-disabled: #919191;
$gl-text-green: $green-600;
$gl-text-green-hover: $green-700;
$gl-text-red: $red-500;
$gl-text-orange: $orange-600;
$gl-link-color: $blue-600;
$gl-link-hover-color: $blue-800;
$gl-grayish-blue: #7f8fa4; $gl-grayish-blue: #7f8fa4;
$gl-gray: $gl-text-color;
$gl-gray-dark: #313236; $gl-gray-dark: #313236;
$gl-gray-light: #5c5c5c; $gl-gray-light: #5c5c5c;
$gl-header-color: #4c4e54; $gl-header-color: #4c4e54;
$gl-header-nav-hover-color: #434343;
$placeholder-text-color: $gl-text-color-tertiary;
/* /*
* Lists * Lists
...@@ -226,7 +217,7 @@ $list-warning-row-color: $orange-700; ...@@ -226,7 +217,7 @@ $list-warning-row-color: $orange-700;
/* /*
* Markdown * Markdown
*/ */
$md-link-color: $gl-link-color; $md-link-color: $blue-600;
$md-area-border: #ddd; $md-area-border: #ddd;
/* /*
...@@ -583,8 +574,8 @@ $commit-message-text-area-bg: rgba(0, 0, 0, 0); ...@@ -583,8 +574,8 @@ $commit-message-text-area-bg: rgba(0, 0, 0, 0);
$common-gray: $gl-text-color; $common-gray: $gl-text-color;
$common-gray-light: #bbb; $common-gray-light: #bbb;
$common-gray-dark: #444; $common-gray-dark: #444;
$common-red: $gl-text-red; $common-red: $red-500;
$common-green: $gl-text-green; $common-green: $green-600;
/* /*
* Editor * Editor
......
app/assets/stylesheets/framework/zen.scss
View file @ 125809ce
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
&:hover { &:hover {
color: $gl-link-color; color: $blue-600;
text-decoration: none; text-decoration: none;
} }
} }
......
app/assets/stylesheets/page_bundles/ide.scss
View file @ 125809ce
...@@ -1158,7 +1158,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; ...@@ -1158,7 +1158,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
} }
a { a {
color: $gl-link-color; color: $blue-600;
} }
} }
......
app/assets/stylesheets/pages/boards.scss
View file @ 125809ce
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
outline: 0; outline: 0;
&:hover { &:hover {
color: $gl-link-color; color: $blue-600;
} }
} }
......
app/assets/stylesheets/pages/builds.scss
View file @ 125809ce
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
color: $gl-text-color; color: $gl-text-color;
&:hover { &:hover {
color: $gl-link-color; color: $blue-600;
text-decoration: none; text-decoration: none;
} }
} }
......
app/assets/stylesheets/pages/commits.scss
View file @ 125809ce
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
} }
&.autodevops-link { &.autodevops-link {
color: $gl-link-color; color: $blue-600;
} }
} }
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
} }
.commit-sha { .commit-sha {
color: $gl-link-color; color: $blue-600;
} }
.commit-row-message { .commit-row-message {
......
app/assets/stylesheets/pages/cycle_analytics.scss
View file @ 125809ce
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
} }
.commit-sha { .commit-sha {
color: $gl-link-color; color: $blue-600;
line-height: 1.3; line-height: 1.3;
vertical-align: top; vertical-align: top;
font-weight: $gl-font-weight-normal; font-weight: $gl-font-weight-normal;
......
app/assets/stylesheets/pages/diff.scss
View file @ 125809ce
...@@ -511,13 +511,13 @@ ...@@ -511,13 +511,13 @@
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
color: $gl-link-color; color: $blue-600;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
&:hover, &:hover,
&:focus { &:focus {
outline: none; outline: none;
color: $gl-link-hover-color; color: $blue-800;
} }
.caret-icon { .caret-icon {
......
app/assets/stylesheets/pages/environments.scss
View file @ 125809ce
...@@ -479,10 +479,10 @@ ...@@ -479,10 +479,10 @@
.deploy-info-text-link { .deploy-info-text-link {
font-family: $monospace-font; font-family: $monospace-font;
fill: $gl-link-color; fill: $blue-600;
&:hover { &:hover {
fill: $gl-link-hover-color; fill: $blue-800;
} }
} }
......
app/assets/stylesheets/pages/graph.scss
View file @ 125809ce
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
} }
.graph-additions { .graph-additions {
color: $gl-text-green; color: $green-600;
} }
.graph-deletions { .graph-deletions {
color: $gl-text-red; color: $red-500;
} }
} }
......
app/assets/stylesheets/pages/issuable.scss
View file @ 125809ce
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
color: inherit; color: inherit;
&:hover { &:hover {
color: $gl-link-hover-color; color: $blue-800;
.avatar { .avatar {
border-color: rgba($avatar-border, .2); border-color: rgba($avatar-border, .2);
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
color: $gl-link-hover-color; color: $blue-800;
} }
} }
} }
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
} }
.btn-secondary-hover-link:hover { .btn-secondary-hover-link:hover {
color: $gl-link-color; color: $blue-600;
} }
.sidebar-collapsed-icon { .sidebar-collapsed-icon {
...@@ -448,8 +448,8 @@ ...@@ -448,8 +448,8 @@
} }
.todo-undone { .todo-undone {
color: $gl-link-color; color: $blue-600;
fill: $gl-link-color; fill: $blue-600;
} }
.author { .author {
......
app/assets/stylesheets/pages/issues.scss
View file @ 125809ce
...@@ -157,7 +157,7 @@ ul.related-merge-requests > li { ...@@ -157,7 +157,7 @@ ul.related-merge-requests > li {
.issuable-email-modal-btn { .issuable-email-modal-btn {
padding: 0; padding: 0;
color: $gl-link-color; color: $blue-600;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
outline: 0; outline: 0;
...@@ -190,7 +190,7 @@ ul.related-merge-requests > li { ...@@ -190,7 +190,7 @@ ul.related-merge-requests > li {
.create-mr-dropdown-wrap { .create-mr-dropdown-wrap {
.ref::selection { .ref::selection {
color: $placeholder-text-color; color: $gl-text-color-tertiary;
} }
.dropdown { .dropdown {
......
app/assets/stylesheets/pages/labels.scss
View file @ 125809ce
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
} }
&:hover { &:hover {
color: $gl-link-color; color: $blue-600;
&.remove-row { &.remove-row {
color: $gl-danger; color: $gl-danger;
...@@ -343,10 +343,10 @@ ...@@ -343,10 +343,10 @@
&.remove-row { &.remove-row {
&:hover { &:hover {
color: $gl-text-red; color: $red-500;
svg { svg {
fill: $gl-text-red; fill: $red-500;
} }
} }
} }
......
app/assets/stylesheets/pages/milestone.scss
View file @ 125809ce
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.milestone-progress { .milestone-progress {
a { a {
color: $gl-link-color; color: $blue-600;
} }
} }
......
app/assets/stylesheets/pages/note_form.scss
View file @ 125809ce
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
&:hover, &:hover,
&:focus { &:focus {
color: $gl-link-color; color: $blue-600;
outline: 0; outline: 0;
} }
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
.uploading-error-icon, .uploading-error-icon,
.uploading-error-message { .uploading-error-message {
color: $gl-text-red; color: $red-500;
} }
.uploading-error-message { .uploading-error-message {
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
.attach-new-file, .attach-new-file,
.button-attach-file, .button-attach-file,
.retry-uploading-link { .retry-uploading-link {
color: $gl-link-color; color: $blue-600;
padding: 0; padding: 0;
background: none; background: none;
border: 0; border: 0;
...@@ -452,5 +452,5 @@ ...@@ -452,5 +452,5 @@
} }
.markdown-selector { .markdown-selector {
color: $gl-link-color; color: $blue-600;
} }
app/assets/stylesheets/pages/notes.scss
View file @ 125809ce
...@@ -210,7 +210,7 @@ ul.notes { ...@@ -210,7 +210,7 @@ ul.notes {
} }
a { a {
color: $gl-link-color; color: $blue-600;
} }
p { p {
...@@ -253,14 +253,14 @@ ul.notes { ...@@ -253,14 +253,14 @@ ul.notes {
overflow: hidden; overflow: hidden;
.system-note-commit-list-toggler { .system-note-commit-list-toggler {
color: $gl-link-color; color: $blue-600;
padding: 10px 0 0; padding: 10px 0 0;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
z-index: 2; z-index: 2;
&:hover { &:hover {
color: $gl-link-color; color: $blue-600;
text-decoration: underline; text-decoration: underline;
} }
} }
...@@ -390,7 +390,7 @@ ul.notes { ...@@ -390,7 +390,7 @@ ul.notes {
color: inherit; color: inherit;
&:hover { &:hover {
color: $gl-link-color; color: $blue-600;
} }
&:focus, &:focus,
...@@ -451,7 +451,7 @@ ul.notes { ...@@ -451,7 +451,7 @@ ul.notes {
.discussion-headline-light { .discussion-headline-light {
a { a {
color: $gl-link-color; color: $blue-600;
} }
} }
...@@ -560,12 +560,12 @@ ul.notes { ...@@ -560,12 +560,12 @@ ul.notes {
&:hover, &:hover,
&.is-active { &.is-active {
.danger-highlight { .danger-highlight {
color: $gl-text-red; color: $red-500;
} }
.link-highlight { .link-highlight {
color: $gl-link-color; color: $blue-600;
fill: $gl-link-color; fill: $blue-600;
} }
.award-control-icon-neutral { .award-control-icon-neutral {
...@@ -597,13 +597,13 @@ ul.notes { ...@@ -597,13 +597,13 @@ ul.notes {
transition: color 0.1s linear; transition: color 0.1s linear;
&:hover { &:hover {
color: $gl-link-color; color: $blue-600;
} }
&:focus { &:focus {
text-decoration: underline; text-decoration: underline;
outline: none; outline: none;
color: $gl-link-color; color: $blue-600;
} }
.fa { .fa {
...@@ -673,7 +673,7 @@ ul.notes { ...@@ -673,7 +673,7 @@ ul.notes {
} }
a { a {
color: $gl-link-color; color: $blue-600;
} }
} }
...@@ -759,16 +759,16 @@ ul.notes { ...@@ -759,16 +759,16 @@ ul.notes {
&:not(.is-disabled) { &:not(.is-disabled) {
&:hover, &:hover,
&:focus { &:focus {
color: $gl-text-green; color: $green-600;
} }
} }
&.is-active { &.is-active {
color: $gl-text-green; color: $green-600;
&:hover, &:hover,
&:focus { &:focus {
color: $gl-text-green-hover; color: $green-700;
} }
} }
......
app/assets/stylesheets/pages/pipelines.scss
View file @ 125809ce
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
} }
.commit-sha { .commit-sha {
color: $gl-link-color; color: $blue-600;
} }
.badge { .badge {
......
app/assets/stylesheets/pages/projects.scss
View file @ 125809ce
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
line-height: $gl-btn-line-height; line-height: $gl-btn-line-height;
&:hover { &:hover {
color: $gl-link-color; color: $blue-600;
} }
} }
} }
...@@ -961,7 +961,7 @@ pre.light-well { ...@@ -961,7 +961,7 @@ pre.light-well {
margin-left: 5px; margin-left: 5px;
&.is-done { &.is-done {
color: $gl-text-green; color: $green-600;
} }
} }
......
app/assets/stylesheets/pages/search.scss
View file @ 125809ce
...@@ -259,6 +259,6 @@ input[type='checkbox']:hover { ...@@ -259,6 +259,6 @@ input[type='checkbox']:hover {
&:hover, &:hover,
&:focus { &:focus {
color: $gl-link-color; color: $blue-600;
} }
} }
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