diff options
| author | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2016-12-16 11:28:35 +0000 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2016-12-16 11:28:35 +0000 |
| commit | 4af64c3e4e198fa0499dae585f830c814193cb5e (patch) | |
| tree | 91387aa64d93f21ac04825822e7d4a07288b545f /app/assets/stylesheets/pages/environments.scss | |
| parent | 586c40ad697dc01eeaf078e918e85cf2985e1444 (diff) | |
| parent | 45bd2263698892b9de6eb7956e3085a61054f49f (diff) | |
| download | gitlab-ce-4af64c3e4e198fa0499dae585f830c814193cb5e.tar.gz | |
Merge branch 'master' into 'badge-color-on-white-bg'
# Conflicts:
# app/assets/stylesheets/framework/nav.scss
# app/assets/stylesheets/pages/environments.scss
# app/views/layouts/nav/_group.html.haml
# app/views/layouts/nav/_project.html.haml
Diffstat (limited to 'app/assets/stylesheets/pages/environments.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 26ed43eb650..d8e4f0385b7 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -1,6 +1,8 @@ -.deployments-container { - width: 100%; - overflow: auto; +@media (max-width: $screen-md-max) { + .deployments-container { + width: 100%; + overflow: auto; + } } .environments-list-loading { @@ -64,14 +66,14 @@ .external-url, .dropdown-new { - color: $table-text-gray; + color: $gl-gray-light; } .dropdown-menu { .fa { margin-right: 6px; - color: $table-text-gray; + color: $gl-gray-light; } } @@ -82,7 +84,7 @@ .stop-env-link, .external-url { - color: $table-text-gray; + color: $gl-gray-light; .stop-env-icon { font-size: 14px; @@ -127,4 +129,4 @@ margin-right: 0; } } -} +}
\ No newline at end of file |