diff options
| author | lauraMon <lmontemayor@gitlab.com> | 2019-08-15 17:09:52 -0700 |
|---|---|---|
| committer | lauraMon <lmontemayor@gitlab.com> | 2019-08-15 17:10:03 -0700 |
| commit | 146243da16108d22efd30b649c95091ada0a7cc1 (patch) | |
| tree | fd34d6c2429fa6dc3606476f2d3abc8a49b14a9f | |
| parent | 482642b0c985ea484a9f19d28770f0fabb760c83 (diff) | |
| download | gitlab-ce-146243da16108d22efd30b649c95091ada0a7cc1.tar.gz | |
Updated styles, removed css :D
| -rw-r--r-- | app/assets/javascripts/monitoring/components/embed.vue | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/prometheus.scss | 11 |
3 files changed, 4 insertions, 16 deletions
diff --git a/app/assets/javascripts/monitoring/components/embed.vue b/app/assets/javascripts/monitoring/components/embed.vue index bc802bab091..cde1e0520ce 100644 --- a/app/assets/javascripts/monitoring/components/embed.vue +++ b/app/assets/javascripts/monitoring/components/embed.vue @@ -91,7 +91,10 @@ export default { </script> <template> <div class="metrics-embed"> - <div v-if="charts" :class="[isSingleChart ? 'single-embedded-chart' : 'row w-100 m-n2 pb-4']"> + <div + v-if="charts" + :class="[isSingleChart ? 'col-lg-6 float-left p-0 ml-n2 mr-2 mb-2' : 'row w-100 m-n2 pb-4']" + > <monitor-area-chart v-for="graphData in charts" :key="graphData.title" diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index f7495151a71..0bf911eec0a 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -118,10 +118,6 @@ min-height: 167px; padding: 10px 0; overflow-x: auto; - - p { - clear: both; - } } .markdown-area { diff --git a/app/assets/stylesheets/pages/prometheus.scss b/app/assets/stylesheets/pages/prometheus.scss index 177ab32dc8f..72f1b5307ec 100644 --- a/app/assets/stylesheets/pages/prometheus.scss +++ b/app/assets/stylesheets/pages/prometheus.scss @@ -1,14 +1,3 @@ -.single-embedded-chart { - width: 50%; - float: left; - margin: auto 8px 8px -8px; - - @media (max-width: map-get($grid-breakpoints, md)) { - float: none; - width: 100%; - } -} - .prometheus-graphs { .dropdown-buttons { > div { |