diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-04 08:51:06 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-12-04 08:51:06 +0000 |
| commit | 2aa8fe5766af04786e17c397c98e569c2197d703 (patch) | |
| tree | 3c844bd04f2c16bfbf9b1e7e629770f7651bf864 /app/assets | |
| parent | 03d900b6df5f6f700ffb8425f880c141cddacd3e (diff) | |
| parent | 41fc58b232f3f7e53fb27745f1add3e6b12d7a7f (diff) | |
| download | gitlab-ce-2aa8fe5766af04786e17c397c98e569c2197d703.tar.gz | |
Merge branch '5426-fe-web-terminal-empty-state-ce' into 'master'
CE Port2 of "Add empty and disabled web terminal tab"
See merge request gitlab-org/gitlab-ce!23509
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/alerts.scss | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index d320fa5f595..4041f2b4479 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -6,7 +6,6 @@ @import 'bootstrap_migration'; @import 'framework/layout'; -@import 'framework/alerts'; @import 'framework/animations'; @import 'framework/vue_transitions'; @import 'framework/avatar'; diff --git a/app/assets/stylesheets/framework/alerts.scss b/app/assets/stylesheets/framework/alerts.scss deleted file mode 100644 index 866792a6a1b..00000000000 --- a/app/assets/stylesheets/framework/alerts.scss +++ /dev/null @@ -1,4 +0,0 @@ -.alert-tip { - background-color: $theme-gray-100; - color: $theme-gray-900; -} |