summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2018-11-23 11:51:45 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2018-12-12 15:41:25 -0800
commite02ed58be9719d52d6efe476d0e0db53edab3139 (patch)
tree1b4867b5ad4ced4977b6169712668413dbfb5d1f
parente06c08496cfe7e4d46f59e5eae9636fe6f242f69 (diff)
downloadgitlab-ce-e02ed58be9719d52d6efe476d0e0db53edab3139.tar.gz
Remove framework/mobile.scss
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
-rw-r--r--app/assets/stylesheets/framework.scss1
-rw-r--r--app/assets/stylesheets/framework/mobile.scss0
-rw-r--r--changelogs/unreleased/54386-integrate-mobile-css-framework-into-specific-frameworks.yml5
3 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 834e7ffce81..62d471bc30c 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -31,7 +31,6 @@
@import 'framework/logo';
@import 'framework/markdown_area';
@import 'framework/media_object';
-@import 'framework/mobile';
@import 'framework/modal';
@import 'framework/pagination';
@import 'framework/panels';
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/app/assets/stylesheets/framework/mobile.scss
+++ /dev/null
diff --git a/changelogs/unreleased/54386-integrate-mobile-css-framework-into-specific-frameworks.yml b/changelogs/unreleased/54386-integrate-mobile-css-framework-into-specific-frameworks.yml
new file mode 100644
index 00000000000..e446d2a2781
--- /dev/null
+++ b/changelogs/unreleased/54386-integrate-mobile-css-framework-into-specific-frameworks.yml
@@ -0,0 +1,5 @@
+---
+title: Remove framework/mobile.scss
+merge_request: 23301
+author: Takuya Noguchi
+type: other