- {{currentOwner.pets.length || 0}}Pets
- {{currentOwner.visits.length || 0}}Visits
Accountant, Ledger Associates
+Maria Escobito
California, USA
-
@@ -49,7 +50,7 @@
-
-
+
- View Profile @@ -65,15 +66,27 @@ -
- 12Vets Around +
- 5Your Tasks +
- 8Appointments +
- - - Next Appointment: None -
- - - Last Visited: 02 Feb 2015 -
- - - Due Date: 14 Mar 2015 -
- + + Next Appointment: None +
- + + Last Visited: 02 Feb 2015 +
- + + Due Date: 14 Mar 2015 +
- Back to Owners List + -
- Carlos Estaban -
- Jean Coleman +
+ --@@ -310,16 +308,6 @@ - - - diff --git a/src/main/webapp/static/app/discover.html b/src/main/webapp/static/app/discover.html deleted file mode 100644 index 86fb437ec..000000000 --- a/src/main/webapp/static/app/discover.html +++ /dev/null @@ -1,260 +0,0 @@ - - - - --@@ -82,13 +95,14 @@
+
+ ++-
+
-Welcome, John Doe
-When you’re ready, you may start adding a new pet owner or continue browsing.
++++
+ ++Welcome back, John Doe
+Todays date is 12th February 2014
+- - - -Pet Clinic - Discover Pet Owners on your Neigborhood - - - - - - - - - - - - - - - - - - --- - -------Discover Pet Owners
-Helping you discover pet owners near you and connect.
---- --- --- - - -- - ---- ------
--Thumbnail label
-Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum.
-------Thumbnail label
-Mountains, she had a last view back on the skyline of her hometown Bookmarksgrove, the headline of Alphabet Village and the subline of her own road, the Line Lane.
-------Thumbnail label
-Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum.
-------Thumbnail label
-Mountains, she had a last view back on the skyline of her hometown Bookmarksgrove, the headline of Alphabet Village and the subline of her own road, the Line Lane.
-------Thumbnail label
-Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum.
-------Thumbnail label
-Mountains, she had a last view back on the skyline of her hometown Bookmarksgrove, the headline of Alphabet Village and the subline of her own road, the Line Lane.
-------Thumbnail label
-Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum.
-------Thumbnail label
-Mountains, she had a last view back on the skyline of her hometown Bookmarksgrove, the headline of Alphabet Village and the subline of her own road, the Line Lane.
---- --- - - -------Over 40,000 pet owners trust us. Register now. It's Free forever!
-Use it as a starting point to create something more unique.
- -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/static/app/favicon.ico b/src/main/webapp/static/app/favicon.ico index 04c64a9d8..8a50b936b 100644 Binary files a/src/main/webapp/static/app/favicon.ico and b/src/main/webapp/static/app/favicon.ico differ diff --git a/src/main/webapp/static/app/images/logo.png b/src/main/webapp/static/app/images/logo.png index b05277ef6..1c5655c7b 100644 Binary files a/src/main/webapp/static/app/images/logo.png and b/src/main/webapp/static/app/images/logo.png differ diff --git a/src/main/webapp/static/app/owner_details.html b/src/main/webapp/static/app/owner_details.html index ce4324440..9411942dd 100644 --- a/src/main/webapp/static/app/owner_details.html +++ b/src/main/webapp/static/app/owner_details.html @@ -2,7 +2,7 @@ -- ------Business Hours
-Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.
--- -Our Location
-Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.
-Pet Clinic - Dashboard +Pet Clinic - Owner Details @@ -36,7 +36,8 @@@@ -91,65 +92,69 @@ -+ + + + +-@@ -199,14 +204,14 @@ -- Edit Owner -Owner Information
- +++ Edit Owner +Owner Information
+ +-Owner Activities
- --
-
+Owner Activities
+ +-
+
+ -
-
-
-
Pet Clinic - Owners + + + + + + + + + + + + + + + ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/app/styles/main.scss b/src/main/webapp/static/app/styles/main.scss index 13b44379e..ff2661c2c 100644 --- a/src/main/webapp/static/app/styles/main.scss +++ b/src/main/webapp/static/app/styles/main.scss @@ -1,20 +1,22 @@ $icon-font-path: "fonts/"; -$brand-primary: #6cb947; +$brand-primary: #23a04d; $text-color: #747c83; $text-color-inverse: #fff; -$headings-color: #495256; -$sections-bg: #f0f2f5; -$sections-border: #EAEBED; +$headings-color: #252a35; +$sections-bg: #f9fafb; +$sections-border: #dee4e8; $jumbotron-bg: #42494d; -$navbar-default-bg: #2d4f61; -$navbar-default-border: #2d4f61; -$navbar-default-link-color: #749aa4; -$navbar-default-link-hover-color: #d9e9ed; -$navbar-default-link-active-color: #e6f2f5; +$navbar-default-bg: #23a04d; +$navbar-default-border: #23a04d; +$navbar-default-link-color: #b3dcc3; +$navbar-default-link-hover-color: #fff; +$navbar-default-link-active-color: #fff; +$navbar-dropdown-menu: #2e3532; $thumbnail-border: #e6e9ed; -$btn-default-color: #495256; +$btn-default-color: #747c83; $btn-default-border: #D4D5D7; $input-bg: #D9DCDF; +$gray-lighter: #e3e5e6; %font-smoothing { -webkit-font-smoothing: antialiased; @@ -77,12 +79,23 @@ input::-moz-focus-inner { /* Header */ .sub-header { - font-size: 26px; - font-weight: 500; + font-size: 20px; + font-weight: 600; margin-top: 10px; padding-bottom: 10px; } +.sub-header-actions { + .pull-left { + padding-left: 20px; + } + .pull-left:last-child { + .btn-group { + padding-right: 0; + } + } +} + /* Custom page footer */ .footer { font-size: 13px; @@ -248,15 +261,30 @@ input::-moz-focus-inner { padding: 40px 0; } -.sections-browse { - background-color: $jumbotron-bg; +.sections-tight { padding: 20px 0; } +.sections-no-padding { + padding: 0; +} + +.section-inner-padding { + padding: 10px; +} + +.col-border-right { + border-right: 1px solid $gray-lighter; +} + .sections-light { background-color: $text-color-inverse; } +.sections-darker { + background-color: #f3f5f7; +} + .section-heading { font-size: 40px; } @@ -318,7 +346,7 @@ input::-moz-focus-inner { @media (min-width: $grid-float-breakpoint) { > a { font-weight: 500; - padding: 20px 15px; + padding: 20px 10px; } } @@ -345,7 +373,7 @@ input::-moz-focus-inner { @media (max-width: $grid-float-breakpoint) { .navbar-menu { - background-color: darken($navbar-default-bg,10%); + background-color: $navbar-dropdown-menu; > li { padding: 0; @@ -376,6 +404,8 @@ input::-moz-focus-inner { > a { color: $navbar-default-link-color; + border: 1px solid $navbar-default-link-color; + border-radius: 100%; line-height: 30px; height: 30px; padding: 0; @@ -386,6 +416,11 @@ input::-moz-focus-inner { &:focus, &:active { background-color: transparent; + border-color: $text-color-inverse; + + .glyphicon { + color: $text-color-inverse; + } } &.img-profile { @@ -430,7 +465,7 @@ input::-moz-focus-inner { border-bottom: 10px solid; border-right: 10px solid rgba($gray-darker, 0); border-left: 10px solid rgba($gray-darker, 0); - color: darken($navbar-default-bg,10%); + color: $navbar-dropdown-menu; content: ''; display: block; height: 0; @@ -461,7 +496,7 @@ input::-moz-focus-inner { } .open > .navbar-dropdown-menu { - background-color: darken($navbar-default-bg,10%); + background-color: $navbar-dropdown-menu; display: block; width: 200px; border: 0; @@ -563,7 +598,9 @@ input::-moz-focus-inner { .btn { border-color: transparent; border-radius: 3px; - font-weight: 500; + font-size: 12px; + font-weight: 600; + text-transform: uppercase; transition: .3s ease-in-out; &:hover { @@ -715,6 +752,11 @@ input::-moz-focus-inner { width: 110px; } +.img-circle-medium { + height: 80px; + width: 80px; +} + .img-circle-small { height: 30px; width: 30px; @@ -748,6 +790,7 @@ label { .form-control[disabled], .form-control[readonly] { background-color: $text-color-inverse; + border: 1px solid $gray-lighter; } .form-group-action { @@ -851,7 +894,7 @@ label { li { border-right: 1px solid $gray-lighter; - color: $headings-color; + color: $brand-primary; display: inline; float: left; font-size: 16px; @@ -878,6 +921,22 @@ label { } } +.stats-md { + padding: 20px; + + li { + font-size: 25px; + font-weight: 500; + line-height: normal; + padding: 0 20px; + } + + span { + font-size: 11px; + padding-top: 4px; + } +} + .stats-lg { padding: 20px; @@ -895,8 +954,35 @@ label { /* Action Items */ -.action-wrappers { +.action-wrappers, +.action-items { .action-item { margin: 0 5px; } + + .btn-group { + padding: 0 12px; + } } + +/* Page style without the borders */ +.pager-link { + li:first-child { + a { + padding-left: 0; + } + } + + li:last-child { + a { + padding-right: 0; + } + } + + li { + a { + background-color: transparent !important; + border: 0; + } + } +} \ No newline at end of file diff --git a/src/main/webapp/static/dist/dashboard.html b/src/main/webapp/static/dist/dashboard.html index 4c80028d1..6bae30dde 100644 --- a/src/main/webapp/static/dist/dashboard.html +++ b/src/main/webapp/static/dist/dashboard.html @@ -163,7 +163,7 @@+ ++Latest Pet Owners
++++ ++ + + +
+ 