Merge pull request #113 from klucar/newlogo

Logo Update

Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/b8c45fd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/b8c45fd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/b8c45fd2

Branch: refs/heads/master
Commit: b8c45fd2e35ee422ff0b0d835cce6b0c0ac0b6b5
Parents: 9a8a57c ca8753f
Author: Santosh Marella <smare...@maprtech.com>
Authored: Thu Jul 9 17:18:27 2015 -0700
Committer: Santosh Marella <smare...@maprtech.com>
Committed: Thu Jul 9 17:18:27 2015 -0700

----------------------------------------------------------------------
 .../webapp/css/bootstrap-default.min.css        |    5 -
 .../resources/webapp/css/bootstrap-myriad.css   | 6492 ++++++++++++++++++
 .../webapp/css/bootstrap-slate.min.css          |    7 -
 .../main/resources/webapp/css/bootstrap.min.css |    7 -
 .../src/main/resources/webapp/css/myriad.css    |   20 +-
 .../main/resources/webapp/img/favicon-16x16.png |  Bin 0 -> 1362 bytes
 .../main/resources/webapp/img/favicon-32x32.png |  Bin 0 -> 2262 bytes
 .../main/resources/webapp/img/favicon-96x96.png |  Bin 0 -> 6872 bytes
 .../src/main/resources/webapp/img/favicon.ico   |  Bin 1150 -> 1150 bytes
 .../main/resources/webapp/img/navbar_logo.png   |  Bin 0 -> 18128 bytes
 .../src/main/resources/webapp/index.html        |    2 +-
 .../webapp/js/components/NavbarComponent.js     |    8 +-
 .../webapp/public/css/bootstrap-myriad-2.css    | 6492 ++++++++++++++++++
 .../webapp/public/css/bootstrap-myriad.css      | 6492 ++++++++++++++++++
 .../main/resources/webapp/public/css/myriad.css |   20 +-
 .../webapp/public/img/favicon-16x16.png         |  Bin 0 -> 1362 bytes
 .../webapp/public/img/favicon-32x32.png         |  Bin 0 -> 2262 bytes
 .../webapp/public/img/favicon-96x96.png         |  Bin 0 -> 6872 bytes
 .../resources/webapp/public/img/favicon.ico     |  Bin 1150 -> 1150 bytes
 .../resources/webapp/public/img/navbar_logo.png |  Bin 0 -> 18128 bytes
 .../src/main/resources/webapp/public/index.html |    2 +-
 .../main/resources/webapp/public/js/myriad.js   | 2142 +++---
 22 files changed, 20732 insertions(+), 957 deletions(-)
----------------------------------------------------------------------


Reply via email to