diff --git a/app/src/Template/Layout/default.ctp b/app/src/Template/Layout/default.ctp index 8e7168d80..5971ae4ce 100644 --- a/app/src/Template/Layout/default.ctp +++ b/app/src/Template/Layout/default.ctp @@ -115,8 +115,7 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M Html->link( $this->Html->image( -// XXX background needs to be on green (and primary gear should be green) - "COmanage-Logo-LG-onBlue.png", + "COmanage-Logo-LG-onGreen.png", array( 'alt' => __('match.meta.logo') ) diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 62951f1bb..5f734e59e 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -33,7 +33,7 @@ html * { font-family: 'Noto Sans','Trebuchet MS',Arial,Helvetica,sans-serif; } body { - color: #222; + color: black; -webkit-overflow-scrolling: touch; /* for dialog boxes */ font-size: 12px; /* MDL override from 14px; */ } @@ -105,11 +105,11 @@ a { } /* HEADER */ #banner { - box-shadow: 0 0 4px #000; + box-shadow: 0 0 3px #999; } header.mdl-layout__header { display: block !important; /* don't hide on mobile */ - background-color: #90EE90; + background-color: #0b6623; color: white; } .mdl-layout--fixed-drawer > .mdl-layout__header .mdl-layout__header-row { @@ -492,10 +492,10 @@ form#notificationStatus { min-height: 23px; padding: 0 40px 0 0; margin: 0; - color: #222; + color: white; } #collaborationTitle a { - color: #222; + color: white; } #breadcrumbs { font-size: 0.9em; @@ -1787,16 +1787,14 @@ table { clear: both; } th, td { - padding: 0.5em; + padding: 0.75em; text-align: left; - border-right: 2px solid #fff; - border-bottom: 2px solid #fff; font-weight: normal; } th { - /*background-color: #9fc6e2;*/ - background-color: #477547; - color: white; + background-color: #ddd; + color: black; + font-weight: 600; } th a { color: white; @@ -1805,8 +1803,12 @@ th a:hover { color: #ff3; text-decoration: none !important; } +td { + border-bottom: 1px solid #eee; +} +tr th:first-child, tr td:first-child { - padding-left: 1em; + padding-left: 1.25em; } tr th:last-child, tr td:last-child { @@ -1819,10 +1821,10 @@ th.actionButtons { width:70px; } tr:nth-child(odd) td { - background-color: #f5f5f5; + background-color: #f8f8f8; } tr:nth-child(even) td { - background-color: #e5e5e5; + background-color: #fff; } td.indented { border-left: 3em solid #fff; diff --git a/app/webroot/img/COmanage-Logo-LG-onGreen.png b/app/webroot/img/COmanage-Logo-LG-onGreen.png new file mode 100755 index 000000000..3a487511b Binary files /dev/null and b/app/webroot/img/COmanage-Logo-LG-onGreen.png differ