Merge branch 'master' into ag-admin-ui

Conflicts:
	resources/frontend_client/index.html

resources/frontend_client/app/admin/emailreport/partials/emailreport_detail.html

@@ -94,7 +94,7 @@
             </div>
         </div>
 
-        <div class="my1 py2 border-top">
+        <div class="py3 px4 border-top">
           <div class="clearfix">
               <div class="float-left">
                 <input class="Button" type="button" value="Send Now" ng-if="report.id" ng-click="executeReport(report.id)"/>

resources/frontend_client/app/admin/home.html

-
-<div class="wrapper">
+<section class="wrapper">
+    <div class="py2">
+        <h2>Settings</h2>
+    </div>
     <form id="settings_form" novalidate>
-        <div class="py1">
-            <h2>Settings</h2>
+        <div class="bg-white bordered rounded shadowed">
+            <div class="p4">
+                <div class="py1">
+                    <label>Slug:</label>
+                    <input class="input block full" type="text" ng-model="currentOrg.slug" ng-disabled="true"/>
+                </div>
 
-            <div class="py1">
-                <label>Slug:</label>
-                <input class="input block full" type="text" ng-model="currentOrg.slug" ng-disabled="true"/>
-            </div>
+                <div class="py1">
+                    <label for="id_name">Name:</label>
+                    <input class="input block full" id="id_name" type="text" ng-model="currentOrg.name"/>
+                </div>
 
-            <div class="py1">
-                <label for="id_name">Name:</label>
-                <input class="input block full" id="id_name" type="text" ng-model="currentOrg.name"/>
-            </div>
+                <div class="py1">
+                    <label for="id_desc">Description:</label>
+                    <textarea class="input block full" id="id_desc" rows="5" ng-model="currentOrg.description"></textarea>
+                </div>
 
-            <div class="py1">
-                <label for="id_desc">Description:</label>
-                <textarea class="input block full" id="id_desc" rows="5" ng-model="currentOrg.description"></textarea>
+                <div class="py1">
+                    <label for="id_logo">Logo Url:</label>
+                    <input class="input block full" id="id_logo" type="text" ng-model="currentOrg.logo_url"/>
+                </div>
             </div>
-
-            <div class="py1">
-                <label for="id_logo">Logo Url:</label>
-                <input class="input block full" id="id_logo" type="text" ng-model="currentOrg.logo_url"/>
+            <div class="py3 px4 border-top clearfix">
+                <input class="Button Button--primary float-right" type="button" value="Save" ng-click="updateOrg(currentOrg)"/>
             </div>
         </div>
 
-        <div class="py2 border-top">
-          <div class="inline-block">
-            <input class="Button Button--primary" type="button" value="Save" ng-click="updateOrg(currentOrg)"/>
-          </div>
-        </div>
     </form>
-</div>
+</section>

resources/frontend_client/app/explore/partials/database_list.html

@@ -9,7 +9,7 @@
                         other tables</a>
                     <h2>Explore {{database.name}}</h2>
                 </div>
-                <ul class="bordered rounded  bg-white clearfix">
+                <ul class="clearfix">
                     <li class="border-bottom py2" ng-repeat="table in database.entities">
                         <span class="float-right text-grey-3 mt2">{{table.rows}} rows</span>
                         <h3 class="text-normal text-brand mt2 mb0">

resources/frontend_client/index.html

@@ -98,8 +98,8 @@
                             <a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/datasets')}" cv-org-href="/admin/datasets">Datasets</a>
                             <a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/emailreport')}" cv-org-href="/admin/emailreport/">Email Reports</a>
                             <a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/people')}" cv-org-href="/admin/people/">People</a>
-                            <a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/query')}"cv-org-href="/admin/query/run">SQL Query</a>
                             <a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/settings')}" cv-org-href="/admin">Settings</a>
+                            <a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/query')}"cv-org-href="/admin/query/run">SQL Query</a>
                         </section>
                     </div>
             </nav>