diff --git a/assets/files/favicon/favicon.psd b/assets/files/favicon/favicon.psd index 845ac1465..e851fd1e8 100644 Binary files a/assets/files/favicon/favicon.psd and b/assets/files/favicon/favicon.psd differ diff --git a/assets/files/favicon/logo.psd b/assets/files/favicon/logo.psd new file mode 100644 index 000000000..31db0a97f Binary files /dev/null and b/assets/files/favicon/logo.psd differ diff --git a/assets/petclinic/app/index.html b/assets/petclinic/app/index.html index d4aa18d31..c30dc5c43 100644 --- a/assets/petclinic/app/index.html +++ b/assets/petclinic/app/index.html @@ -20,25 +20,47 @@
You are using an outdated browser. Please upgrade your browser to improve your experience.
- diff --git a/assets/petclinic/app/styles/main.scss b/assets/petclinic/app/styles/main.scss index 09a731482..2b0b34cc8 100644 --- a/assets/petclinic/app/styles/main.scss +++ b/assets/petclinic/app/styles/main.scss @@ -12,7 +12,7 @@ $icon-font-path: "../bower_components/bootstrap-sass-official/assets/fonts/boots /* Space out content a bit */ body { - padding-top: 51px; + -webkit-font-smoothing: antialiased; } /* Everything but the jumbotron gets side spacing for mobile first views */ @@ -141,10 +141,112 @@ body { margin-bottom: 25px; } +.navbar { + height: 60px; +} + +.navbar-static-top { + margin-bottom: 0; +} + +.navbar-brand { + padding: 18px 15px; + height: 60px; + line-height: normal; +} + +.navbar-nav { + > li { + > a { + padding-top: 20px; + padding-bottom: 20px; + } + } +} + +.navbar-form { + .form-group { + margin-bottom: 0; + } +} + .nav-tabs-filter { margin-bottom: 30px; } +.navbar-default { + .navbar-menu { + > li { + padding: 0 6px; + + > a { + border-bottom: 2px solid transparent; + padding: 20px 5px 18px 5px; + } + + &:hover { + > a { + background-color: transparent; + } + } + + &.active { + > a { + background-color: transparent; + border-bottom-color: $gray; + + &:hover { + background-color: transparent; + } + } + } + } + } +} + +.navbar-profile { + @extend .pull-right; + + > li { + float:left; + margin-left: 7px; + margin-top: 8px; + + > a { + border: 1px solid darken($gray-lighter,10%); + border-radius: 50%; + color: $gray-light; + line-height: 40px; + height: 40px; + padding: 0; + text-align: center; + width: 40px; + + &:hover { + background-color: transparent; + border-color: $gray-light; + } + + > img { + margin-top: -5px; + } + + &.img-profile { + border: 0; + + .img-circle { + border: 1px solid darken($gray-lighter,10%); + } + } + } + } + + .dropdown-menu { + right: 0; + left: auto; + } +} + /* Show page */ .show-hero { background-color: $jumbotron-bg; @@ -162,9 +264,76 @@ body { padding-top: $padding-large-vertical; } +.btn-group-new-alt { + display: none; +} + /* Responsive: Portrait tablets and up */ @media (max-width: 768px) { - .jumbotron { - height: auto; + + .nav > li.navbar-create-new { + display: none; } -} + + .navbar-brand { + padding-right: 0; + } + + .navbar-profile { + position: absolute; + top: 0; + right: 0px; + } + + .navbar-nav { + background: $body-bg; + margin-bottom: 0; + margin-top: 0; + + > li { + > a { + padding-top: 10px; + padding-bottom: 10px; + } + } + } + + .navbar-form { + margin-top: 0; + margin-bottom: 0; + border-top: 0; + border-bottom: 0; + } + + .navbar-toggle-left { + border: 0; + float: left; + margin: 15px 0 0 5px; + padding: 5px 8px 5px 8px; + + .caret { + color: $gray-light; + border-top-width: 6px; + border-right-width: 6px; + border-left-width: 6px; + margin-left: 0; + } + } + + .btn-group-new-alt { + position: fixed; + bottom: 20px; + right: 20px; + + .btn-primary { + border-radius: 50%; + height: 50px; + width: 50px; + padding: 0; + } + + .glyphicon-plus { + font-size: 20px; + } + } +} \ No newline at end of file diff --git a/assets/petclinic/dist/discover.html b/assets/petclinic/dist/discover.html index 1207322f1..868ce56f2 100644 --- a/assets/petclinic/dist/discover.html +++ b/assets/petclinic/dist/discover.html @@ -1,4 +1,4 @@ -Helping you discover pet owners near you and connect.
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.
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.
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.
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.
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.
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.
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.
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.
Use it as a starting point to create something more unique.
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.
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.