Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

UI tweaks #7

Merged
merged 4 commits into from
Jul 15, 2014
Merged

UI tweaks #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a79567b
comment out panel transition for now
Jul 13, 2014
4b0983f
fix body background color issue
Jul 13, 2014
373e54d
add temp style tweak section
Jul 13, 2014
c61e9ca
style tweaks for logo and body background color
Jul 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions app/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -109,4 +106,23 @@
}

@import "bootstrap";
@import "bootstrap-theme";
@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 ------------/
6 changes: 3 additions & 3 deletions app/styles/bootstrap-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
}
}
2 changes: 0 additions & 2 deletions app/styles/bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
82 changes: 82 additions & 0 deletions app/templates/components/logo-svg.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<svg version="1.1" class="logo-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 347.907 60.807" enable-background="new 0 0 347.907 60.807" xml:space="preserve">
<g>
<path fill="#FFFFFF" d="M39.118,49.621V0h8.247v19.067c1.336-1.269,2.805-2.293,4.408-3.072c1.603-0.779,3.483-1.169,5.643-1.169
c1.87,0,3.528,0.317,4.975,0.952c1.448,0.635,2.655,1.525,3.623,2.671c0.969,1.147,1.703,2.516,2.205,4.107
c0.501,1.592,0.751,3.345,0.751,5.259v21.805h-8.247V27.816c0-2.092-0.485-3.712-1.453-4.858c-0.969-1.147-2.421-1.72-4.358-1.72
c-1.425,0-2.76,0.323-4.007,0.968c-1.246,0.646-2.426,1.525-3.54,2.638v24.777H39.118z M89.209,14.826
c2.559,0,4.881,0.412,6.963,1.235c2.081,0.824,3.857,1.993,5.326,3.506c1.468,1.514,2.604,3.362,3.405,5.543
c0.802,2.182,1.202,4.62,1.202,7.313c0,2.716-0.4,5.165-1.202,7.346c-0.801,2.182-1.937,4.04-3.405,5.576
c-1.469,1.536-3.246,2.716-5.326,3.54c-2.082,0.823-4.403,1.236-6.963,1.236c-2.56,0-4.886-0.412-6.979-1.236
c-2.092-0.823-3.879-2.003-5.359-3.54c-1.481-1.536-2.627-3.394-3.44-5.576c-0.813-2.182-1.219-4.63-1.219-7.346
c0-2.693,0.406-5.131,1.219-7.313c0.812-2.181,1.959-4.029,3.44-5.543c1.48-1.514,3.266-2.682,5.359-3.506
C84.323,15.238,86.649,14.826,89.209,14.826z M89.209,43.777c2.849,0,4.959-0.957,6.327-2.872c1.369-1.914,2.055-4.719,2.055-8.415
c0-3.695-0.685-6.512-2.055-8.448c-1.368-1.937-3.478-2.905-6.327-2.905c-2.894,0-5.031,0.974-6.411,2.922
c-1.381,1.948-2.07,4.758-2.07,8.432s0.689,6.473,2.07,8.398C84.178,42.815,86.315,43.777,89.209,43.777z M131.216,22.039
c-0.222,0.356-0.457,0.606-0.701,0.751c-0.245,0.145-0.557,0.217-0.936,0.217c-0.4,0-0.829-0.111-1.285-0.334
c-0.457-0.222-0.986-0.472-1.586-0.751c-0.602-0.278-1.286-0.529-2.054-0.751c-0.769-0.222-1.676-0.334-2.722-0.334
c-1.625,0-2.905,0.346-3.84,1.036c-0.934,0.69-1.403,1.592-1.403,2.704c0,0.735,0.24,1.353,0.719,1.853
c0.479,0.501,1.113,0.941,1.903,1.319c0.789,0.379,1.686,0.718,2.688,1.018c1.002,0.3,2.025,0.629,3.072,0.985
c1.046,0.356,2.07,0.763,3.072,1.219c1.001,0.457,1.897,1.035,2.688,1.736c0.789,0.701,1.425,1.542,1.903,2.521
c0.479,0.98,0.718,2.159,0.718,3.539c0,1.648-0.3,3.167-0.901,4.558c-0.601,1.392-1.481,2.594-2.639,3.606
c-1.158,1.013-2.587,1.803-4.291,2.371c-1.703,0.567-3.656,0.852-5.86,0.852c-1.181,0-2.332-0.106-3.456-0.318
c-1.124-0.212-2.204-0.506-3.238-0.885c-1.036-0.378-1.993-0.823-2.872-1.335c-0.879-0.512-1.653-1.068-2.321-1.67l1.903-3.139
c0.244-0.379,0.534-0.668,0.868-0.868c0.334-0.2,0.757-0.3,1.269-0.3s0.996,0.145,1.453,0.434c0.456,0.289,0.985,0.601,1.586,0.935
c0.601,0.334,1.307,0.646,2.12,0.935c0.812,0.289,1.842,0.434,3.088,0.434c0.979,0,1.82-0.117,2.522-0.35
c0.701-0.234,1.28-0.54,1.736-0.918c0.456-0.378,0.789-0.818,1.001-1.319c0.212-0.501,0.317-1.018,0.317-1.553
c0-0.801-0.239-1.458-0.718-1.97c-0.479-0.512-1.114-0.957-1.903-1.335c-0.791-0.379-1.693-0.718-2.705-1.019
c-1.013-0.3-2.048-0.628-3.105-0.985c-1.058-0.356-2.093-0.773-3.106-1.252c-1.013-0.478-1.915-1.085-2.704-1.82
c-0.791-0.735-1.426-1.636-1.903-2.705c-0.48-1.068-0.719-2.359-0.719-3.873c0-1.402,0.278-2.738,0.835-4.007
c0.556-1.269,1.374-2.376,2.454-3.323c1.079-0.946,2.426-1.703,4.04-2.27c1.614-0.568,3.478-0.852,5.593-0.852
c2.359,0,4.509,0.39,6.445,1.169c1.937,0.78,3.55,1.803,4.841,3.072L131.216,22.039z M138.395,60.807V15.361h5.043
c0.534,0,0.991,0.123,1.369,0.367c0.378,0.245,0.623,0.624,0.734,1.135l0.667,3.173c1.381-1.581,2.967-2.86,4.759-3.84
s3.89-1.469,6.294-1.469c1.87,0,3.578,0.39,5.126,1.169c1.547,0.78,2.883,1.909,4.007,3.39c1.124,1.48,1.992,3.306,2.605,5.476
c0.611,2.17,0.918,4.658,0.918,7.463c0,2.56-0.345,4.931-1.035,7.112c-0.69,2.182-1.676,4.074-2.956,5.677
c-1.281,1.603-2.827,2.855-4.642,3.757c-1.814,0.902-3.845,1.353-6.094,1.353c-1.937,0-3.578-0.296-4.925-0.885
c-1.347-0.59-2.555-1.408-3.623-2.455v14.025H138.395z M154.423,21.238c-1.715,0-3.178,0.362-4.391,1.085
c-1.214,0.724-2.343,1.742-3.39,3.055v15.361c0.934,1.158,1.953,1.965,3.055,2.421c1.102,0.457,2.288,0.685,3.556,0.685
c1.246,0,2.376-0.234,3.39-0.701c1.013-0.467,1.87-1.18,2.571-2.137c0.702-0.957,1.241-2.165,1.62-3.623
c0.379-1.458,0.568-3.177,0.568-5.159c0-2.004-0.163-3.701-0.485-5.093c-0.322-1.391-0.784-2.521-1.385-3.389
c-0.602-0.868-1.331-1.503-2.188-1.903C156.487,21.438,155.513,21.238,154.423,21.238z M184.51,5.376
c0,0.713-0.145,1.38-0.435,2.003c-0.289,0.624-0.673,1.169-1.151,1.636c-0.479,0.467-1.041,0.841-1.686,1.119
c-0.646,0.278-1.336,0.418-2.07,0.418c-0.713,0-1.386-0.139-2.02-0.418c-0.635-0.278-1.186-0.651-1.653-1.119
c-0.467-0.468-0.841-1.013-1.119-1.636c-0.278-0.623-0.417-1.291-0.417-2.003c0-0.735,0.139-1.424,0.417-2.07
c0.278-0.646,0.652-1.202,1.119-1.67c0.467-0.467,1.018-0.84,1.653-1.119c0.634-0.278,1.307-0.418,2.02-0.418
c0.734,0,1.425,0.14,2.07,0.418c0.646,0.278,1.208,0.651,1.686,1.119c0.479,0.468,0.863,1.024,1.151,1.67
C184.365,3.952,184.51,4.642,184.51,5.376z M183.274,15.361v34.26h-8.247v-34.26H183.274z M202.173,50.155
c-2.961,0-5.242-0.84-6.845-2.521c-1.603-1.681-2.405-4.001-2.405-6.963V21.538h-3.472c-0.446,0-0.83-0.144-1.152-0.434
c-0.323-0.289-0.484-0.723-0.484-1.303v-3.272l5.51-0.902l1.736-9.35c0.089-0.445,0.294-0.79,0.617-1.035
c0.322-0.245,0.729-0.368,1.219-0.368h4.274v10.786h9.016v5.877h-9.016v18.566c0,1.068,0.267,1.903,0.801,2.505
c0.534,0.601,1.246,0.902,2.137,0.902c0.512,0,0.941-0.062,1.286-0.184c0.345-0.122,0.646-0.25,0.902-0.384
c0.256-0.133,0.484-0.261,0.684-0.384s0.4-0.184,0.601-0.184c0.245,0,0.445,0.062,0.602,0.184c0.155,0.123,0.322,0.306,0.501,0.551
l2.471,4.007c-1.202,1.002-2.582,1.759-4.14,2.271C205.457,49.899,203.842,50.155,202.173,50.155z M241.943,49.621h-3.707
c-0.78,0-1.392-0.117-1.837-0.35c-0.446-0.234-0.78-0.707-1.002-1.419l-0.734-2.437c-0.869,0.779-1.72,1.464-2.555,2.054
c-0.834,0.59-1.698,1.085-2.587,1.486c-0.891,0.401-1.837,0.701-2.839,0.902c-1.001,0.2-2.115,0.301-3.338,0.301
c-1.448,0-2.784-0.196-4.007-0.586c-1.225-0.391-2.277-0.977-3.156-1.759c-0.88-0.782-1.564-1.754-2.054-2.915
c-0.49-1.161-0.735-2.513-0.735-4.054c0-1.296,0.34-2.574,1.019-3.836c0.679-1.262,1.808-2.401,3.389-3.417
c1.58-1.016,3.684-1.86,6.311-2.53c2.627-0.67,5.888-1.005,9.784-1.005v-2.019c0-2.31-0.484-4.021-1.452-5.131
c-0.969-1.111-2.377-1.666-4.225-1.666c-1.335,0-2.449,0.156-3.338,0.467c-0.891,0.312-1.665,0.663-2.322,1.052
c-0.657,0.39-1.263,0.74-1.82,1.052c-0.556,0.312-1.168,0.467-1.837,0.467c-0.556,0-1.035-0.144-1.435-0.434
c-0.402-0.289-0.724-0.646-0.969-1.069l-1.503-2.638c3.94-3.606,8.693-5.41,14.259-5.41c2.003,0,3.79,0.329,5.36,0.985
c1.57,0.657,2.899,1.57,3.99,2.738c1.09,1.169,1.92,2.566,2.487,4.19c0.567,1.625,0.852,3.406,0.852,5.343V49.621z M225.915,44.479
c0.846,0,1.625-0.077,2.337-0.23c0.712-0.153,1.386-0.383,2.02-0.69c0.635-0.307,1.247-0.685,1.837-1.134
c0.59-0.449,1.186-0.981,1.787-1.594v-5.735c-2.404,0-4.414,0.151-6.027,0.454c-1.614,0.302-2.911,0.69-3.89,1.16
c-0.979,0.471-1.675,1.021-2.087,1.648c-0.412,0.628-0.617,1.311-0.617,2.051c0,1.458,0.428,2.5,1.285,3.128
C223.416,44.165,224.534,44.479,225.915,44.479z M257.169,0v49.621h-8.247V0H257.169z"/>
<path fill="#1ABC9C" d="M264.986,49.621V16.396h1.67c0.378,0,0.651,0.078,0.818,0.234c0.167,0.156,0.262,0.423,0.284,0.801
l0.267,7.012c1.069-2.693,2.494-4.803,4.275-6.327c1.78-1.525,3.974-2.288,6.578-2.288c1.002,0,1.925,0.106,2.772,0.317
c0.846,0.212,1.647,0.518,2.404,0.918l-0.434,2.204c-0.067,0.356-0.29,0.534-0.669,0.534c-0.134,0-0.322-0.044-0.567-0.133
c-0.245-0.089-0.551-0.189-0.918-0.3c-0.368-0.111-0.819-0.211-1.353-0.3c-0.534-0.089-1.147-0.134-1.837-0.134
c-2.516,0-4.581,0.78-6.194,2.338c-1.614,1.559-2.922,3.807-3.923,6.745v21.605H264.986z M292.166,16.396v21.237
c0,3.117,0.714,5.56,2.144,7.33c1.43,1.77,3.607,2.655,6.534,2.655c2.166,0,4.187-0.551,6.064-1.653s3.563-2.632,5.06-4.591V16.396
h3.172v33.225h-1.748c-0.615,0-0.934-0.289-0.956-0.868l-0.302-4.942c-1.538,1.915-3.316,3.451-5.334,4.608
c-2.017,1.158-4.263,1.736-6.737,1.736c-1.85,0-3.467-0.29-4.849-0.868c-1.383-0.579-2.53-1.414-3.445-2.505
c-0.914-1.09-1.604-2.404-2.072-3.94c-0.468-1.536-0.703-3.273-0.703-5.209V16.396H292.166z M321.794,49.621V16.396h1.736
c0.579,0,0.913,0.278,1.001,0.835l0.3,5.009c1.514-1.914,3.278-3.456,5.293-4.625c2.015-1.169,4.258-1.753,6.729-1.753
c1.825,0,3.433,0.289,4.825,0.868c1.391,0.579,2.544,1.414,3.456,2.505c0.913,1.091,1.603,2.404,2.07,3.94
c0.468,1.536,0.702,3.272,0.702,5.209v21.238h-3.173V28.383c0-3.116-0.712-5.559-2.137-7.329c-1.425-1.77-3.606-2.655-6.545-2.655
c-2.182,0-4.207,0.562-6.077,1.686s-3.54,2.666-5.008,4.625v24.91H321.794z"/>
<polygon fill="#1ABC9C" points="21.274,25.085 21.274,14.448 10.637,14.448 10.637,25.085 0,25.085 0,35.722 10.637,35.722
10.637,46.359 21.274,46.359 21.274,35.722 31.91,35.722 31.91,25.085 "/>
</g>
</svg>
14 changes: 8 additions & 6 deletions app/templates/navigation.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">hospital<span>run</span></a>
<a class="navbar-brand" href="#">
{{logo-svg}}
</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
{{#if allowSearch}}
<div class="navbar-form navbar-left" role="search">

<div class="navbar-form navbar-left" role="search">
<div class="form-group">
{{text-search valueBinding="searchText" autofocus="true" placeholder="Search" class="form-control"}}
{{text-search valueBinding="searchText" autofocus="true" placeholder="Search" class="form-control"}}
</div>
<button type="button" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
</div>
Expand All @@ -32,8 +34,8 @@
<li><a {{ action 'invalidateSession' }}>Logout</a></li>
{{else}}
<li>{{#link-to 'login'}}Login{{/link-to}}</li>
{{/if}}
</ul>
{{/if}}
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>