summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-06-24 14:40:18 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-06-24 14:40:18 +0000
commitf53b05cfde5aeac73a7c81a2fe951b5642338ae0 (patch)
tree4b6d41b4b4ef6acd7db04988615fdeffa6345e4b /app/assets/stylesheets
parent108c3cf16bed5733ffae086fb62c226961356560 (diff)
parent039117deacf730286d6e1b0b6bc116d62c3b9c31 (diff)
downloadgitlab-ce-f53b05cfde5aeac73a7c81a2fe951b5642338ae0.tar.gz
Merge branch 'divergence-graph-fe-rendering' into 'master'
Render branch divergence graph with Vue See merge request gitlab-org/gitlab-ce!29743
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/branches.scss36
1 files changed, 0 insertions, 36 deletions
diff --git a/app/assets/stylesheets/pages/branches.scss b/app/assets/stylesheets/pages/branches.scss
index ce0622b3d48..e1715b8e1bf 100644
--- a/app/assets/stylesheets/pages/branches.scss
+++ b/app/assets/stylesheets/pages/branches.scss
@@ -14,62 +14,26 @@
$graph-side-width: 80px;
$graph-separator-width: 1px;
- padding: 0 6px;
-
.graph-side {
- position: relative;
width: $graph-side-width;
- height: 22px;
- padding: 5px 0 13px;
- float: left;
&.full {
width: $graph-side-width * 2 + $graph-separator-width;
- display: flex;
- justify-content: center;
}
.bar {
- position: absolute;
height: 4px;
background-color: $gl-gray-200;
}
- .bar-behind {
- right: 0;
- border-radius: 3px 0 0 3px;
- }
-
- .bar-ahead {
- left: 0;
- border-radius: 0 3px 3px 0;
- }
-
.count {
- padding-top: 6px;
- padding-bottom: 0;
font-size: 12px;
- color: $gl-text-color;
- display: block;
- }
-
- .count-behind {
- padding-right: 4px;
- text-align: right;
- }
-
- .count-ahead {
- padding-left: 4px;
- text-align: left;
}
}
.graph-separator {
- position: relative;
width: $graph-separator-width;
height: 18px;
- margin: 5px 0 0;
- float: left;
background-color: $gl-gray-200;
}
}