Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-09 19:04:14 +0300
committerRobert Speicher <robert@gitlab.com>2017-05-09 19:04:14 +0300
commitf2b72d79e8c075ff1aa0901deca7e11161643c7b (patch)
tree2ac4bb6cb150a6629e7825dc6e0de0c97344a986
parent13c228bf3bde5ae363f52202447a219da93c0d79 (diff)
parent64b4610594e6ce5577382fa71087f01e81dfeb20 (diff)
Merge branch 'dm-remove-unused-css-and-view' into 'master'
Remove unused CSS and view See merge request !11190
-rw-r--r--app/assets/stylesheets/pages/diff.scss25
-rw-r--r--app/assets/stylesheets/pages/notes.scss4
-rw-r--r--app/views/projects/blob/_markup.html.haml4
3 files changed, 0 insertions, 33 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 77f2638683a..e2769636c29 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -9,31 +9,6 @@
font-weight: 400;
}
- .diff-header {
- position: relative;
- background: $gray-light;
- border-bottom: 1px solid $border-color;
- padding: 10px 16px;
- color: $gl-text-color;
- z-index: 10;
- border-radius: 3px 3px 0 0;
-
- .diff-title {
- font-family: $monospace_font;
- word-break: break-all;
- display: block;
-
- .file-mode {
- color: $file-mode-changed;
- }
- }
-
- .commit-short-id {
- font-family: $monospace_font;
- font-size: smaller;
- }
- }
-
.file-title,
.file-title-flex-parent {
cursor: pointer;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 69c328d09ff..6d7b7031c30 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -284,10 +284,6 @@ ul.notes {
}
}
- .diff-header > span {
- margin-right: 10px;
- }
-
.line_content {
white-space: pre-wrap;
}
diff --git a/app/views/projects/blob/_markup.html.haml b/app/views/projects/blob/_markup.html.haml
deleted file mode 100644
index 0090f7a11df..00000000000
--- a/app/views/projects/blob/_markup.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- blob.load_all_data!(@repository)
-
-.file-content.wiki
- = markup(blob.name, blob.data)