Browse Source

Navigation outside of scroll container

pull/5312/head
Ruud 10 years ago
parent
commit
d88f77e481
  1. 4
      couchpotato/core/media/movie/_base/static/movie.scss
  2. 2
      couchpotato/core/media/movie/_base/static/page.js
  3. 3
      couchpotato/static/scripts/combined.base.min.js
  4. 2
      couchpotato/static/scripts/combined.plugins.min.js
  5. 5
      couchpotato/static/scripts/page/settings.js
  6. 11
      couchpotato/static/style/combined.min.css
  7. 4
      couchpotato/static/style/settings.scss

4
couchpotato/core/media/movie/_base/static/movie.scss

@ -6,9 +6,10 @@ $mass_edit_height: 44px;
bottom: auto; bottom: auto;
z-index: 21; z-index: 21;
height: $header_height; height: $header_height;
background: $background_color;
.scroll_content { .scroll_content {
overflow: inherit; display: none;
} }
@include media-phablet { @include media-phablet {
@ -147,6 +148,7 @@ $mass_edit_height: 44px;
@include media-phablet { @include media-phablet {
line-height: $header_width_mobile; line-height: $header_width_mobile;
padding: 0 $padding/2;
} }
} }

2
couchpotato/core/media/movie/_base/static/page.js

@ -13,7 +13,7 @@ Page.Movies = new Class({
self.parent(parent, options); self.parent(parent, options);
self.navigation = new BlockNavigation(); self.navigation = new BlockNavigation();
$(self.navigation).inject(self.content, 'top'); $(self.navigation).inject(self.el);
}, },

3
couchpotato/static/scripts/combined.base.min.js

@ -1247,7 +1247,8 @@ Page.Settings = new Class({
}); });
}); });
setTimeout(function() { setTimeout(function() {
self.content.adopt(self.navigation, self.tabs_container, self.containers); self.el.grab(self.navigation);
self.content.adopt(self.tabs_container, self.containers);
self.fireEvent("create"); self.fireEvent("create");
self.openTab(); self.openTab();
}, 0); }, 0);

2
couchpotato/static/scripts/combined.plugins.min.js

@ -2077,7 +2077,7 @@ Page.Movies = new Class({
var self = this; var self = this;
self.parent(parent, options); self.parent(parent, options);
self.navigation = new BlockNavigation(); self.navigation = new BlockNavigation();
$(self.navigation).inject(self.content, "top"); $(self.navigation).inject(self.el);
}, },
defaultAction: function(action, params) { defaultAction: function(action, params) {
var self = this; var self = this;

5
couchpotato/static/scripts/page/settings.js

@ -209,8 +209,11 @@ Page.Settings = new Class({
}); });
setTimeout(function(){ setTimeout(function(){
self.el.grab(
self.navigation
);
self.content.adopt( self.content.adopt(
self.navigation,
self.tabs_container, self.tabs_container,
self.containers self.containers
); );

11
couchpotato/static/style/combined.min.css

@ -61,12 +61,12 @@
@media (max-width:480px){.page.home .search_form{margin-top:10px;height:64px} @media (max-width:480px){.page.home .search_form{margin-top:10px;height:64px}
} }
.page.home .search_form .icon-search{display:block;color:#000;right:20px;top:20px;width:66px;height:66px;line-height:66px;left:auto;-webkit-transform:none;transform:none;font-size:2em;opacity:.5} .page.home .search_form .icon-search{display:block;color:#000;right:20px;top:20px;width:66px;height:66px;line-height:66px;left:auto;-webkit-transform:none;transform:none;font-size:2em;opacity:.5}
.page.home .search_form .wrapper:before,.page.movies .scroll_content{display:none}
@media (max-width:480px){.page.home .search_form .icon-search{width:44px;height:44px;line-height:44px;right:10px;top:10px;font-size:1.5em} @media (max-width:480px){.page.home .search_form .icon-search{width:44px;height:44px;line-height:44px;right:10px;top:10px;font-size:1.5em}
} }
.page.home .search_form .wrapper{border-radius:0;box-shadow:none;bottom:auto;top:20px;left:20px;right:20px;position:absolute;width:auto} .page.home .search_form .wrapper{border-radius:0;box-shadow:none;bottom:auto;top:20px;left:20px;right:20px;position:absolute;width:auto}
@media (max-width:480px){.page.home .search_form .wrapper{right:10px;top:10px;left:10px} @media (max-width:480px){.page.home .search_form .wrapper{right:10px;top:10px;left:10px}
} }
.page.home .search_form .wrapper:before{display:none}
.page.home .search_form .wrapper .input{border-radius:0;left:0;position:absolute;top:0;height:66px} .page.home .search_form .wrapper .input{border-radius:0;left:0;position:absolute;top:0;height:66px}
.page.home .search_form .wrapper .input input{box-shadow:0;font-size:2em;font-weight:400} .page.home .search_form .wrapper .input input{box-shadow:0;font-size:2em;font-weight:400}
.directory_list,.messages .message,.more_menu .wrapper{box-shadow:0 0 15px 2px rgba(0,0,0,.15)} .directory_list,.messages .message,.more_menu .wrapper{box-shadow:0 0 15px 2px rgba(0,0,0,.15)}
@ -91,8 +91,7 @@
.page.home .search_form .wrapper .results_container .results .media_result .options .title{width:140px;margin-right:2px} .page.home .search_form .wrapper .results_container .results .media_result .options .title{width:140px;margin-right:2px}
} }
.big_search{background:#eaeaea} .big_search{background:#eaeaea}
.page.movies{bottom:auto;z-index:21;height:80px} .page.movies{bottom:auto;z-index:21;height:80px;background:#FFF}
.page.movies .scroll_content{overflow:inherit}
.page.movies_manage,.page.movies_wanted{top:80px;padding:0;transition:top 300ms cubic-bezier(.9,0,.1,1)} .page.movies_manage,.page.movies_wanted{top:80px;padding:0;transition:top 300ms cubic-bezier(.9,0,.1,1)}
@media (max-width:480px){.page.movies{height:44px} @media (max-width:480px){.page.movies{height:44px}
.page.movies_manage,.page.movies_wanted{top:44px} .page.movies_manage,.page.movies_wanted{top:44px}
@ -123,7 +122,7 @@
} }
.movies .message{padding:20px 0;text-align:center} .movies .message{padding:20px 0;text-align:center}
.movies.movies>h2{padding:0 20px;line-height:80px} .movies.movies>h2{padding:0 20px;line-height:80px}
@media (max-width:480px){.movies.movies>h2{line-height:44px} @media (max-width:480px){.movies.movies>h2{line-height:44px;padding:0 10px}
} }
.movies>.description{position:absolute;top:0;right:20px;width:auto;line-height:80px} .movies>.description{position:absolute;top:0;right:20px;width:auto;line-height:80px}
@media (max-width:768px){.movies>.description{display:none} @media (max-width:768px){.movies>.description{display:none}
@ -764,9 +763,9 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F
.table .item span{padding:1px 2px} .table .item span{padding:1px 2px}
.table .item span:first-child{padding-left:0} .table .item span:first-child{padding-left:0}
.table .item span:last-child{padding-right:0} .table .item span:last-child{padding-right:0}
.page.settings{top:80px} .page.settings{padding-top:80px}
.page.settings.active .scroll_content{display:-webkit-flex;display:-ms-flexbox;display:flex} .page.settings.active .scroll_content{display:-webkit-flex;display:-ms-flexbox;display:flex}
@media (max-width:480px){.page.settings{top:44px} @media (max-width:480px){.page.settings{padding-top:44px}
.page.settings.active .scroll_content{display:block} .page.settings.active .scroll_content{display:block}
} }
.page.settings .navigation{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between} .page.settings .navigation{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}

4
couchpotato/static/style/settings.scss

@ -1,10 +1,10 @@
@import "_mixins"; @import "_mixins";
.page.settings { .page.settings {
top: $header_height; padding-top: $header_height;
@include media-phablet { @include media-phablet {
top: $header_width_mobile; padding-top: $header_width_mobile;
} }
&.active .scroll_content { &.active .scroll_content {

Loading…
Cancel
Save