Kuxaaak
/
yadc
1
1
Fork 0
Code Releases Activity

STYLES! Fookin move forward.

Browse Source
dev
Jan Kužílek 5 years ago
parent 93c27fc80d
commit 51f2f85123
7 changed files with 115 additions and 86 deletions
Show Stats Download Patch File Download Diff File

16
yadc/assets/css/base-types.scss
Unescape Escape View File

@ -155,9 +155,16 @@ label {
margin: .2em; margin: .2em;
} }
form > input, form > textarea, form > div { &, form {
margin: .8em 0; & > {
input, textarea, div {
margin: .8em 0;
}
}
} }
// form > input, form > textarea, form > div {
// margin: .8em 0;
// }
div.row { div.row {
// padding: .2em; // padding: .2em;
@ -253,8 +260,9 @@ label {
flex-grow: 1; flex-grow: 1;
flex-basis: 100%; flex-basis: 100%;
// word-break: break-all; // foookin compatibility
// overflow-wrap: anywhere; word-break: break-word; //chromium
overflow-wrap: anywhere; //just new ff
} }
.tag-icon, .tag-right { .tag-icon, .tag-right {

157
yadc/assets/css/default.scss
Unescape Escape View File

@ -7,94 +7,111 @@
padding-top: 0; padding-top: 0;
padding-bottom: 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 { .important-subwrap {
display: flex; display: flex;
flex-flow: column nowrap;
flex-grow: 1;
@include media($bp-tablet) { @include media($bp-tablet) {
flex-flow: column nowrap; display: contents;
}
@include media($bp-desktop) {
flex-flow: row nowrap;
} }
// @include media($bp-desktop) {
// flex-flow: row nowrap;
// }
overflow: visible; // for negative margin of .post-single 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; > section.sidepanel {
article:not(:last-child) { flex-shrink: 0;
margin-bottom: 10px;
}
article.tags, article.post-edit { @include media($bp-desktop) {
@include media($bp-tablet) { // width: 14em;
.tag-container /*:not(.suggest-dropdown)*/ { width: $sidepanel-width;
flex-flow: row wrap; // 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 { a {
width: 100%; width: 100%;
}
} }
} }
} }
}
article.rating {
ul { article.rating {
padding: 0; ul {
li { padding: 0;
list-style-type: none; li {
} list-style-type: none;
} }
} }
}
article.post-desc { article.post-desc {
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
font-size: .9em; font-size: .9em;
.source > a { .source > a {
word-break: break-all; word-break: break-all;
}
> img {
display: block;
max-width: 128px;
}
} }
> img {
display: block;
max-width: 128px;
}
}
article.sidenav { article.sidenav {
> a { > a {
display: block; display: block;
padding: .3em 1em; padding: .3em 1em;
}
} }
} }
}
> section:not(.sidepanel) { section:not(.sidepanel) {
// fucking just for desktop because son of a bitch negative margin does shit when in mobile layout // 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 // it's a hack and I know it
// pls, destiny, have a mercy // pls, destiny, have a mercy
@include media($bp-desktop) { @include media($bp-desktop) {
width: 100%; width: 100%;
}
} }
} }
@ -163,10 +180,6 @@
section.comments { section.comments {
padding: 10px; padding: 10px;
@include media($bp-desktop) {
margin-left: $sidepanel-width;
}
> .comment-container { > .comment-container {
padding: 0 10px; padding: 0 10px;
max-width: 500px; max-width: 500px;
@ -177,7 +190,7 @@
p, textarea { p, textarea {
// margin-top: .5em; // margin-top: .5em;
margin: 0; margin-top: 0;
// margin-bottom: 1em; // margin-bottom: 1em;
&.deleted { &.deleted {
@ -194,6 +207,8 @@
} }
section.management-table { section.management-table {
overflow-x: auto; // Let's let it scroll for now
table { table {
margin: 0 auto; margin: 0 auto;
// border-collapse: collapse // border-collapse: collapse
@ -224,8 +239,14 @@
} }
section.manage-profile { section.manage-profile {
@include media($bp-desktop) { // @include media($bp-desktop) {
margin-right: $sidepanel-width; // // margin-right: $sidepanel-width;
// }
> .baseform {
margin: 0 10px;
margin-bottom: 15px;
max-width: 500px;
} }
} }

3
yadc/bp/post.py
Unescape Escape View File

@ -37,6 +37,9 @@ def posts(page):
session['enforced_rating'] = f_rating.name if f_rating else None session['enforced_rating'] = f_rating.name if f_rating else None
# flash(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: if current_user.is_authenticated and f_rating is None:
f_rating = current_user.rating f_rating = current_user.rating
m_ratings = f_rating.matched if f_rating else RATING.safe.matched m_ratings = f_rating.matched if f_rating else RATING.safe.matched

2
yadc/static/all.css
View File

File diff suppressed because one or more lines are too long

6
yadc/templates/layout/base_sidebar.html
Unescape Escape View File

@ -1,10 +1,10 @@
{% extends 'layout/base.html' %} {% extends 'layout/base.html' %}
{% block content %} {% block content %}
<section class="sidepanel">
{% block sidebar %}{% endblock %}
</section>
<div class="important-subwrap"> <div class="important-subwrap">
<section class="sidepanel">
{% block sidebar %}{% endblock %}
</section>
{% block main_content %}{% endblock %} {% block main_content %}{% endblock %}
</div> </div>
{% endblock content %} {% endblock content %}

5
yadc/templates/post/post.html
Unescape Escape View File

@ -71,10 +71,7 @@
<img src="{{ post.url(path=post.file_uri, endpoint='sample') }}" alt=""> <img src="{{ post.url(path=post.file_uri, endpoint='sample') }}" alt="">
</div> </div>
</section> </section>
{% endblock %}
{% block content %}
{{ super() }}
<section class="comments"> <section class="comments">
<h3>Comments</h3> <h3>Comments</h3>
<div class="comment-container"> <div class="comment-container">
@ -90,7 +87,7 @@
</span> </span>
</div> </div>
<div class="comment-editform"> <div class="comment-editform baseform">
{{ comment.editform.csrf_token }} {{ comment.editform.csrf_token }}
{{ comment.editform.id() }} {{ comment.editform.id() }}

12
yadc/templates/user/settings.html
Unescape Escape View File

@ -3,7 +3,7 @@
{% block main_content %} {% block main_content %}
<section class="manage-profile"> <section class="manage-profile">
<div class="pageform"> <div class="baseform">
<h3>Change user info</h3> <h3>Change user info</h3>
<form action="{{ url_for('user.change_info') }}" method="post"> <form action="{{ url_for('user.change_info') }}" method="post">
{{ userinfo_form.csrf_token }} {{ userinfo_form.csrf_token }}
@ -13,7 +13,7 @@
{{ userinfo_form.userinfo_submit() }} {{ userinfo_form.userinfo_submit() }}
</form> </form>
</div> </div>
<div class="pageform"> <div class="baseform">
<h3>Change password</h3> <h3>Change password</h3>
<form action="{{ url_for('user.change_pass') }}" method="post"> <form action="{{ url_for('user.change_pass') }}" method="post">
{{ pass_form.csrf_token }} {{ pass_form.csrf_token }}
@ -27,7 +27,7 @@
{{ pass_form.pass_submit() }} {{ pass_form.pass_submit() }}
</form> </form>
</div> </div>
<div class="pageform"> <div class="baseform">
<h3>Change e-mail address</h3> <h3>Change e-mail address</h3>
<form action="{{ url_for('user.change_mail') }}" method="post"> <form action="{{ url_for('user.change_mail') }}" method="post">
{{ mail_form.csrf_token }} {{ mail_form.csrf_token }}
@ -39,7 +39,7 @@
{{ mail_form.mail_submit() }} {{ mail_form.mail_submit() }}
</form> </form>
</div> </div>
<div class="pageform"> <div class="baseform">
<h3>Preferred rating</h3> <h3>Preferred rating</h3>
<form action="{{ url_for('user.change_rating') }}" method="post"> <form action="{{ url_for('user.change_rating') }}" method="post">
{{ rating_form.csrf_token }} {{ rating_form.csrf_token }}
@ -49,7 +49,7 @@
<noscript>{{ rating_form.rating_submit() }}</noscript> <noscript>{{ rating_form.rating_submit() }}</noscript>
</form> </form>
</div> </div>
<div class="pageform"> <div class="baseform">
<h3>Tag blacklist</h3> <h3>Tag blacklist</h3>
<form action="{{ url_for('user.change_tagblacklist') }}" method="post"> <form action="{{ url_for('user.change_tagblacklist') }}" method="post">
{{ tags_form.csrf_token }} {{ tags_form.csrf_token }}
@ -59,7 +59,7 @@
{{ tags_form.tags_submit() }} {{ tags_form.tags_submit() }}
</form> </form>
</div> </div>
<div class="pageform"> <div class="baseform">
<h3>Delete user data</h3> <h3>Delete user data</h3>
<form action="{{ url_for('user.delete_data') }}" method="post"> <form action="{{ url_for('user.delete_data') }}" method="post">
{{ delete_form.csrf_token }} {{ delete_form.csrf_token }}

Write Preview
Loading…
Cancel
Save