From 49ce38ea0462f191f0c19d345095e1b97634bc7e Mon Sep 17 00:00:00 2001 From: Sam Chow Date: Fri, 27 Apr 2018 10:01:00 -0400 Subject: [PATCH] Add styling for overflowing table & dropdown robot Bound modal box by container, remove !important The important was introduced as a fix to https://jira.coreos.com/browse/QUAY-881 However, after removal it does not seem to be necessary (Cannot reproduce with the !important gone). Adds bounding for the modal boxes & title Joins the username/password for robot in box --- static/css/directives/ui/cor-tabs.css | 4 +- .../css/directives/ui/credentials-dialog.css | 45 ++++++++++++++++++- static/css/directives/ui/robots-manager.css | 14 ++++++ static/css/directives/ui/teams-manager.css | 6 +++ static/css/quay.css | 2 +- static/directives/credentials-dialog.html | 14 +++--- static/directives/robots-manager.html | 4 +- 7 files changed, 77 insertions(+), 12 deletions(-) diff --git a/static/css/directives/ui/cor-tabs.css b/static/css/directives/ui/cor-tabs.css index 2b91e892c..9311fc5bf 100644 --- a/static/css/directives/ui/cor-tabs.css +++ b/static/css/directives/ui/cor-tabs.css @@ -12,7 +12,7 @@ } .vertical .co-tab-content { - width: 91.66666667% !important; + width: 91.66666667%; } .horizontal-label { @@ -295,6 +295,8 @@ .co-dialog .co-tab-content h3 { margin-top: 0px; margin-bottom: 0px; + overflow: hidden; + text-overflow: ellipsis; } .co-dialog .co-tab-content label { diff --git a/static/css/directives/ui/credentials-dialog.css b/static/css/directives/ui/credentials-dialog.css index 88adb8276..8ba2d669d 100644 --- a/static/css/directives/ui/credentials-dialog.css +++ b/static/css/directives/ui/credentials-dialog.css @@ -29,4 +29,47 @@ .credentials-dialog-element pre { margin-top: 20px; -} \ No newline at end of file +} + +.credentials-dialog-element .dialog-title { + padding-right: 5px; + overflow: hidden; + text-overflow: ellipsis; +} + +.credentials-dialog-element .dialog-title-header { + display: flex; + align-items: flex-start; + justify-content: space-between; + white-space: nowrap; +} + +.conjoined-box-wrapper input { + box-shadow: none; + outline: none; +} + +.conjoined-box-wrapper { + border: 1px solid #999; + border-radius: 4px; +} + +.conjoined-box-wrapper .conjoined-box-top .copy-container { + border: none; + margin: 5px; +} + +.conjoined-box-wrapper .conjoined-box-bottom .copy-container { + border: none; + margin: 5px; + border-top: 1px solid #999; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +/* Ensure content is bounded unless small screen */ +@media screen and (min-width: 768px) { + .credentials-dialog .co-tab-content { + width: 62%; + } +} diff --git a/static/css/directives/ui/robots-manager.css b/static/css/directives/ui/robots-manager.css index 01d5924ac..8896b613f 100644 --- a/static/css/directives/ui/robots-manager.css +++ b/static/css/directives/ui/robots-manager.css @@ -1,5 +1,19 @@ .robots-manager-element .robot { white-space: nowrap; + max-width: 550px; +} + +.robots-manager-element .robot-account-name { + display: inline-block; + text-overflow: ellipsis; + overflow: hidden; + max-width: 90%; +} + +.robots-manager-element .robots-description { + word-break: break-all; + max-width: 500px; + display: inline-block; } .robots-manager-element .robot a { diff --git a/static/css/directives/ui/teams-manager.css b/static/css/directives/ui/teams-manager.css index 4c7c6e6b5..706c4b3d8 100644 --- a/static/css/directives/ui/teams-manager.css +++ b/static/css/directives/ui/teams-manager.css @@ -30,6 +30,12 @@ margin-left: 10px; } +.cor-option a { + max-width: 500px; + overflow: hidden; + text-overflow: ellipsis; +} + .teams-manager td .empty { color: #ccc; } diff --git a/static/css/quay.css b/static/css/quay.css index c0c42532c..575a8fa52 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -1510,7 +1510,7 @@ p.editable:hover i { } .copy-box-element .copy-container { - border-radius: 4px !important; + border-radius: 4px; border: 1px solid #ddd; position: relative; } diff --git a/static/directives/credentials-dialog.html b/static/directives/credentials-dialog.html index e845622b8..82f4a4eaf 100644 --- a/static/directives/credentials-dialog.html +++ b/static/directives/credentials-dialog.html @@ -36,17 +36,17 @@ -

- Credentials for {{ credentials.title || credentials.username }} +

+
Credentials for {{ credentials.title || credentials.username }}

- -
-
- Username is {{ credentials.username }} and password is the {{ secretTitle }} -
+ +
+
+
+
diff --git a/static/directives/robots-manager.html b/static/directives/robots-manager.html index 54053d1b2..87f041afe 100644 --- a/static/directives/robots-manager.html +++ b/static/directives/robots-manager.html @@ -53,13 +53,13 @@ - + (None) - {{ ::robotInfo.description }} + {{ ::robotInfo.description }}