http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/ca8753f3/myriad-scheduler/src/main/resources/webapp/css/myriad.css ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/css/myriad.css b/myriad-scheduler/src/main/resources/webapp/css/myriad.css index 183f6a1..179090b 100644 --- a/myriad-scheduler/src/main/resources/webapp/css/myriad.css +++ b/myriad-scheduler/src/main/resources/webapp/css/myriad.css @@ -3,16 +3,26 @@ body { } .navbar .navbar-brand { - color: #bbbb22; +/* color: #bbbb22; */ + opacity:0.99; + margin:0; } +.navbar-brand { + padding-left:5px; + padding-top:5px; +} +.navbar .navbar-brand img { + height:40px; +} + .navbar .navbar-brand .a:active { - color: #eeee22; + /* color: #eeee22; */ } .navbar .navbar-brand .a:visited { - color: #eeee22; + /* color: #eeee22; */ } .navbar .navbar-brand:hover { - color: #eeee22; + /* color: #eeee22; */ } .modal-container { position: relative; @@ -21,5 +31,5 @@ body { position: absolute; } .modal .text-primary { - color: #ffffff + /* color: #ffffff */ } \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/ca8753f3/myriad-scheduler/src/main/resources/webapp/img/favicon-16x16.png ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/img/favicon-16x16.png b/myriad-scheduler/src/main/resources/webapp/img/favicon-16x16.png new file mode 100755 index 0000000..d580975 Binary files /dev/null and b/myriad-scheduler/src/main/resources/webapp/img/favicon-16x16.png differ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/ca8753f3/myriad-scheduler/src/main/resources/webapp/img/favicon-32x32.png ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/img/favicon-32x32.png b/myriad-scheduler/src/main/resources/webapp/img/favicon-32x32.png new file mode 100755 index 0000000..1533136 Binary files /dev/null and b/myriad-scheduler/src/main/resources/webapp/img/favicon-32x32.png differ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/ca8753f3/myriad-scheduler/src/main/resources/webapp/img/favicon-96x96.png ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/img/favicon-96x96.png b/myriad-scheduler/src/main/resources/webapp/img/favicon-96x96.png new file mode 100755 index 0000000..6c09088 Binary files /dev/null and b/myriad-scheduler/src/main/resources/webapp/img/favicon-96x96.png differ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/ca8753f3/myriad-scheduler/src/main/resources/webapp/img/favicon.ico ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/img/favicon.ico b/myriad-scheduler/src/main/resources/webapp/img/favicon.ico old mode 100644 new mode 100755 index 83bf73c..227df3b Binary files a/myriad-scheduler/src/main/resources/webapp/img/favicon.ico and b/myriad-scheduler/src/main/resources/webapp/img/favicon.ico differ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/ca8753f3/myriad-scheduler/src/main/resources/webapp/img/navbar_logo.png ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/img/navbar_logo.png b/myriad-scheduler/src/main/resources/webapp/img/navbar_logo.png new file mode 100644 index 0000000..5d62c72 Binary files /dev/null and b/myriad-scheduler/src/main/resources/webapp/img/navbar_logo.png differ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/ca8753f3/myriad-scheduler/src/main/resources/webapp/index.html ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/index.html b/myriad-scheduler/src/main/resources/webapp/index.html index 8375c9a..868966d 100644 --- a/myriad-scheduler/src/main/resources/webapp/index.html +++ b/myriad-scheduler/src/main/resources/webapp/index.html @@ -5,7 +5,7 @@ <title>Myriad</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="icon" type="image/x-icon" href="/img/favicon.ico"> - <link rel="stylesheet" href="css/bootstrap.min.css"> + <link rel="stylesheet" href="css/bootstrap-myriad.css"> <link rel="stylesheet" href="/css/myriad.css"> </head> <body> http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/ca8753f3/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js b/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js index 31d4b4f..26360fd 100644 --- a/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js +++ b/myriad-scheduler/src/main/resources/webapp/js/components/NavbarComponent.js @@ -15,8 +15,12 @@ var NavbarComponent = React.createClass({ render: function () { return( - <Navbar fixedTop> - <a className="navbar-brand" href="#">Myriad</a> + <Navbar fixedTop inverse> + <Nav> + <a className="navbar-brand" href="#"> + <img src="/img/navbar_logo.png"></img> + </a> + </Nav> <Nav> <NavItemLink to="flex">Flex</NavItemLink> <NavItemLink to="tasks">Tasks</NavItemLink>
