Commit 51a63cce authored by Clement Ho's avatar Clement Ho

Merge branch 'csslab-removal' into 'master'

Remove csslab

Closes #66661

See merge request gitlab-org/gitlab-ce!32330
parents 4b23faab 7f15dacb
@import "@gitlab/csslab/dist/css/csslab-slim";
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Apply Markup (Markdown/AsciiDoc) typography * Apply Markup (Markdown/AsciiDoc) typography
* *
*/ */
.md:not(.use-csslab) { .md {
color: $gl-text-color; color: $gl-text-color;
word-wrap: break-word; word-wrap: break-word;
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
= stylesheet_link_tag "print", media: "print" = stylesheet_link_tag "print", media: "print"
= stylesheet_link_tag "test", media: "all" if Rails.env.test? = stylesheet_link_tag "test", media: "all" if Rails.env.test?
= stylesheet_link_tag 'performance_bar' if performance_bar_enabled? = stylesheet_link_tag 'performance_bar' if performance_bar_enabled?
= stylesheet_link_tag 'csslab' if Feature.enabled?(:csslab)
= stylesheet_link_tag "highlight/themes/#{user_color_scheme}", media: "all" = stylesheet_link_tag "highlight/themes/#{user_color_scheme}", media: "all"
......
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
= render "projects/blob/auxiliary_viewer", blob: blob = render "projects/blob/auxiliary_viewer", blob: blob
#blob-content-holder.blob-content-holder #blob-content-holder.blob-content-holder
%article.file-holder{ class: ('use-csslab' if Feature.enabled?(:csslab)) } %article.file-holder
= render 'projects/blob/header', blob: blob = render 'projects/blob/header', blob: blob
= render 'projects/blob/content', blob: blob = render 'projects/blob/content', blob: blob
- if markup?(@blob.name) - if markup?(@blob.name)
.file-content.md.md-file{ class: ('use-csslab' if Feature.enabled?(:csslab)) } .file-content.md.md-file
= markup(@blob.name, @content) = markup(@blob.name, @content)
- else - else
.diff-file .diff-file
......
- blob = viewer.blob - blob = viewer.blob
- context = blob.respond_to?(:rendered_markup) ? { rendered: blob.rendered_markup } : {} - context = blob.respond_to?(:rendered_markup) ? { rendered: blob.rendered_markup } : {}
.file-content.md.md-file{ class: ('use-csslab' if Feature.enabled?(:csslab)) } .file-content.md.md-file
= markup(blob.name, blob.data, context) = markup(blob.name, blob.data, context)
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= render 'shared/snippets/header' = render 'shared/snippets/header'
.project-snippets .project-snippets
%article.file-holder.snippet-file-content{ class: ('use-csslab' if Feature.enabled?(:csslab)) } %article.file-holder.snippet-file-content
= render 'shared/snippets/blob' = render 'shared/snippets/blob'
.row-content-block.top-block.content-component-block .row-content-block.top-block.content-component-block
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
= (s_("WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}.") % { most_recent_link: most_recent_link, history_link: history_link }).html_safe = (s_("WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}.") % { most_recent_link: most_recent_link, history_link: history_link }).html_safe
.prepend-top-default.append-bottom-default .prepend-top-default.append-bottom-default
.md.md-file{ class: ('use-csslab' if Feature.enabled?(:csslab)) } .md.md-file
= render_wiki_content(@page) = render_wiki_content(@page)
= render 'sidebar' = render 'sidebar'
...@@ -165,7 +165,6 @@ module Gitlab ...@@ -165,7 +165,6 @@ module Gitlab
config.assets.precompile << "locale/**/app.js" config.assets.precompile << "locale/**/app.js"
config.assets.precompile << "emoji_sprites.css" config.assets.precompile << "emoji_sprites.css"
config.assets.precompile << "errors.css" config.assets.precompile << "errors.css"
config.assets.precompile << "csslab.css"
config.assets.precompile << "highlight/themes/*.css" config.assets.precompile << "highlight/themes/*.css"
......
...@@ -1047,8 +1047,6 @@ code base. Examples of backports include the following: ...@@ -1047,8 +1047,6 @@ code base. Examples of backports include the following:
Here is a workflow to make sure those changes end up backported safely into CE too. Here is a workflow to make sure those changes end up backported safely into CE too.
(This approach does not refer to changes introduced via [csslab](https://gitlab.com/gitlab-org/csslab/).)
1. **Make your changes in the EE branch.** If possible, keep a separated commit (to be squashed) to help backporting and review. 1. **Make your changes in the EE branch.** If possible, keep a separated commit (to be squashed) to help backporting and review.
1. **Open merge request to EE project.** 1. **Open merge request to EE project.**
1. **Apply the changes you made to CE files in a branch of the CE project.** (Tip: Use `patch` with the diff from your commit in EE branch) 1. **Apply the changes you made to CE files in a branch of the CE project.** (Tip: Use `patch` with the diff from your commit in EE branch)
......
...@@ -14,7 +14,6 @@ describe "User browses files" do ...@@ -14,7 +14,6 @@ describe "User browses files" do
before do before do
stub_feature_flags(vue_file_list: false) stub_feature_flags(vue_file_list: false)
stub_feature_flags(csslab: false)
sign_in(user) sign_in(user)
end end
......
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
@babel/template,7.1.2,MIT @babel/template,7.1.2,MIT
@babel/traverse,7.1.0,MIT @babel/traverse,7.1.0,MIT
@babel/types,7.1.2,MIT @babel/types,7.1.2,MIT
@gitlab/csslab,1.8.0,MIT
@gitlab/svgs,1.41.0,MIT @gitlab/svgs,1.41.0,MIT
@gitlab/ui,1.15.0,MIT @gitlab/ui,1.15.0,MIT
@sindresorhus/is,0.7.0,MIT @sindresorhus/is,0.7.0,MIT
......
...@@ -964,13 +964,6 @@ ...@@ -964,13 +964,6 @@
exec-sh "^0.3.2" exec-sh "^0.3.2"
minimist "^1.2.0" minimist "^1.2.0"
"@gitlab/csslab@^1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@gitlab/csslab/-/csslab-1.9.0.tgz#22fca5b1a30cbd9ca46fc6f9485ecbaba4dc300c"
integrity sha512-Zjayzokm7E2wgxUR/pxIMocdiBB5XHt2PEemdzD8qD+aQmMpMxSyIEMQk5Jq0Wgv+Rd5WXTolTw3kmb9l8ZeJg==
dependencies:
bootstrap "^4.1.3"
"@gitlab/eslint-config@^1.6.0": "@gitlab/eslint-config@^1.6.0":
version "1.6.0" version "1.6.0"
resolved "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.6.0.tgz#1fd247d6ab477d53d4c330e05f007e3afa303689" resolved "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.6.0.tgz#1fd247d6ab477d53d4c330e05f007e3afa303689"
...@@ -2268,7 +2261,7 @@ bootstrap-vue@2.0.0-rc.27: ...@@ -2268,7 +2261,7 @@ bootstrap-vue@2.0.0-rc.27:
portal-vue "^2.1.5" portal-vue "^2.1.5"
vue-functional-data-merge "^3.1.0" vue-functional-data-merge "^3.1.0"
bootstrap@4.3.1, bootstrap@^4.1.3, bootstrap@^4.3.1: bootstrap@4.3.1, bootstrap@^4.3.1:
version "4.3.1" version "4.3.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag== integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
......
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