From dd195580fabde9966888f5c8a0ecf7a73992364d Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Tue, 26 Mar 2019 09:59:29 +0000 Subject: [PATCH] Removes EE differences for issues.scss --- app/assets/stylesheets/pages/issues.scss | 106 -------------------- ee/app/assets/stylesheets/pages/issues.scss | 105 +++++++++++++++++++ 2 files changed, 105 insertions(+), 106 deletions(-) create mode 100644 ee/app/assets/stylesheets/pages/issues.scss diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 69d9acb0b6956a..c7d2369a6b8459 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -294,109 +294,3 @@ ul.related-merge-requests > li { text-align: right; } } - -.issue-token { - display: inline-flex; - align-items: stretch; - max-width: 100%; - line-height: 1.75; - white-space: nowrap; -} - -.issue-token-link { - display: inline-flex; - min-width: 0; - - color: $gl-text-color-secondary; - - &[href] { - color: $blue-600; - } - - &:hover, - &:focus { - outline: none; - text-decoration: none; - } -} - -.issue-token-reference { - display: flex; - align-items: center; - margin-right: 1px; - padding-left: 0.5em; - padding-right: 0.5em; - background-color: $gray-lighter; - border-top-left-radius: 2px; - border-bottom-left-radius: 2px; - transition: background $general-hover-transition-duration $general-hover-transition-curve, color $general-hover-transition-duration $general-hover-transition-curve; - - .issue-token:hover &, - .issue-token-link:focus > & { - background-color: $gray-normal; - color: $blue-800; - text-decoration: none; - } -} - -.issue-token-state-icon-open { - color: $green-500; -} - -.issue-token-state-icon-closed { - color: $blue-500; -} - -.issue-token-title { - overflow: hidden; - display: flex; - align-items: baseline; - padding-left: 0.5em; - background-color: $gray-normal; - color: $gl-text-color-secondary; - transition: background $general-hover-transition-duration $general-hover-transition-curve; - - .issue-token:hover &, - .issue-token-link:focus > & { - background-color: $border-gray-normal; - } - - > .fa { - line-height: inherit; - } -} - -.issue-token-title-standalone { - padding-right: 0.5em; - border-top-right-radius: 2px; - border-bottom-right-radius: 2px; -} - -.issue-token-title-text { - overflow: hidden; - text-overflow: ellipsis; -} - -.issue-token-remove-button { - display: flex; - align-items: center; - padding: 0 0.5em; - background-color: $gray-normal; - border: 0; - border-top-right-radius: 2px; - border-bottom-right-radius: 2px; - color: $gl-text-color-secondary; - transition: background $general-hover-transition-duration $general-hover-transition-curve; - - &:hover, - &:focus, - .issue-token:hover &, - .issue-token-link:focus + & { - background-color: $border-gray-normal; - outline: none; - } - - > .fa { - font-size: 0.9em; - } -} diff --git a/ee/app/assets/stylesheets/pages/issues.scss b/ee/app/assets/stylesheets/pages/issues.scss new file mode 100644 index 00000000000000..9e4621958c60a9 --- /dev/null +++ b/ee/app/assets/stylesheets/pages/issues.scss @@ -0,0 +1,105 @@ +.issue-token { + display: inline-flex; + align-items: stretch; + max-width: 100%; + line-height: 1.75; + white-space: nowrap; +} + +.issue-token-link { + display: inline-flex; + min-width: 0; + + color: $gl-text-color-secondary; + + &[href] { + color: $blue-600; + } + + &:hover, + &:focus { + outline: none; + text-decoration: none; + } +} + +.issue-token-reference { + display: flex; + align-items: center; + margin-right: 1px; + padding-left: 0.5em; + padding-right: 0.5em; + background-color: $gray-lighter; + border-top-left-radius: 2px; + border-bottom-left-radius: 2px; + transition: background $general-hover-transition-duration $general-hover-transition-curve, color $general-hover-transition-duration $general-hover-transition-curve; + + .issue-token:hover &, + .issue-token-link:focus > & { + background-color: $gray-normal; + color: $blue-800; + text-decoration: none; + } +} + +.issue-token-state-icon-open { + color: $green-500; +} + +.issue-token-state-icon-closed { + color: $blue-500; +} + +.issue-token-title { + overflow: hidden; + display: flex; + align-items: baseline; + padding-left: 0.5em; + background-color: $gray-normal; + color: $gl-text-color-secondary; + transition: background $general-hover-transition-duration $general-hover-transition-curve; + + .issue-token:hover &, + .issue-token-link:focus > & { + background-color: $border-gray-normal; + } + + > .fa { + line-height: inherit; + } +} + +.issue-token-title-standalone { + padding-right: 0.5em; + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; +} + +.issue-token-title-text { + overflow: hidden; + text-overflow: ellipsis; +} + +.issue-token-remove-button { + display: flex; + align-items: center; + padding: 0 0.5em; + background-color: $gray-normal; + border: 0; + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; + color: $gl-text-color-secondary; + transition: background $general-hover-transition-duration $general-hover-transition-curve; + + &:hover, + &:focus, + .issue-token:hover &, + .issue-token-link:focus + & { + background-color: $border-gray-normal; + outline: none; + } + + > .fa { + font-size: 0.9em; + } +} -- GitLab