.../org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java | 2 +- .../server/resourcemanager/webapp/CapacitySchedulerPage.java | 7 ++++--- .../server/resourcemanager/webapp/DefaultSchedulerPage.java | 4 ++-- .../yarn/server/resourcemanager/webapp/FairSchedulerPage.java | 10 ++++++---- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java index b8f5f75..7ad0a8b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java @@ -126,7 +126,7 @@ protected void setTableStyles(Page.HTML<_> html, String tableId, styles.add(join('#', tableId, "_paginate span {font-weight:normal}")); styles.add(join('#', tableId, " .progress {width:8em}")); styles.add(join('#', tableId, "_processing {top:-1.5em; font-size:1em;")); - styles.add(" color:#000; background:rgba(255, 255, 255, 0.8)}"); + styles.add(" color:#000; background:#ffffff}"); for (String style : innerStyles) { styles.add(join('#', tableId, " ", style)); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index a784601..0c03168 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -59,9 +59,10 @@ static final float Q_MAX_WIDTH = 0.8f; static final float Q_STATS_POS = Q_MAX_WIDTH + 0.05f; static final String Q_END = "left:101%"; - static final String Q_GIVEN = "left:0%;background:none;border:1px dashed rgba(0,0,0,0.25)"; - static final String Q_OVER = "background:rgba(255, 140, 0, 0.8)"; - static final String Q_UNDER = "background:rgba(50, 205, 50, 0.8)"; + static final String Q_GIVEN = + "left:0%;background:none;border:1px dashed #000000"; + static final String Q_OVER = "background:#ff8c00"; + static final String Q_UNDER = "background:#32cd32"; @RequestScoped static class CSQInfo { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java index 36d8309..2876385 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java @@ -38,8 +38,8 @@ static final String _Q = ".ui-state-default.ui-corner-all"; static final float WIDTH_F = 0.8f; static final String Q_END = "left:101%"; - static final String OVER = "font-size:1px;background:rgba(255, 140, 0, 0.8)"; - static final String UNDER = "font-size:1px;background:rgba(50, 205, 50, 0.8)"; + static final String OVER = "font-size:1px;background:#ff8c00"; + static final String UNDER = "font-size:1px;background:#32cd32"; static final float EPSILON = 1e-8f; static class QueueInfoBlock extends HtmlBlock { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java index d87fb5c..16d6896 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java @@ -46,10 +46,12 @@ static final float Q_MAX_WIDTH = 0.8f; static final float Q_STATS_POS = Q_MAX_WIDTH + 0.05f; static final String Q_END = "left:101%"; - static final String Q_GIVEN = "left:0%;background:none;border:1px solid rgba(0,0,0,1)"; - static final String Q_INSTANTANEOUS_FS = "left:0%;background:none;border:1px dashed rgba(0,0,0,1)"; - static final String Q_OVER = "background:rgba(255, 140, 0, 0.8)"; - static final String Q_UNDER = "background:rgba(50, 205, 50, 0.8)"; + static final String Q_GIVEN = + "left:0%;background:none;border:1px solid #000000"; + static final String Q_INSTANTANEOUS_FS = + "left:0%;background:none;border:1px dashed #000000"; + static final String Q_OVER = "background:#ff8c00"; + static final String Q_UNDER = "background:#32cd32"; static final String STEADY_FAIR_SHARE = "Steady Fair Share"; static final String INSTANTANEOUS_FAIR_SHARE = "Instantaneous Fair Share"; @RequestScoped