Skip to content
Snippets Groups Projects
Commit 23a63060 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 d0a6371b 8dc59de1
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 33 deletions
resources/frontend_client/app/admin/emailreport/partials/emailreport_detail.html
+ 27
− 21
View file @ 23a63060
......@@ -12,7 +12,7 @@
<form class="Form-new bordered rounded shadowed" name="form" novalidate>
<div class="Form-field" ng-class="{'Form--fieldError': form.name.$error.message !== undefined}">
<mb-form-label form="form" display-name="Name" field-name="name"></mb-form-label>
<input class="Form-input Form-offset full" name="name" placeholder="How would you like to refer to this report?" ng-model="report.name" required />
<input class="Form-input Form-offset full" name="name" placeholder="How would you like to refer to this report?" ng-model="report.name" required autofocus/>
<span class="Form-charm"></span>
</div>
......@@ -57,16 +57,20 @@
<div class="Form-field" ng-class="{'Form--fieldError': form.dataset_query.$error.message !== undefined}">
<mb-form-label form="form" display-name="Email contents" field-name="dataset_query"></mb-form-label>
<label class="Select Form-offset">
<select ng-model="report.dataset_query.database" ng-options="db.id as db.name for db in form_input.databases" ng-change="refreshTableList(report.dataset_query.database)">
<option value="">Select a database</option>
</select>
</label>
<label class="Select Form-offset">
<select class="Select" name="dataset_query" ng-model="report.dataset_query.query.source_table" ng-options="tbl.id as tbl.name for tbl in tables" ng-disabled="!report.dataset_query.database">
<option value="">Select a table</option>
</select>
</label>
<div class="mb1">
<label class="Select Form-offset block">
<select ng-model="report.dataset_query.database" ng-options="db.id as db.name for db in form_input.databases" ng-change="refreshTableList(report.dataset_query.database)">
<option value="">Select a database</option>
</select>
</label>
</div>
<div class="mb1">
<label class="Select Form-offset">
<select class="Select" name="dataset_query" ng-model="report.dataset_query.query.source_table" ng-options="tbl.id as tbl.name for tbl in tables" ng-disabled="!report.dataset_query.database">
<option value="">Select a table</option>
</select>
</label>
</div>
</div>
<div class="Form-field" ng-class="{'Form--fieldError': form.schedule.$error.message !== undefined}">
......@@ -76,16 +80,18 @@
<button class="Button" ng-class="{ 'Button--active' : report.schedule.days_of_week[day.id] }" ng-model="report.schedule.days_of_week[day.id]" ng-repeat="day in form_input.days_of_week" btn-checkbox>{{day.name}}</button>
</div>
</div>
<label class="Select Form-offset">
<select ng-model="report.schedule.time_of_day" ng-options="tod.id as tod.name for tod in form_input.times_of_day"></select>
</label>
<label class="Select Form-offset">
<select ng-model="report.schedule.timezone" ng-options="tz for tz in form_input['timezones']">
<option value="">--- default timezone ---</option>
</select>
</label>
<div class="Form-offset mt1">
<label class="Select">
<select ng-model="report.schedule.time_of_day" ng-options="tod.id as tod.name for tod in form_input.times_of_day"></select>
</label>
<label class="Select">
<select ng-model="report.schedule.timezone" ng-options="tz for tz in form_input['timezones']">
<option value="">--- default timezone ---</option>
</select>
</label>
</div>
<span class="py1 Form-offset">{{human_readable_schedule}}</span>
<span class="Form-offset block py1 ">{{human_readable_schedule}}</span>
</div>
<div class="Form-actions">
......@@ -108,4 +114,4 @@
</div>
</div>
</section>
</div>
\ No newline at end of file
</div>
resources/frontend_client/app/components/breadcrumbs/breadcrumbs.css
+ 8
− 2
View file @ 23a63060
:root {
--breadcrumbs-color: #BFC1C2;
--breadcrumbs-padding: 2.375em;
--breadcrumbs-padding: 2.075em;
--breadcrumb-page-color: #636060;
--breadcrumb-divider-spacing: 0.75em;
}
......@@ -14,8 +14,8 @@
}
.Breadcrumb {
font-size: 0.75rem;
font-weight: bold;
font-size: 0.85em;
text-transform: uppercase;
}
......@@ -27,6 +27,12 @@
/* the breadcrumb path will always inherit the color of the breadcrumbs object */
.Breadcrumb.Breadcrumb--path {
color: currentColor;
transition: color .3s linear;
}
.Breadcrumb.Breadcrumb--path:hover {
color: var(--breadcrumb-page-color);
transition: color .3s linear;
}
/* the breadcrumb page (current page) should be a different contrasting color */
......
resources/frontend_client/app/components/buttons/buttons.css
+ 5
− 0
View file @ 23a63060
......@@ -67,6 +67,11 @@
border-radius: 0;
}
.Button-group .Button--active {
background-color: var(--success-color);
color: #fff;
}
.Button-group .Button:first-child {
border-left: none;
}
......
resources/frontend_client/app/components/dropdown/dropdown.css
+ 6
− 2
View file @ 23a63060
......@@ -7,7 +7,7 @@
}
.Dropdown-content {
opacity: 0; /* start invisible */
opacity: 0; /* start invisible */
pointer-events: none; /* and without any clicks */
z-index: 20;
position: absolute;
......@@ -33,7 +33,7 @@
display: block;
}
/* switching from home rolled to BS logic for dropdowns so we still have both classes */
/* switching from home rolled to BS logic for dropdowns so we still have both classes */
.Dropdown.open .Dropdown-content,
.Dropdown--showing.Dropdown-content{
opacity: 1;
......@@ -42,3 +42,7 @@
margin-top: 0;
}
.Dropdown-item {
padding-top: 1em;
padding-bottom: 1em;
}
resources/frontend_client/app/components/form/form.css
+ 8
− 1
View file @ 23a63060
......@@ -23,7 +23,7 @@
.Form-field {
position: relative;
color: #929292;
margin-bottom: 1em;
margin-bottom: 1.5em;
}
/* TODO: remove this scoping once we've converted non admin forms */
......@@ -33,6 +33,7 @@
font-size: 0.85em;
font-weight: bold;
color: currentColor;
margin-bottom: 1em;
}
.Form-field.Form--fieldError {
......@@ -40,6 +41,7 @@
}
.Form-input {
border: 1px solid #e0e0e0;
padding-top: 0.8em;
padding-bottom: 0.8em;
font-size: 1.185em;
......@@ -113,3 +115,8 @@
.Form-actions {
padding: 2em;
}
/* TODO: - this is itchy CSS */
.Form-field .Button-group .Button {
}
resources/frontend_client/app/components/select/select.css
+ 2
− 2
View file @ 23a63060
......@@ -45,7 +45,7 @@
.Select select {
display: inline-block;
width: 100%;
padding: .5rem 3rem .5rem 1rem;
padding: 1rem 3rem 1rem 1rem;
font-size: 0.8em;
line-height: 1;
color: var(--select-text-color);
......@@ -57,7 +57,7 @@
-webkit-appearance: none;
-moz-appearance: none;
box-shadow: 0 0 1px rgba(0, 0, 0, .12);
box-shadow: 0 1px 2px rgba(0, 0, 0, .12);
}
.Select select:focus {
......
resources/frontend_client/app/css/admin.css
+ 4
− 4
View file @ 23a63060
......@@ -6,7 +6,7 @@
}
.AdminNav {
padding: 1em;
padding: 1.825em;
background: var(--admin-nav-bg-color);
color: #fff;
font-size: 0.85rem;
......@@ -56,8 +56,9 @@
.UserInitials,
.UserInitials:hover {
font-size: 1rem;
font-size: 0.85rem;
color: currentColor;
cursor: pointer;
}
.Actions {
......@@ -125,7 +126,7 @@
padding: 1em;
}
.ContentTable tr:hover {
.ContentTable tbody tr:hover {
background-color: rgba(74, 144, 226, 0.04);
}
......@@ -134,7 +135,6 @@
transition: opacity .3s linear;
}
/* TODO: this is for the ace editor and should be handled without an ID */
#id_sql {
height: 200px;
......
resources/frontend_client/app/css/core/colors.css
+ 1
− 1
View file @ 23a63060
......@@ -4,7 +4,7 @@
--base-grey: #f8f8f8;
--alt-bg-color: #F4F6F8;
--success-color: #8BC150;
--success-color: #9CC177;
--error-color: #EF8C8C;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment