Cleanup and reorder some scss

This commit is contained in:
Johannes Zellner
2021-04-07 13:02:12 +02:00
parent 27236a5692
commit 82e8a893fd
2 changed files with 31 additions and 31 deletions

View File

@@ -312,7 +312,18 @@ textarea {
} }
} }
.grid-item-dropdown { .grid-item-content {
display: block;
background-color: white;
box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1);
border-radius: 2px;
height: 100%;
&:hover {
background-color: rgba(0, 0, 0, 0.1) !important;
}
.grid-item-action {
border: none; border: none;
float: right; float: right;
@@ -321,20 +332,10 @@ textarea {
color: $brand-primary; color: $brand-primary;
} }
} }
}
.grid-item-content {
display: block;
background-color: white;
box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1);
border-radius: 2px;
height: 100%;
}
.grid-item-top { .grid-item-top {
padding: 10px 15px; padding: 10px 15px;
height: 100%; height: 100%;
}
.grid-item-top-title { .grid-item-top-title {
white-space: nowrap; white-space: nowrap;
@@ -342,6 +343,9 @@ textarea {
font-size: 24px; font-size: 24px;
font-family: $font-family-heading; font-family: $font-family-heading;
} }
}
}
}
.app-update-badge { .app-update-badge {
display: flex; display: flex;
@@ -389,10 +393,6 @@ textarea {
max-width: 100%; max-width: 100%;
} }
.app-tooltip {
left: 32px !important;
}
multiselect { multiselect {
&.stretch { &.stretch {
button { button {

View File

@@ -72,8 +72,8 @@
<div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0"> <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
<div class="app-grid"> <div class="app-grid">
<div class="grid-item" ng-repeat="app in installedApps | selectedGroupAccessFilter:selectedGroup | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'" ng-class="{ 'admin-action': app.manifest.configurePath && (app | applicationLink) }"> <div class="grid-item" ng-repeat="app in installedApps | selectedGroupAccessFilter:selectedGroup | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'" ng-class="{ 'admin-action': app.manifest.configurePath && (app | applicationLink) }">
<div class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}"> <div class="grid-item-content" uib-tooltip="{{ app.fqdn }}">
<a ng-show="user.isAtLeastAdmin" ng-href="#/app/{{ app.id}}/display" class="btn btn-lg btn-default grid-item-dropdown"> <a ng-show="user.isAtLeastAdmin" ng-href="#/app/{{ app.id}}/display" class="btn btn-lg btn-default grid-item-action">
<i class="fas fa-cogs"></i> <i class="fas fa-cogs"></i>
</a> </a>
<a ng-href="{{ app | applicationLink }}" ng-click="user.isAtLeastAdmin && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError) || (app | installationActive)}"> <a ng-href="{{ app | applicationLink }}" ng-click="user.isAtLeastAdmin && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError) || (app | installationActive)}">