Skip to content
Snippets Groups Projects
Commit f08c7908 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge branch 'ag-new-admin-ui' of github.com:metabase/metabase-init into ag-new-admin-ui

parents c40b3305 215e089a
Branches
Tags
No related merge requests found
<div class="wrapper">
<section>
<section class="PageHeader">
<h2 class="PageTitle">Organization</h2>
</section>
......
......@@ -5,7 +5,7 @@
</section>
<section>
<table>
<table class="ContentTable">
<thead>
<tr>
<th>Name</th>
......@@ -17,7 +17,7 @@
<td>
{{perm.user.common_name}} <span ng-show="perm.admin" class="AdminBadge">Admin</span>
</td>
<td>
<td class="Table-actions">
<button class="Button" ng-click="toggle(perm.user.id)">
<span ng-show="perm.admin">Revoke</span>
<span ng-show="!perm.admin">Grant</span>
......
......@@ -32,4 +32,4 @@
/* the breadcrumb page (current page) should be a different contrasting color */
.Breadcrumb.Breadcrumb--page {
color: var(--breadcrumb-page-color);
}
\ No newline at end of file
}
......@@ -5,7 +5,6 @@
--primary-button-border-color: #4A90E2;
--primary-button-bg-color: #4A90E2;
--selected-button-bg-color: #F4F6F8;
--danger-button-bg-color: #EF8C8C;
......
......@@ -2,6 +2,7 @@
--admin-nav-bg-color: #6F7A8B;
--admin-nav-item-text-color: rgba(255, 255, 255, 0.63);
--admin-nav-item-text-active-color: #fff;
--page-header-padding: 2.375rem;
}
.AdminNav {
......@@ -83,6 +84,57 @@
margin-bottom: 1em;
}
.ContentTable {
width: 100%;
border-collapse: collapse;
border-spacing: 0;
text-align: left;
}
.ContentTable thead {
border-top: 1px solid #D8D8D8;
border-bottom: 1px solid #D8D8D8;
}
.AdminBadge {
background-color: #A989C5;
border-radius: 4px;
color: #fff;
padding: 0.25em;
}
.PageHeader {
padding-top: var(--page-header-padding);
padding-bottom: var(--page-header-padding);
}
.PageTitle {
margin: 0;
}
.Table-actions {
text-align: right;
}
.ContentTable .Table-actions {
opacity: 0;
transition: opacity .3s linear;
}
.ContentTable td,
.ContentTable th {
padding: 1em;
}
.ContentTable tr:hover {
background-color: rgba(74, 144, 226, 0.04);
}
.ContentTable tr:hover .Table-actions {
opacity: 1;
transition: opacity .3s linear;
}
/* TODO: this is for the ace editor and should be handled without an ID */
#id_sql {
height: 200px;
......
.brand-scene {
z-index: 4;
display: none;
}
.brand-boat {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment