diff --git a/couchpotato/core/media/movie/_base/static/movie.scss b/couchpotato/core/media/movie/_base/static/movie.scss index 2b9f95d..f06113b 100644 --- a/couchpotato/core/media/movie/_base/static/movie.scss +++ b/couchpotato/core/media/movie/_base/static/movie.scss @@ -828,7 +828,6 @@ } .menus { - margin-right: $padding; .button { padding: 0 $padding/2; @@ -909,6 +908,7 @@ text-align: center; color: rgba(0,0,0,.2); cursor: default; + border: 0; &.active { background: $theme_off; diff --git a/couchpotato/core/plugins/log/static/log.js b/couchpotato/core/plugins/log/static/log.js index 85b8dc2..264c6af 100644 --- a/couchpotato/core/plugins/log/static/log.js +++ b/couchpotato/core/plugins/log/static/log.js @@ -33,6 +33,7 @@ Page.Log = new Class({ var self = this; if (self.log) self.log.destroy(); + self.log = new Element('div.container.loading', { 'text': 'loading...', 'events': { @@ -52,13 +53,20 @@ Page.Log = new Class({ self.log.adopt(self.log_items); self.log.removeClass('loading'); + var navigation = new Element('div.navigation').adopt( + new Element('h2[text=Logs]'), + new Element('div.hint', { + 'text': 'Select multiple lines & report an issue' + }) + ); + var nav = new Element('ul.nav', { 'events': { 'click:relay(li.select)': function (e, el) { self.getLogs(parseInt(el.get('text')) - 1); } } - }); + }).inject(navigation); // Type selection new Element('li.filter').grab( @@ -101,13 +109,8 @@ Page.Log = new Class({ } }).inject(nav); - // Hint - new Element('li.hint', { - 'text': 'Select multiple lines & report an issue' - }).inject(nav); - // Add to page - nav.inject(self.log, 'top'); + navigation.inject(self.el, 'top'); self.scrollToBottom(); } @@ -212,7 +215,7 @@ Page.Log = new Class({ .replace('{version}', version ? version.version.repr : '...'), textarea; - var overlay = new Element('div.report', { + var overlay = new Element('div.mask.report_popup', { 'method': 'post', 'events': { 'click': function(e){ @@ -269,7 +272,7 @@ Page.Log = new Class({ ) ); - overlay.inject(self.log); + overlay.inject(document.body); }, getSelected: function(){ diff --git a/couchpotato/core/plugins/log/static/log.scss b/couchpotato/core/plugins/log/static/log.scss index c7aace6..e36096f 100644 --- a/couchpotato/core/plugins/log/static/log.scss +++ b/couchpotato/core/plugins/log/static/log.scss @@ -1,153 +1,137 @@ -.page.log .nav { - display: block; - text-align: center; - padding: 0 0 30px; - margin: 0; - font-size: 20px; - position: fixed; - width: 100%; - bottom: 0; - left: 0; - background: #4E5969; - z-index: 100; -} +@import "couchpotato/static/style/_mixins"; - .page.log .nav li { - display: inline-block; - padding: 5px 10px; - margin: 0; - } +.page.log { - .page.log .nav li.select, - .page.log .nav li.clear { - cursor: pointer; - } + .nav { + text-align: right; + padding: 0; + margin: 0; - .page.log .nav li:hover:not(.active):not(.filter) { - background: rgba(255, 255, 255, 0.1); - } + li { + display: inline-block; + padding: 5px 10px; + margin: 0; - .page.log .nav li.active { - font-weight: bold; - cursor: default; - background: rgba(255,255,255,.1); - } + &.select, &.clear { + cursor: pointer; + } - @media all and (max-width: 480px) { - .page.log .nav { - font-size: 14px; + &:hover:not(.active):not(.filter) { + background: rgba(255, 255, 255, 0.1); } - .page.log .nav li { - padding: 5px; - } + &.active { + font-weight: bold; + cursor: default; + background: rgba(255,255,255,.1); + } } + } - .page.log .nav li.hint { - text-align: center; - width: 400px; - left: 50%; - margin-left: -200px; + .hint { font-style: italic; - font-size: 11px; - position: absolute; - right: 20px; opacity: .5; - bottom: 5px; } -.page.log .loading { - text-align: center; - font-size: 20px; - padding: 50px; -} - -.page.log .container { - padding: 30px 0 60px; - overflow: hidden; - line-height: 150%; - font-size: 11px; - color: #FFF; -} - - .page.log .container select { - vertical-align: top; + .loading { + text-align: center; + font-size: 20px; + padding: 50px; } - .page.log .container .time { - clear: both; - color: lightgrey; - font-size: 10px; - border-top: 1px solid rgba(255, 255, 255, 0.1); - position: relative; + .container { + padding: $padding; overflow: hidden; - padding: 0 3px; - font-family: Lucida Console, Monaco, Nimbus Mono L, monospace, serif; - } - .page.log .container .time.highlight { - background: rgba(255, 255, 255, 0.1); + line-height: 150%; + + select { + vertical-align: top; } - .page.log .container .time span { - padding: 5px 0 3px; - display: inline-block; - vertical-align: middle; + + .time { + clear: both; + font-size: 11px; + border-top: 1px solid rgba(255, 255, 255, 0.1); + position: relative; + overflow: hidden; + padding: 0 3px; + font-family: Lucida Console, Monaco, Nimbus Mono L, monospace, serif; + + &.highlight { + background: $theme_off; + } + + span { + padding: 5px 0 3px; + display: inline-block; + vertical-align: middle; + } + + ::selection { + background-color: #000; + color: #FFF; + } } - .page.log[data-filter=INFO] .error, - .page.log[data-filter=INFO] .debug, - .page.log[data-filter=ERROR] .debug, - .page.log[data-filter=ERROR] .info, - .page.log[data-filter=DEBUG] .info, - .page.log[data-filter=DEBUG] .error { - display: none; + .type { + margin-left: 10px; } - .page.log .container .type { - margin-left: 10px; - } + .message { + float: right; + width: 86%; + white-space: pre-wrap; + } - .page.log .container .message { - float: right; - width: 86%; - white-space: pre-wrap; + + .error { color: #FFA4A4; } + .debug span { opacity: .6; } } - .page.log .container .error { color: #FFA4A4; } - .page.log .container .debug span { opacity: .6; } -.do_report { - position: absolute; - padding: 10px; + + &[data-filter=INFO] .error, + &[data-filter=INFO] .debug, + &[data-filter=ERROR] .debug, + &[data-filter=ERROR] .info, + &[data-filter=DEBUG] .info, + &[data-filter=DEBUG] .error { + display: none; + } } -.page.log .report { +.report_popup.report_popup { position: fixed; - width: 100%; - height: 100%; - background: rgba(0,0,0,.7); left: 0; + right: 0; + bottom: 0; top: 0; z-index: 99999; font-size: 14px; -} + display: flex; + justify-content: center; + align-items: center; + opacity: 1; + color: #FFF; + pointer-events: auto; - .page.log .report .button { + .button { display: inline-block; margin: 10px 0; padding: 10px; + color: $background_color; } - .page.log .report .bug { - width: 800px; + .bug { + width: 80%; height: 80%; - position: absolute; - left: 50%; - top: 50%; - margin: 0 0 0 -400px; - transform: translate(0, -50%); - } + max-height: 800px; + max-width: 800px; + + display: flex; + flex-flow: column nowrap; - .page.log .report .bug textarea { + textarea { display: block; width: 100%; background: #FFF; @@ -157,43 +141,13 @@ height: 70%; font-size: 12px; } - -.page.log .container .time ::-webkit-selection { - background-color: #000; - color: #FFF; -} - -.page.log .container .time ::-moz-selection { - background-color: #000; - color: #FFF; + } } -.page.log .container .time ::-ms-selection { - background-color: #000; +.do_report.do_report { + z-index: 10000; + position: absolute; + padding: 10px; + background: $primary_color; color: #FFF; } - -.page.log .container .time.highlight ::selection { - background-color: transparent; - color: inherit; -} - -.page.log .container .time.highlight ::-webkit-selection { - background-color: transparent; - color: inherit; -} - -.page.log .container .time.highlight ::-moz-selection { - background-color: transparent; - color: inherit; -} - -.page.log .container .time.highlight ::-ms-selection { - background-color: transparent; - color: inherit; -} - -.page.log .container .time.highlight ::selection { - background-color: transparent; - color: inherit; -} diff --git a/couchpotato/static/style/main.scss b/couchpotato/static/style/main.scss index 9cca397..3538cde 100644 --- a/couchpotato/static/style/main.scss +++ b/couchpotato/static/style/main.scss @@ -86,7 +86,6 @@ input, textarea, select { font-size: 38px; line-height: $header_height; height: $header_height; - opacity: .1; transition: background 200ms $cubic; span { @@ -327,19 +326,36 @@ input, textarea, select { display: block; } + h1, h2, h3, h4 { + font-weight: 300; + } + + h2 { + font-size: 24px; + padding: $padding; + + @include media-phablet { + font-size: 18px; + line-height: $header_width_mobile; + padding: $padding/2; + } + } + .navigation { + z-index: 2; display: flex; + align-items: center; position: fixed; top: 0; height: $header_height; - left: $header_width; - right: 0; + left: $header_width + $padding; + right: $padding; background: $background_color; border-radius: $border_radius 0 0 0; @include media-phablet { height: $header_width_mobile; - left: $header_width_mobile; + left: $header_width_mobile + $padding; } ul { @@ -361,6 +377,10 @@ input, textarea, select { padding: $padding/2; } } + + &:first-child { + margin-left: -$padding; + } } .active a { @@ -368,16 +388,10 @@ input, textarea, select { } } - } - - h1, h2, h3, h4 { - font-weight: 300; - } + h2 { + padding: $padding $padding $padding 0; + } - h2 { - font-size: 24px; - padding: $padding; - color: rgba(0,0,0,.5); } } @@ -489,7 +503,7 @@ input, textarea, select { right: 0; bottom: 0; width: 320px; - z-index: 20; + z-index: 2000; overflow: hidden; font-size: 14px; font-weight: bold; @@ -581,8 +595,8 @@ input, textarea, select { } /* Mask */ -.mask{ - background: rgba(0,0,0, .8); +.mask { + background: rgba(0,0,0,.8); z-index: 1000; text-align: center; position: absolute;