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
This commit is contained in:
Sam Chow 2018-04-27 10:01:00 -04:00
parent c8824aeb58
commit 49ce38ea04
7 changed files with 77 additions and 12 deletions

View file

@ -12,7 +12,7 @@
} }
.vertical .co-tab-content { .vertical .co-tab-content {
width: 91.66666667% !important; width: 91.66666667%;
} }
.horizontal-label { .horizontal-label {
@ -295,6 +295,8 @@
.co-dialog .co-tab-content h3 { .co-dialog .co-tab-content h3 {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
overflow: hidden;
text-overflow: ellipsis;
} }
.co-dialog .co-tab-content label { .co-dialog .co-tab-content label {

View file

@ -29,4 +29,47 @@
.credentials-dialog-element pre { .credentials-dialog-element pre {
margin-top: 20px; margin-top: 20px;
} }
.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%;
}
}

View file

@ -1,5 +1,19 @@
.robots-manager-element .robot { .robots-manager-element .robot {
white-space: nowrap; 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 { .robots-manager-element .robot a {

View file

@ -30,6 +30,12 @@
margin-left: 10px; margin-left: 10px;
} }
.cor-option a {
max-width: 500px;
overflow: hidden;
text-overflow: ellipsis;
}
.teams-manager td .empty { .teams-manager td .empty {
color: #ccc; color: #ccc;
} }

View file

@ -1510,7 +1510,7 @@ p.editable:hover i {
} }
.copy-box-element .copy-container { .copy-box-element .copy-container {
border-radius: 4px !important; border-radius: 4px;
border: 1px solid #ddd; border: 1px solid #ddd;
position: relative; position: relative;
} }

View file

@ -36,17 +36,17 @@
<!-- Tab contents --> <!-- Tab contents -->
<cor-tab-content> <cor-tab-content>
<h3> <h3 class="dialog-title-header">
Credentials for {{ credentials.title || credentials.username }} <div class="dialog-title">Credentials for {{ credentials.title || credentials.username }}</div>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</h3> </h3>
<cor-tab-pane id="cred-secret"> <cor-tab-pane id="cred-secret">
<label>{{ secretTitle }}:</label> <label>Username & {{ secretTitle }}:</label>
<div class="copy-box" value="credentials.password"></div> <div class="conjoined-box-wrapper">
<div class="help-text"> <div class="copy-box conjoined-box-top" value="credentials.username"></div>
Username is {{ credentials.username }} and password is the {{ secretTitle }} <div class="copy-box conjoined-box-bottom" value="credentials.password"></div>
</div> </div>
<div ng-transclude/> <div ng-transclude/>
</cor-tab-pane> </cor-tab-pane>

View file

@ -53,13 +53,13 @@
<tr ng-repeat="robotInfo in orderedRobots.visibleEntries" bindonce> <tr ng-repeat="robotInfo in orderedRobots.visibleEntries" bindonce>
<td class="robot"> <td class="robot">
<i class="fa ci-robot hidden-xs"></i> <i class="fa ci-robot hidden-xs"></i>
<a ng-click="showRobot(robotInfo)"> <a class="robot-account-name" ng-click="showRobot(robotInfo)">
<span class="prefix" bo-text="getPrefix(robotInfo.name) + '+'"></span><span bo-text="getShortenedName(robotInfo.name)"></span> <span class="prefix" bo-text="getPrefix(robotInfo.name) + '+'"></span><span bo-text="getShortenedName(robotInfo.name)"></span>
</a> </a>
</td> </td>
<td> <td>
<span class="empty" bo-if="!robotInfo.description">(None)</span> <span class="empty" bo-if="!robotInfo.description">(None)</span>
<span bo-if="robotInfo.description">{{ ::robotInfo.description }}</span> <span class="robots-description" bo-if="robotInfo.description">{{ ::robotInfo.description }}</span>
</td> </td>
<td bo-if="organization"> <td bo-if="organization">
<span class="empty" bo-if="robotInfo.teams.length == 0"> <span class="empty" bo-if="robotInfo.teams.length == 0">