diff --git a/yadc/assets/css/base-types.scss b/yadc/assets/css/base-types.scss index e635cc2..c2b2ba2 100644 --- a/yadc/assets/css/base-types.scss +++ b/yadc/assets/css/base-types.scss @@ -155,9 +155,16 @@ label { margin: .2em; } - form > input, form > textarea, form > div { - margin: .8em 0; + &, form { + & > { + input, textarea, div { + margin: .8em 0; + } + } } + // form > input, form > textarea, form > div { + // margin: .8em 0; + // } div.row { // padding: .2em; @@ -253,8 +260,9 @@ label { flex-grow: 1; flex-basis: 100%; - // word-break: break-all; - // overflow-wrap: anywhere; + // foookin compatibility + word-break: break-word; //chromium + overflow-wrap: anywhere; //just new ff } .tag-icon, .tag-right { diff --git a/yadc/assets/css/default.scss b/yadc/assets/css/default.scss index 4e0d732..f765d98 100644 --- a/yadc/assets/css/default.scss +++ b/yadc/assets/css/default.scss @@ -7,94 +7,111 @@ padding-top: 0; padding-bottom: 0; + display: flex; + @include media($bp-desktop) { + flex-flow: row nowrap; + } + @include media($bp-tablet) { + flex-flow: column nowrap; + } + + @include media($bp-tablet) { + overflow: visible; // for negative margin of .post-single + } + .important-subwrap { display: flex; + flex-flow: column nowrap; + flex-grow: 1; + @include media($bp-tablet) { - flex-flow: column nowrap; - } - @include media($bp-desktop) { - flex-flow: row nowrap; + display: contents; } + // @include media($bp-desktop) { + // flex-flow: row nowrap; + // } overflow: visible; // for negative margin of .post-single - > section.sidepanel { - flex-shrink: 0; - @include media($bp-desktop) { - // width: 14em; - width: $sidepanel-width; - height: 0; // for overflow - } + } - padding: 10px; - article:not(:last-child) { - margin-bottom: 10px; - } + > section.sidepanel { + flex-shrink: 0; - article.tags, article.post-edit { - @include media($bp-tablet) { - .tag-container /*:not(.suggest-dropdown)*/ { - flex-flow: row wrap; + @include media($bp-desktop) { + // width: 14em; + width: $sidepanel-width; + // height: 0; // for overflow + } - } + padding: 10px; + article:not(:last-child) { + margin-bottom: 10px; + } + + article.tags, article.post-edit { + @include media($bp-tablet) { + .tag-container /*:not(.suggest-dropdown)*/ { + flex-flow: row wrap; } - @include media($bp-desktop) { - .tag-container /*:not(.suggest-dropdown)*/ { - flex-flow: column nowrap; - align-items: start; - } - .suggest-dropdown { - flex-flow: row wrap; + } + @include media($bp-desktop) { + .tag-container /*:not(.suggest-dropdown)*/ { + flex-flow: column nowrap; + align-items: start; + } + + .suggest-dropdown { + flex-flow: row wrap; - a { - width: 100%; - } + a { + width: 100%; } } } - - article.rating { - ul { - padding: 0; - li { - list-style-type: none; - } + } + + article.rating { + ul { + padding: 0; + li { + list-style-type: none; } } + } - article.post-desc { - display: flex; - flex-flow: column nowrap; - font-size: .9em; + article.post-desc { + display: flex; + flex-flow: column nowrap; + font-size: .9em; - .source > a { - word-break: break-all; - } - - > img { - display: block; - max-width: 128px; - } + .source > a { + word-break: break-all; } + + > img { + display: block; + max-width: 128px; + } + } - article.sidenav { - > a { - display: block; + article.sidenav { + > a { + display: block; - padding: .3em 1em; - } + padding: .3em 1em; } } + } - > section:not(.sidepanel) { - // fucking just for desktop because son of a bitch negative margin does shit when in mobile layout - // it's a hack and I know it - // pls, destiny, have a mercy - @include media($bp-desktop) { - width: 100%; - } + section:not(.sidepanel) { + // fucking just for desktop because son of a bitch negative margin does shit when in mobile layout + // it's a hack and I know it + // pls, destiny, have a mercy + @include media($bp-desktop) { + width: 100%; } } @@ -163,10 +180,6 @@ section.comments { padding: 10px; - @include media($bp-desktop) { - margin-left: $sidepanel-width; - } - > .comment-container { padding: 0 10px; max-width: 500px; @@ -177,7 +190,7 @@ p, textarea { // margin-top: .5em; - margin: 0; + margin-top: 0; // margin-bottom: 1em; &.deleted { @@ -194,6 +207,8 @@ } section.management-table { + overflow-x: auto; // Let's let it scroll for now + table { margin: 0 auto; // border-collapse: collapse @@ -224,8 +239,14 @@ } section.manage-profile { - @include media($bp-desktop) { - margin-right: $sidepanel-width; + // @include media($bp-desktop) { + // // margin-right: $sidepanel-width; + // } + + > .baseform { + margin: 0 10px; + margin-bottom: 15px; + max-width: 500px; } } diff --git a/yadc/bp/post.py b/yadc/bp/post.py index f2c32b7..ca527d2 100644 --- a/yadc/bp/post.py +++ b/yadc/bp/post.py @@ -37,6 +37,9 @@ def posts(page): session['enforced_rating'] = f_rating.name if f_rating else None # flash(f_rating.name if f_rating else None) + if current_user.is_authenticated and current_user.rating is RATING.explicit and f_rating is RATING.explicit: + return redirect(url_for('.posts')) # Fookin hack to fix the state after user's switch to RATING.explicit + if current_user.is_authenticated and f_rating is None: f_rating = current_user.rating m_ratings = f_rating.matched if f_rating else RATING.safe.matched diff --git a/yadc/static/all.css b/yadc/static/all.css index 8aa8fba..2e4b7cb 100644 --- a/yadc/static/all.css +++ b/yadc/static/all.css @@ -1 +1 @@ -.flash_msgs{display:flex;flex-flow:column-reverse nowrap;position:fixed;z-index:20;bottom:0;right:0;margin:0;padding:10px;font-size:.9em;pointer-events:none}.flash_msgs>li{width:250px;padding:10px;list-style-type:none;background-color:#000c;overflow:hidden;opacity:0;animation:fade 7s normal}.flash_msgs>li:not(:first-child){margin-bottom:10px}@keyframes fade{0%,100%{opacity:0}20%,80%{opacity:1}}.flash_msgs>li.error{background-color:#500c}h2{margin:0;margin-bottom:.5em}h3{margin:0;margin-bottom:.5em;font-size:1.3em}h4{margin:0;margin-bottom:.8em;margin-top:.4em}.oneline-space{height:1em}.comment-form{margin-left:10px;max-width:500px}.comment-form input:required{box-shadow:none}.editingable:not(.time-to-edit) .edit{display:none}.editingable.time-to-edit .notedit{display:none}input[type=text],input[type=password],textarea{background:#444a;border:1px solid #444;color:inherit;display:block;padding:.5em}input[type=text],input[type=password]{width:100%}textarea{resize:vertical;width:100%}input[type=submit]{background:#444a;border:2px solid #666a;border-radius:4px;color:inherit;padding:.4em 1.8em}input[type=submit]:active{background:#000a;border:2px solid #444a}label{padding:.4em}.baseform input[type=text],.baseform input[type=password],.baseform textarea,.pageform input[type=text],.pageform input[type=password],.pageform textarea{width:100%}.baseform input[type=checkbox],.pageform input[type=checkbox]{margin:.5em}.baseform input[type=submit],.pageform input[type=submit]{margin:.2em}.baseform form>input,.baseform form>textarea,.baseform form>div,.pageform form>input,.pageform form>textarea,.pageform form>div{margin:.8em 0}.baseform div.row,.pageform div.row{display:flex;align-items:center}.baseform div.row.stretch,.pageform div.row.stretch{justify-content:space-between}.baseform div.row label,.pageform div.row label{padding:0;margin-left:.2em;margin-right:.6em}.baseform ul,.pageform ul{padding:0;margin:0}.baseform ul li,.pageform ul li{list-style-type:none}.pageform{padding:1em;width:300px;margin:0 auto}.tag-input .tag-suggester{width:100%;position:relative}.tag-input .tag-suggester input[type=text]{margin:.3em 0}.tag-input .tag-suggester>.suggest-dropdown{display:flex;align-items:start;width:100%;top:100%;position:absolute;z-index:10;overflow:auto;background-color:#2d2d2de0}.tag-input .tag-suggester>.suggest-dropdown:not(:empty){padding:.2em}.tag-input .tag-suggester>.suggest-dropdown>a.sug-sel{background-color:#242424}.tag-input .tag-container{display:flex;flex-flow:row wrap}.tag-input .tag-container:empty{display:none}.tag-input .tag-container>a{display:flex;justify-content:space-between;overflow:hidden;align-items:baseline;margin:.2em;padding:.35em .6em;border-radius:4px;background-color:#121212ff;cursor:pointer}.tag-input .tag-container>a .content{margin:0 .4em;flex-grow:1;flex-basis:100%}.tag-input .tag-container>a .tag-icon,.tag-input .tag-container>a .tag-right{align-self:center}.tag-input .tag-container>a .count{font-size:.8em;margin-right:.4em}.tag-input .tag-container>a>*{pointer-events:none}.tag-input .tag-container>a:not(:hover) span.close{opacity:0}.tag-input .tag-container>a:not(:hover) span.plus{opacity:0}.tag-input .tag-container>a.tagselected{background-color:#400808ff}.tag-input .tag-container>a.tag_hide{display:none}header{display:flex;align-items:baseline;padding:0 10px;background-color:#222}header>a.logo{font-size:2em;margin:6px}@media(max-width:559px){header{position:relative}}header>nav{flex-grow:1;display:flex}header>nav>._overlay{display:none}@media(max-width:559px){header>nav{display:none}header>nav._drop{display:flex;flex-flow:column nowrap;position:absolute;margin:0;top:100%;left:0;right:0;z-index:10;background-color:#111d}header>nav>a,header>nav a#user-menu,header>nav .user_dropdown>a{padding:12px;padding-left:24px}header>nav>a:hover,header>nav>a:active,header>nav a#user-menu:hover,header>nav a#user-menu:active,header>nav .user_dropdown>a:hover,header>nav .user_dropdown>a:active{background-color:#333}header>nav .user::before{content:"";display:block;border-top:1px solid grey;margin:2px 12px}header>nav .user #user-menu{display:block}header>nav .user .user_dropdown{display:flex;flex-flow:column nowrap}header>nav>._overlay{display:block;position:fixed;width:100%;height:100%;z-index:-1;background-color:#0006}html.oh{overflow:hidden}}@media(min-width:560px){header>nav{margin:0 5px;align-items:center}header>nav>*{margin:0 5px;padding:6px 0}header>nav>.user{padding:0;margin-left:auto;margin-right:0;position:relative}header>nav>.user #user-menu{display:block;padding:6px 10px}header>nav>.user .user_dropdown{display:none}header>nav>.user .user_dropdown a{padding:10px}header>nav>.user .user_dropdown a:hover{background-color:#333}header>nav>.user:hover>.user_dropdown{display:flex;flex-flow:column nowrap;position:absolute;margin:0;top:100%;right:0;z-index:10;background-color:#111d}}header>#nav-menu{display:none}@media(max-width:559px){header>#nav-menu{display:block;margin:5px;margin-left:auto;padding:0 2px;align-self:center;font-size:2em;cursor:pointer}}.main-wrap{margin:0 auto;max-width:1300px;padding:8px;padding-top:0;padding-bottom:0}.main-wrap .important-subwrap{display:flex;overflow:visible}@media(max-width:899px){.main-wrap .important-subwrap{flex-flow:column nowrap}}@media(min-width:900px){.main-wrap .important-subwrap{flex-flow:row nowrap}}.main-wrap .important-subwrap>section.sidepanel{flex-shrink:0;padding:10px}@media(min-width:900px){.main-wrap .important-subwrap>section.sidepanel{width:18rem;height:0}}.main-wrap .important-subwrap>section.sidepanel article:not(:last-child){margin-bottom:10px}@media(max-width:899px){.main-wrap .important-subwrap>section.sidepanel article.tags .tag-container,.main-wrap .important-subwrap>section.sidepanel article.post-edit .tag-container{flex-flow:row wrap}}@media(min-width:900px){.main-wrap .important-subwrap>section.sidepanel article.tags .tag-container,.main-wrap .important-subwrap>section.sidepanel article.post-edit .tag-container{flex-flow:column nowrap;align-items:start}.main-wrap .important-subwrap>section.sidepanel article.tags .suggest-dropdown,.main-wrap .important-subwrap>section.sidepanel article.post-edit .suggest-dropdown{flex-flow:row wrap}.main-wrap .important-subwrap>section.sidepanel article.tags .suggest-dropdown a,.main-wrap .important-subwrap>section.sidepanel article.post-edit .suggest-dropdown a{width:100%}}.main-wrap .important-subwrap>section.sidepanel article.rating ul{padding:0}.main-wrap .important-subwrap>section.sidepanel article.rating ul li{list-style-type:none}.main-wrap .important-subwrap>section.sidepanel article.post-desc{display:flex;flex-flow:column nowrap;font-size:.9em}.main-wrap .important-subwrap>section.sidepanel article.post-desc .source>a{word-break:break-all}.main-wrap .important-subwrap>section.sidepanel article.post-desc>img{display:block;max-width:128px}.main-wrap .important-subwrap>section.sidepanel article.sidenav>a{display:block;padding:.3em 1em}@media(min-width:900px){.main-wrap .important-subwrap>section:not(.sidepanel){width:100%}}.main-wrap section.post-list{overflow:hidden}@media(max-width:559px){.main-wrap section.post-list{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-list .posts{display:flex;flex-flow:row wrap}@media(max-width:899px){.main-wrap section.post-list .posts{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-list .posts::after{content:"";flex:10000 0 350px}.main-wrap section.post-list .posts>figure{position:relative;margin:8px}.main-wrap section.post-list .posts>figure img{display:block;width:100%;height:100%;transition:.2s ease}.main-wrap section.post-list .posts>figure:hover img{opacity:.7}@media(min-width:900px){.main-wrap section.post-single{padding:8px}}@media(max-width:899px){.main-wrap section.post-single{order:-1;margin-bottom:8px}}@media(max-width:559px){.main-wrap section.post-single{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-single img{display:block;max-width:100%}.main-wrap section.comments{padding:10px}@media(min-width:900px){.main-wrap section.comments{margin-left:18rem}}.main-wrap section.comments>.comment-container{padding:0 10px;max-width:500px}.main-wrap section.comments>.comment-container article.comment{overflow:hidden;margin-bottom:1em}.main-wrap section.comments>.comment-container article.comment p,.main-wrap section.comments>.comment-container article.comment textarea{margin:0}.main-wrap section.comments>.comment-container article.comment p.deleted,.main-wrap section.comments>.comment-container article.comment textarea.deleted{color:red}.main-wrap section.comments>.comment-container article.comment .comment-head{display:flex;justify-content:space-between}.main-wrap section.management-table table{margin:0 auto}.main-wrap section.management-table tr{background-color:#303030}.main-wrap section.management-table tr th,.main-wrap section.management-table tr td{padding:6px 10px}.main-wrap section.management-table tr th{background-color:#606060}.main-wrap section.management-table tr label>input{display:none}.main-wrap section.management-table tr .fa{padding:4px 4px;align-self:center;font-size:1.5em;cursor:pointer}@media(min-width:900px){.main-wrap section.manage-profile{margin-right:18rem}}.main-wrap .pagin{margin:10px 0;display:flex;flex-flow:row nowrap;justify-content:center}.main-wrap .pagin>a{display:block;background-color:#0005;padding:8px 12px;margin:0 2px}footer{padding:10px;text-align:center}*{box-sizing:border-box}body{margin:0;font-family:Verdana,Geneva,Tahoma,sans-serif;background-color:#222;color:#fff}a{color:#bbb;text-decoration:none}a:hover{color:#909090;text-decoration:none} \ No newline at end of file +.flash_msgs{display:flex;flex-flow:column-reverse nowrap;position:fixed;z-index:20;bottom:0;right:0;margin:0;padding:10px;font-size:.9em;pointer-events:none}.flash_msgs>li{width:250px;padding:10px;list-style-type:none;background-color:#000c;overflow:hidden;opacity:0;animation:fade 7s normal}.flash_msgs>li:not(:first-child){margin-bottom:10px}@keyframes fade{0%,100%{opacity:0}20%,80%{opacity:1}}.flash_msgs>li.error{background-color:#500c}h2{margin:0;margin-bottom:.5em}h3{margin:0;margin-bottom:.5em;font-size:1.3em}h4{margin:0;margin-bottom:.8em;margin-top:.4em}.oneline-space{height:1em}.comment-form{margin-left:10px;max-width:500px}.comment-form input:required{box-shadow:none}.editingable:not(.time-to-edit) .edit{display:none}.editingable.time-to-edit .notedit{display:none}input[type=text],input[type=password],textarea{background:#444a;border:1px solid #444;color:inherit;display:block;padding:.5em}input[type=text],input[type=password]{width:100%}textarea{resize:vertical;width:100%}input[type=submit]{background:#444a;border:2px solid #666a;border-radius:4px;color:inherit;padding:.4em 1.8em}input[type=submit]:active{background:#000a;border:2px solid #444a}label{padding:.4em}.baseform input[type=text],.baseform input[type=password],.baseform textarea,.pageform input[type=text],.pageform input[type=password],.pageform textarea{width:100%}.baseform input[type=checkbox],.pageform input[type=checkbox]{margin:.5em}.baseform input[type=submit],.pageform input[type=submit]{margin:.2em}.baseform>input,.baseform>textarea,.baseform>div,.baseform form>input,.baseform form>textarea,.baseform form>div,.pageform>input,.pageform>textarea,.pageform>div,.pageform form>input,.pageform form>textarea,.pageform form>div{margin:.8em 0}.baseform div.row,.pageform div.row{display:flex;align-items:center}.baseform div.row.stretch,.pageform div.row.stretch{justify-content:space-between}.baseform div.row label,.pageform div.row label{padding:0;margin-left:.2em;margin-right:.6em}.baseform ul,.pageform ul{padding:0;margin:0}.baseform ul li,.pageform ul li{list-style-type:none}.pageform{padding:1em;width:300px;margin:0 auto}.tag-input .tag-suggester{width:100%;position:relative}.tag-input .tag-suggester input[type=text]{margin:.3em 0}.tag-input .tag-suggester>.suggest-dropdown{display:flex;align-items:start;width:100%;top:100%;position:absolute;z-index:10;overflow:auto;background-color:#2d2d2de0}.tag-input .tag-suggester>.suggest-dropdown:not(:empty){padding:.2em}.tag-input .tag-suggester>.suggest-dropdown>a.sug-sel{background-color:#242424}.tag-input .tag-container{display:flex;flex-flow:row wrap}.tag-input .tag-container:empty{display:none}.tag-input .tag-container>a{display:flex;justify-content:space-between;overflow:hidden;align-items:baseline;margin:.2em;padding:.35em .6em;border-radius:4px;background-color:#121212ff;cursor:pointer}.tag-input .tag-container>a .content{margin:0 .4em;flex-grow:1;flex-basis:100%;word-break:break-word;overflow-wrap:anywhere}.tag-input .tag-container>a .tag-icon,.tag-input .tag-container>a .tag-right{align-self:center}.tag-input .tag-container>a .count{font-size:.8em;margin-right:.4em}.tag-input .tag-container>a>*{pointer-events:none}.tag-input .tag-container>a:not(:hover) span.close{opacity:0}.tag-input .tag-container>a:not(:hover) span.plus{opacity:0}.tag-input .tag-container>a.tagselected{background-color:#400808ff}.tag-input .tag-container>a.tag_hide{display:none}header{display:flex;align-items:baseline;padding:0 10px;background-color:#222}header>a.logo{font-size:2em;margin:6px}@media(max-width:559px){header{position:relative}}header>nav{flex-grow:1;display:flex}header>nav>._overlay{display:none}@media(max-width:559px){header>nav{display:none}header>nav._drop{display:flex;flex-flow:column nowrap;position:absolute;margin:0;top:100%;left:0;right:0;z-index:10;background-color:#111d}header>nav>a,header>nav a#user-menu,header>nav .user_dropdown>a{padding:12px;padding-left:24px}header>nav>a:hover,header>nav>a:active,header>nav a#user-menu:hover,header>nav a#user-menu:active,header>nav .user_dropdown>a:hover,header>nav .user_dropdown>a:active{background-color:#333}header>nav .user::before{content:"";display:block;border-top:1px solid grey;margin:2px 12px}header>nav .user #user-menu{display:block}header>nav .user .user_dropdown{display:flex;flex-flow:column nowrap}header>nav>._overlay{display:block;position:fixed;width:100%;height:100%;z-index:-1;background-color:#0006}html.oh{overflow:hidden}}@media(min-width:560px){header>nav{margin:0 5px;align-items:center}header>nav>*{margin:0 5px;padding:6px 0}header>nav>.user{padding:0;margin-left:auto;margin-right:0;position:relative}header>nav>.user #user-menu{display:block;padding:6px 10px}header>nav>.user .user_dropdown{display:none}header>nav>.user .user_dropdown a{padding:10px}header>nav>.user .user_dropdown a:hover{background-color:#333}header>nav>.user:hover>.user_dropdown{display:flex;flex-flow:column nowrap;position:absolute;margin:0;top:100%;right:0;z-index:10;background-color:#111d}}header>#nav-menu{display:none}@media(max-width:559px){header>#nav-menu{display:block;margin:5px;margin-left:auto;padding:0 2px;align-self:center;font-size:2em;cursor:pointer}}.main-wrap{margin:0 auto;max-width:1300px;padding:8px;padding-top:0;padding-bottom:0;display:flex}@media(min-width:900px){.main-wrap{flex-flow:row nowrap}}@media(max-width:899px){.main-wrap{flex-flow:column nowrap}}@media(max-width:899px){.main-wrap{overflow:visible}}.main-wrap .important-subwrap{display:flex;flex-flow:column nowrap;flex-grow:1;overflow:visible}@media(max-width:899px){.main-wrap .important-subwrap{display:contents}}.main-wrap>section.sidepanel{flex-shrink:0;padding:10px}@media(min-width:900px){.main-wrap>section.sidepanel{width:18rem}}.main-wrap>section.sidepanel article:not(:last-child){margin-bottom:10px}@media(max-width:899px){.main-wrap>section.sidepanel article.tags .tag-container,.main-wrap>section.sidepanel article.post-edit .tag-container{flex-flow:row wrap}}@media(min-width:900px){.main-wrap>section.sidepanel article.tags .tag-container,.main-wrap>section.sidepanel article.post-edit .tag-container{flex-flow:column nowrap;align-items:start}.main-wrap>section.sidepanel article.tags .suggest-dropdown,.main-wrap>section.sidepanel article.post-edit .suggest-dropdown{flex-flow:row wrap}.main-wrap>section.sidepanel article.tags .suggest-dropdown a,.main-wrap>section.sidepanel article.post-edit .suggest-dropdown a{width:100%}}.main-wrap>section.sidepanel article.rating ul{padding:0}.main-wrap>section.sidepanel article.rating ul li{list-style-type:none}.main-wrap>section.sidepanel article.post-desc{display:flex;flex-flow:column nowrap;font-size:.9em}.main-wrap>section.sidepanel article.post-desc .source>a{word-break:break-all}.main-wrap>section.sidepanel article.post-desc>img{display:block;max-width:128px}.main-wrap>section.sidepanel article.sidenav>a{display:block;padding:.3em 1em}@media(min-width:900px){.main-wrap section:not(.sidepanel){width:100%}}.main-wrap section.post-list{overflow:hidden}@media(max-width:559px){.main-wrap section.post-list{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-list .posts{display:flex;flex-flow:row wrap}@media(max-width:899px){.main-wrap section.post-list .posts{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-list .posts::after{content:"";flex:10000 0 350px}.main-wrap section.post-list .posts>figure{position:relative;margin:8px}.main-wrap section.post-list .posts>figure img{display:block;width:100%;height:100%;transition:.2s ease}.main-wrap section.post-list .posts>figure:hover img{opacity:.7}@media(min-width:900px){.main-wrap section.post-single{padding:8px}}@media(max-width:899px){.main-wrap section.post-single{order:-1;margin-bottom:8px}}@media(max-width:559px){.main-wrap section.post-single{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-single img{display:block;max-width:100%}.main-wrap section.comments{padding:10px}.main-wrap section.comments>.comment-container{padding:0 10px;max-width:500px}.main-wrap section.comments>.comment-container article.comment{overflow:hidden;margin-bottom:1em}.main-wrap section.comments>.comment-container article.comment p,.main-wrap section.comments>.comment-container article.comment textarea{margin-top:0}.main-wrap section.comments>.comment-container article.comment p.deleted,.main-wrap section.comments>.comment-container article.comment textarea.deleted{color:red}.main-wrap section.comments>.comment-container article.comment .comment-head{display:flex;justify-content:space-between}.main-wrap section.management-table{overflow-x:auto}.main-wrap section.management-table table{margin:0 auto}.main-wrap section.management-table tr{background-color:#303030}.main-wrap section.management-table tr th,.main-wrap section.management-table tr td{padding:6px 10px}.main-wrap section.management-table tr th{background-color:#606060}.main-wrap section.management-table tr label>input{display:none}.main-wrap section.management-table tr .fa{padding:4px 4px;align-self:center;font-size:1.5em;cursor:pointer}.main-wrap section.manage-profile>.baseform{margin:0 10px;margin-bottom:15px;max-width:500px}.main-wrap .pagin{margin:10px 0;display:flex;flex-flow:row nowrap;justify-content:center}.main-wrap .pagin>a{display:block;background-color:#0005;padding:8px 12px;margin:0 2px}footer{padding:10px;text-align:center}*{box-sizing:border-box}body{margin:0;font-family:Verdana,Geneva,Tahoma,sans-serif;background-color:#222;color:#fff}a{color:#bbb;text-decoration:none}a:hover{color:#909090;text-decoration:none} \ No newline at end of file diff --git a/yadc/templates/layout/base_sidebar.html b/yadc/templates/layout/base_sidebar.html index f54211a..c9332e1 100644 --- a/yadc/templates/layout/base_sidebar.html +++ b/yadc/templates/layout/base_sidebar.html @@ -1,10 +1,10 @@ {% extends 'layout/base.html' %} {% block content %} +
+ {% block sidebar %}{% endblock %} +
-
- {% block sidebar %}{% endblock %} -
{% block main_content %}{% endblock %}
{% endblock content %} \ No newline at end of file diff --git a/yadc/templates/post/post.html b/yadc/templates/post/post.html index 7448a5a..f3d10bf 100644 --- a/yadc/templates/post/post.html +++ b/yadc/templates/post/post.html @@ -71,10 +71,7 @@ -{% endblock %} -{% block content %} -{{ super() }}

Comments

@@ -90,7 +87,7 @@
-
+
{{ comment.editform.csrf_token }} {{ comment.editform.id() }} diff --git a/yadc/templates/user/settings.html b/yadc/templates/user/settings.html index 0007757..8de8191 100644 --- a/yadc/templates/user/settings.html +++ b/yadc/templates/user/settings.html @@ -3,7 +3,7 @@ {% block main_content %}
-
+

Change user info

{{ userinfo_form.csrf_token }} @@ -13,7 +13,7 @@ {{ userinfo_form.userinfo_submit() }}
-
+

Change password

{{ pass_form.csrf_token }} @@ -27,7 +27,7 @@ {{ pass_form.pass_submit() }}
-
+

Change e-mail address

{{ mail_form.csrf_token }} @@ -39,7 +39,7 @@ {{ mail_form.mail_submit() }}
-
+

Preferred rating

{{ rating_form.csrf_token }} @@ -49,7 +49,7 @@
-
+

Tag blacklist

{{ tags_form.csrf_token }} @@ -59,7 +59,7 @@ {{ tags_form.tags_submit() }}
-
+

Delete user data

{{ delete_form.csrf_token }}