You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by dm...@apache.org on 2017/10/30 23:26:26 UTC
aurora git commit: Condense whitespace of navigation and breadcrumb,
reduce impact of quota widget
Repository: aurora
Updated Branches:
refs/heads/master 448e6d4cc -> 87eb8914b
Condense whitespace of navigation and breadcrumb, reduce impact of quota widget
Reviewed at https://reviews.apache.org/r/63406/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/87eb8914
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/87eb8914
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/87eb8914
Branch: refs/heads/master
Commit: 87eb8914b3d79a0d27a91c50cc7070970e47abf9
Parents: 448e6d4
Author: David McLaughlin <da...@dmclaughlin.com>
Authored: Mon Oct 30 16:26:13 2017 -0700
Committer: David McLaughlin <da...@dmclaughlin.com>
Committed: Mon Oct 30 16:26:13 2017 -0700
----------------------------------------------------------------------
ui/src/main/js/pages/Jobs.js | 6 +++---
ui/src/main/sass/components/_base.scss | 4 ++++
ui/src/main/sass/components/_breadcrumb.scss | 6 +++---
ui/src/main/sass/components/_job-list-page.scss | 14 ++++++++++++++
ui/src/main/sass/components/_navigation.scss | 10 +++++++---
ui/src/main/sass/components/_task-list.scss | 4 ++--
6 files changed, 33 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/87eb8914/ui/src/main/js/pages/Jobs.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/pages/Jobs.js b/ui/src/main/js/pages/Jobs.js
index d3bef8c..82d20f2 100644
--- a/ui/src/main/js/pages/Jobs.js
+++ b/ui/src/main/js/pages/Jobs.js
@@ -2,7 +2,7 @@ import React from 'react';
import Breadcrumb from 'components/Breadcrumb';
import JobList from 'components/JobList';
-import PanelGroup, { StandardPanelTitle } from 'components/Layout';
+import PanelGroup, { PanelSubtitle, StandardPanelTitle } from 'components/Layout';
import Loading from 'components/Loading';
import RoleQuota from 'components/RoleQuota';
@@ -41,8 +41,8 @@ export default class Jobs extends React.Component {
role={this.props.match.params.role} />
<div className='container'>
<div className='row'>
- <div className='col-md-12'>
- <PanelGroup title={<StandardPanelTitle title='Resources' />}>
+ <div className='col-md-6'>
+ <PanelGroup noPadding title={<PanelSubtitle title='Resources' />}>
<RoleQuota quota={this.state.quota} />
</PanelGroup>
</div>
http://git-wip-us.apache.org/repos/asf/aurora/blob/87eb8914/ui/src/main/sass/components/_base.scss
----------------------------------------------------------------------
diff --git a/ui/src/main/sass/components/_base.scss b/ui/src/main/sass/components/_base.scss
index fadd0d2..cf65986 100644
--- a/ui/src/main/sass/components/_base.scss
+++ b/ui/src/main/sass/components/_base.scss
@@ -9,3 +9,7 @@ html, body {
font-family: $font_stack;
background-color: $main_bg_color;
}
+
+body {
+ padding-bottom: 50px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aurora/blob/87eb8914/ui/src/main/sass/components/_breadcrumb.scss
----------------------------------------------------------------------
diff --git a/ui/src/main/sass/components/_breadcrumb.scss b/ui/src/main/sass/components/_breadcrumb.scss
index 67c0c98..05de8e6 100644
--- a/ui/src/main/sass/components/_breadcrumb.scss
+++ b/ui/src/main/sass/components/_breadcrumb.scss
@@ -1,12 +1,12 @@
.aurora-breadcrumb {
- padding: 1.5em 0;
+ padding: 15px 0;
border-bottom: 1px solid #EEE;
background-color: #FFF;
- margin-bottom: 20px;
+ margin-bottom: 10px;
h2 {
margin: 0;
- font-size: 20px;
+ font-size: 19px;
}
a:last-child {
http://git-wip-us.apache.org/repos/asf/aurora/blob/87eb8914/ui/src/main/sass/components/_job-list-page.scss
----------------------------------------------------------------------
diff --git a/ui/src/main/sass/components/_job-list-page.scss b/ui/src/main/sass/components/_job-list-page.scss
index 4783aa4..fec86f5 100644
--- a/ui/src/main/sass/components/_job-list-page.scss
+++ b/ui/src/main/sass/components/_job-list-page.scss
@@ -19,6 +19,20 @@
}
}
+.role-quota {
+ table {
+ td, th {
+ padding: 3px 20px;
+ text-align: center;
+ }
+
+ tr > td:first-child {
+ width: 99%;
+ text-align: left;
+ }
+ }
+}
+
td.job-list-name {
width: 99%;
http://git-wip-us.apache.org/repos/asf/aurora/blob/87eb8914/ui/src/main/sass/components/_navigation.scss
----------------------------------------------------------------------
diff --git a/ui/src/main/sass/components/_navigation.scss b/ui/src/main/sass/components/_navigation.scss
index 46cb541..bef53af 100644
--- a/ui/src/main/sass/components/_navigation.scss
+++ b/ui/src/main/sass/components/_navigation.scss
@@ -6,14 +6,13 @@
.navbar {
text-transform: uppercase;
font-size: 11px;
- min-height: 80px;
border-radius: 0px;
background-color: $main_contrast_color;
margin-bottom: 0px;
}
.navbar-nav>li>a {
- line-height: 50px;
+ line-height: 25px;
font-size: 14px;
color: $content_box_color;
}
@@ -22,6 +21,11 @@
background-color: #444;
}
+.navbar-brand {
+ height: auto;
+ padding: 10px 15px;
+}
+
.navbar img {
- height: 50px;
+ height: 35px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aurora/blob/87eb8914/ui/src/main/sass/components/_task-list.scss
----------------------------------------------------------------------
diff --git a/ui/src/main/sass/components/_task-list.scss b/ui/src/main/sass/components/_task-list.scss
index 3c72219..00bd385 100644
--- a/ui/src/main/sass/components/_task-list.scss
+++ b/ui/src/main/sass/components/_task-list.scss
@@ -21,7 +21,7 @@
}
td {
- padding: 5px;
+ padding: 3px 5px;
}
td:first-child {
@@ -63,7 +63,7 @@
.task-list-item {
align-items: center;
- padding: 5px 0;
+ padding: 2px 0;
.task-list-item-time {
color: $secondary_font_color;