diff --git a/app/styles/app.scss b/app/styles/app.scss index 1c4c0eff48..522012187c 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -25,12 +25,9 @@ /*.ember-view { animation: domChanged 1s; -webkit-animation: domChanged 1s; }*/ .panel-primary { - animation: domChanged 1s; - -webkit-animation: domChanged 1s; -} - -.navbar-brand span { - color: #00bd9c; + // commenting out until we can sort out best flow for transition + // animation: domChanged 1s; + // -webkit-animation: domChanged 1s; } .screen-button, .screen-title { @@ -108,4 +105,23 @@ } @import "bootstrap"; -@import "bootstrap-theme"; \ No newline at end of file +@import "bootstrap-theme"; + +// jglovier's temporary style tweaks +// -------------------------------------------/ + +body { + background-color: #2e4359; + color: #fff; +} +.logo-svg { + width: 186px; +} +.navbar-brand { + padding: 13px 0; +} +.jumbotron { + background-color: #2e4359; +} + +// end temp style tweaks ------------/ diff --git a/app/styles/bootstrap-theme.scss b/app/styles/bootstrap-theme.scss index 9fcbbf6487..7f196ec30a 100644 --- a/app/styles/bootstrap-theme.scss +++ b/app/styles/bootstrap-theme.scss @@ -372,8 +372,8 @@ fieldset[disabled] .btn-primary.active { } .panel { - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + // -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + // box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } .panel-default { @@ -437,4 +437,4 @@ fieldset[disabled] .btn-primary.active { border-color: #dcdcdc; -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1); -} \ No newline at end of file +} diff --git a/app/styles/bootstrap.scss b/app/styles/bootstrap.scss index 695ef86c16..9628765636 100644 --- a/app/styles/bootstrap.scss +++ b/app/styles/bootstrap.scss @@ -5673,8 +5673,6 @@ a.list-group-item-danger { background-color: #fff; border: 1px solid transparent; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); } .panel-body { diff --git a/app/templates/components/logo-svg.hbs b/app/templates/components/logo-svg.hbs new file mode 100644 index 0000000000..e10d103ded --- /dev/null +++ b/app/templates/components/logo-svg.hbs @@ -0,0 +1,82 @@ + diff --git a/app/templates/navigation.hbs b/app/templates/navigation.hbs index f97874dda8..6eaa6db0d7 100644 --- a/app/templates/navigation.hbs +++ b/app/templates/navigation.hbs @@ -8,16 +8,18 @@ - hospitalrun + + {{logo-svg}} +