diff --git a/include/views/default/cockpit/logs/index.phtml b/include/views/default/cockpit/logs/index.phtml index e339d47db..8d829c49c 100644 --- a/include/views/default/cockpit/logs/index.phtml +++ b/include/views/default/cockpit/logs/index.phtml @@ -92,11 +92,6 @@
Results -
diff --git a/www/assets/css/microsite.css b/www/assets/css/microsite.css index d2145c346..f97b011e9 100644 --- a/www/assets/css/microsite.css +++ b/www/assets/css/microsite.css @@ -1,3 +1,14 @@ +@font-face { + font-family: 'Museo Slab'; + src: url('/assets/fonts/museo_slab_500-webfont.eot'); + src: url('/assets/fonts/museo_slab_500-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/museo_slab_500-webfont.woff') format('woff'), + url('/assets/fonts/museo_slab_500-webfont.ttf') format('truetype'), + url('/assets/fonts/museo_slab_500-webfont.svg#MuseoSlab500Regular') format('svg'); + font-weight: normal; + font-style: normal; +} + html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -18,14 +29,15 @@ time, mark, audio, video { font: inherit; vertical-align: baseline; } -/* HTML5 display-role reset for older browsers */ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; } body { line-height: 1; - font-family: "Open Sans", "Droid Sans", "Helvetica", "Arial", sans-serif; +} +body, input, textarea { + font-family: "Museo Slab", "Museo Sans", "Open Sans", "Droid Sans", "Helvetica", "Arial", sans-serif; } ol, ul { list-style: none; @@ -75,7 +87,13 @@ html { -webkit-tap-highlight-color: rgba(205,69,29,.5); } - +*:not(input, textarea) { + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: -moz-none; + -o-user-select: none; + user-select: none; +} .home-top { background: url(/assets/images/micro/bg-sandwich.jpg); @@ -86,7 +104,6 @@ html { margin: 0 auto; } - .logo { background: url(/assets/images/micro/crunchbutton-logo.png) no-repeat; background-position: center center; @@ -152,12 +169,12 @@ html { border: 2px solid #32a2a4; border-radius: 2px; color: #404040; - box-shadow: inset 0 0 5px rgba(15, 81, 82, .57); + box-shadow: inset 0 0 0 2px #cedbdb; padding: 0; } .detail-form input, .detail-form textarea { - font: 17px Museo Slab; + font-size: 17px; padding: 8px 10px 8px 10px; border: 0; border-width:0; @@ -166,7 +183,6 @@ html { background: none; } - .content-padding { padding: 10px; } @@ -221,7 +237,7 @@ html { } .cart-items { - font: 14px Museo Slab; + font-size: 14px; color: #fff; } diff --git a/www/assets/images/micro/bg-sandwich.jpg b/www/assets/images/micro/bg-sandwich.jpg index 2d5f69da6..d4e403b75 100644 Binary files a/www/assets/images/micro/bg-sandwich.jpg and b/www/assets/images/micro/bg-sandwich.jpg differ diff --git a/www/assets/images/micro/icon-cell.png b/www/assets/images/micro/icon-cell.png index de75fbeef..512a81925 100644 Binary files a/www/assets/images/micro/icon-cell.png and b/www/assets/images/micro/icon-cell.png differ diff --git a/www/assets/images/micro/icon-map.png b/www/assets/images/micro/icon-map.png index 39e69887d..69f34d6cf 100644 Binary files a/www/assets/images/micro/icon-map.png and b/www/assets/images/micro/icon-map.png differ diff --git a/www/assets/images/micro/icon-note.png b/www/assets/images/micro/icon-note.png index 45af4731a..f7b075a5e 100644 Binary files a/www/assets/images/micro/icon-note.png and b/www/assets/images/micro/icon-note.png differ diff --git a/www/assets/images/micro/icon-user.png b/www/assets/images/micro/icon-user.png index 9f787232b..652133c73 100644 Binary files a/www/assets/images/micro/icon-user.png and b/www/assets/images/micro/icon-user.png differ