summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r--app/assets/stylesheets/framework/diffs.scss45
-rw-r--r--app/assets/stylesheets/framework/variables.scss6
2 files changed, 5 insertions, 46 deletions
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss
index 54a4769f66d..3885863999b 100644
--- a/app/assets/stylesheets/framework/diffs.scss
+++ b/app/assets/stylesheets/framework/diffs.scss
@@ -51,12 +51,11 @@
pointer-events: none;
}
- &.is-commit {
- top: calc(#{$calc-application-header-height} + #{$commit-stat-summary-height});
- }
-
- &.is-compare {
- top: calc(#{$calc-application-header-height} + #{$compare-branches-sticky-header-height});
+ &.is-commit,
+ &.is-compare,
+ &.is-wiki {
+ top: calc(#{$calc-application-header-height});
+ border-top: 0;
}
}
@@ -682,40 +681,6 @@ table.code {
}
}
-.diff-files-changed {
- background-color: $body-bg;
-
- .inline-parallel-buttons {
- @include gl-relative;
- z-index: 1;
- }
-
- @include media-breakpoint-up(sm) {
- @include gl-sticky;
- top: $calc-application-header-height;
- z-index: 200;
-
- &.is-stuck {
- @include gl-py-0;
- border-top: 1px solid $white-dark;
- border-bottom: 1px solid $white-dark;
-
- .diff-stats-additions-deletions-expanded,
- .inline-parallel-buttons {
- @include gl-display-none;
- }
- }
- }
-
- @include media-breakpoint-up(lg) {
- &.is-stuck {
- .diff-stats-additions-deletions-collapsed {
- @include gl-display-block;
- }
- }
- }
-}
-
.note-container {
background-color: $gray-light;
border-top: 1px solid $white-normal;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index dc6a5c5479c..3dd6a435a75 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -739,7 +739,6 @@ $calendar-activity-colors: (
*/
$commit-max-width-marker-color: rgba(0, 0, 0, 0);
$commit-message-text-area-bg: rgba(0, 0, 0, 0);
-$commit-stat-summary-height: 32px;
/*
* Files
@@ -916,11 +915,6 @@ Merge requests
$mr-tabs-height: 48px;
/*
-Compare Branches
-*/
-$compare-branches-sticky-header-height: 32px;
-
-/*
Board Swimlanes
*/
$board-swimlanes-headers-height: 64px;