Commit 4afa5481 by Your Name

set and get settings and fix discussion.css post-variable-apocalypse

parent 75079219
...@@ -431,6 +431,21 @@ if Backbone? ...@@ -431,6 +431,21 @@ if Backbone?
updateEmailNotifications: () => updateEmailNotifications: () =>
if $('input.email-notification').attr('checked') if $('input.email-notification').attr('checked')
alert('checked') DiscussionUtil.safeAjax
url: '/notification_prefs/enable/'
type: "POST"
dataType: 'json'
data:
username: window.user.get("username")
error: () =>
else else
alert('unchecked') DiscussionUtil.safeAjax
\ No newline at end of file url: '/notification_prefs/disable/'
type: "POST"
dataType: 'json'
data:
username: window.user.get("username")
error: () =>
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
padding: 0 15px; padding: 0 15px;
border-radius: 3px; border-radius: 3px;
border: 1px solid #222; border: 1px solid #222;
background: -webkit-linear-gradient(top, $gray, #555); background: -webkit-linear-gradient(top, #777, #555);
font-size: 13px; font-size: 13px;
font-weight: 700; font-weight: 700;
line-height: 32px; line-height: 32px;
color: $white; color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.6); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.6);
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) inset, 0 1px 1px rgba(0, 0, 0, .15); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) inset, 0 1px 1px rgba(0, 0, 0, .15);
...@@ -60,28 +60,28 @@ ...@@ -60,28 +60,28 @@
width: 100%; width: 100%;
height: 240px; height: 240px;
margin-top: 0; margin-top: 0;
padding: $baseline/2; padding: 10px;
@include box-sizing(border-box); @include box-sizing(border-box);
border: 1px solid #aaa; border: 1px solid #aaa;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
background: $white; background: #fff;
font-family: 'Monaco', monospace; font-family: 'Monaco', monospace;
font-size: 13px; font-size: 13px;
line-height: 1.6; line-height: 1.6;
box-shadow: 0 1px 3px $black-t0 inset; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15) inset;
} }
@mixin discussion-wmd-preview { @mixin discussion-wmd-preview {
width: 100%; width: 100%;
min-height: 40px; min-height: 40px;
padding: 25px $baseline $baseline/2 $baseline; padding: 25px 20px 10px 20px;
@include box-sizing(border-box); @include box-sizing(border-box);
border: 1px solid #aaa; border: 1px solid #aaa;
border-top: none; border-top: none;
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
background: #eee; background: #eee;
color: #333; color: #333;
box-shadow: 0 1px 3px $black-t0 inset; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15) inset;
} }
@-webkit-keyframes fadeIn { @-webkit-keyframes fadeIn {
...@@ -250,7 +250,7 @@ body.discussion { ...@@ -250,7 +250,7 @@ body.discussion {
@include box-sizing(border-box); @include box-sizing(border-box);
border-radius: 30px; border-radius: 30px;
border: 1px solid #333; border: 1px solid #333;
box-shadow: 0 1px 3px $black-t1 inset; box-shadow: 0 1px 3px rgba(0, 0, 0, .25) inset;
background: -webkit-linear-gradient(top, #eee, $white); background: -webkit-linear-gradient(top, #eee, $white);
font-size: 11px; font-size: 11px;
line-height: 16px; line-height: 16px;
...@@ -307,28 +307,28 @@ body.discussion { ...@@ -307,28 +307,28 @@ body.discussion {
} }
.edit-post-title, .edit-post-tags { .edit-post-title, .edit-post-tags {
@include box-sizing(border-box);
padding: 0 $baseline/2;
width: 100%; width: 100%;
height: 40px; height: 40px;
border: 1px solid #aaa; padding: 0 10px;
@include box-sizing(border-box);
border-radius: 3px; border-radius: 3px;
box-shadow: 0 1px 3px $black-t0 inset; border: 1px solid #aaa;
color: #333;
font-size: 16px; font-size: 16px;
font-family: $sans-serif; font-family: $sans-serif;
color: #333;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15) inset;
} }
.tagsinput { .tagsinput {
padding: 10px;
@include box-sizing(border-box); @include box-sizing(border-box);
padding: $baseline/2;
border: 1px solid #aaa; border: 1px solid #aaa;
border-radius: 3px; border-radius: 3px;
background: $white; background: #fff;
box-shadow: 0 1px 3px $black-t1 inset;
font-size: 13px;
font-family: 'Monaco', monospace; font-family: 'Monaco', monospace;
font-size: 13px;
line-height: 1.6; line-height: 1.6;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset;
span.tag { span.tag {
margin-bottom: 0; margin-bottom: 0;
...@@ -337,13 +337,13 @@ body.discussion { ...@@ -337,13 +337,13 @@ body.discussion {
} }
.new-post-form { .new-post-form {
@include clearfix;
margin-bottom: $baseline;
width: 100%; width: 100%;
margin-bottom: 20px;
border-radius: 3px; border-radius: 3px;
background: rgba(0, 0, 0, .55); background: rgba(0, 0, 0, .55);
box-shadow: 0 1px 2px $black-t2 inset, 0 1px 0 $white-t2; color: #fff;
color: $white; box-shadow: 0 1px 2px rgba(0, 0, 0, .5) inset, 0 1px 0 rgba(255, 255, 255, .5);
@include clearfix;
.form-row { .form-row {
margin-bottom: $baseline; margin-bottom: $baseline;
...@@ -351,31 +351,31 @@ body.discussion { ...@@ -351,31 +351,31 @@ body.discussion {
.new-post-body .wmd-input { .new-post-body .wmd-input {
@include discussion-wmd-input; @include discussion-wmd-input;
@include box-sizing(border-box);
position: relative; position: relative;
z-index: 1;
padding: $baseline/2;
width: 100%; width: 100%;
height: 200px; height: 200px;
z-index: 1;
padding: 10px;
@include box-sizing(border-box);
border: 1px solid #333; border: 1px solid #333;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
background: $white; background: #fff;
box-shadow: 0 1px 3px $black-t1 inset;
font-size: 13px;
font-family: 'Monaco', monospace; font-family: 'Monaco', monospace;
font-size: 13px;
line-height: 1.6; line-height: 1.6;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset;
} }
.tagsinput { .tagsinput {
padding: 10px;
@include box-sizing(border-box); @include box-sizing(border-box);
padding: $baseline/2;
border: 1px solid #333; border: 1px solid #333;
border-radius: 3px; border-radius: 3px;
background: $white; background: #fff;
box-shadow: 0 1px 3px $black-t1 inset;
font-size: 13px;
font-family: 'Monaco', monospace; font-family: 'Monaco', monospace;
font-size: 13px;
line-height: 1.6; line-height: 1.6;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset;
span.tag { span.tag {
margin-bottom: 0; margin-bottom: 0;
...@@ -384,17 +384,17 @@ body.discussion { ...@@ -384,17 +384,17 @@ body.discussion {
.new-post-body .wmd-preview { .new-post-body .wmd-preview {
@include discussion-wmd-preview; @include discussion-wmd-preview;
@include box-sizing(border-box);
position: relative; position: relative;
margin-top: -1px;
padding: 25px $baseline $baseline/2 $baseline;
width: 100%; width: 100%;
//height: 50px;
margin-top: -1px;
padding: 25px 20px 10px 20px;
@include box-sizing(border-box);
border: 1px solid #333; border: 1px solid #333;
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
background: #e6e6e6; background: #e6e6e6;
box-shadow: 0 1px 3px $black-t1 inset;
color: #333; color: #333;
//height: 50px; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset;
} }
.new-post-preview-label { .new-post-preview-label {
...@@ -408,16 +408,16 @@ body.discussion { ...@@ -408,16 +408,16 @@ body.discussion {
.new-post-title, .new-post-title,
.new-post-tags { .new-post-tags {
@include box-sizing(border-box);
padding: 0 $baseline/2;
width: 100%; width: 100%;
height: 40px; height: 40px;
border: 1px solid #333; padding: 0 10px;
@include box-sizing(border-box);
border-radius: 3px; border-radius: 3px;
box-shadow: 0 1px 3px $black-t1 inset; border: 1px solid #333;
color: #333;
font-size: 16px; font-size: 16px;
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
color: #333;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset;
} }
.new-post-title { .new-post-title {
...@@ -716,7 +716,7 @@ body.discussion { ...@@ -716,7 +716,7 @@ body.discussion {
float: left; float: left;
width: 20%; width: 20%;
height: 100%; height: 100%;
background-color: $gray-l4; background-color: #dedede;
&:hover { &:hover {
background-color: $white; background-color: $white;
...@@ -728,7 +728,7 @@ body.discussion { ...@@ -728,7 +728,7 @@ body.discussion {
z-index: 100; z-index: 100;
display: inline-block; display: inline-block;
width: 100%; width: 100%;
color: $gray-l2; color: #aeaeae;
text-align: center; text-align: center;
font-size: 28px; font-size: 28px;
line-height: 60px; line-height: 60px;
...@@ -837,13 +837,13 @@ body.discussion { ...@@ -837,13 +837,13 @@ body.discussion {
} }
span { span {
@include transition(opacity .1s linear 0s);
color: #333;
text-shadow: 0 1px 0 $white-t3;
font-weight: 400;
font-size: 14px; font-size: 14px;
line-height: 1.2; font-weight: 700;
line-height: 58px;
color: #333;
text-shadow: 0 1px 0 rgba(255, 255, 255, .8);
opacity: 0.0; opacity: 0.0;
@include transition(opacity .2s linear 0s);
} }
.drop-arrow { .drop-arrow {
font-size: 16px; font-size: 16px;
...@@ -978,8 +978,8 @@ body.discussion { ...@@ -978,8 +978,8 @@ body.discussion {
@include box-sizing(border-box); @include box-sizing(border-box);
border: 1px solid #acacac; border: 1px solid #acacac;
border-radius: 30px; border-radius: 30px;
box-shadow: 0 1px 3px $white-t0 inset, 0 1px 0 $white-t2; box-shadow: 0 1px 3px rgba(0, 0, 0, .1) inset, 0 1px 0 rgba(255, 255, 255, .5);
background: url(../images/search-icon.png) no-repeat 7px center $white; background: url(../images/search-icon.png) no-repeat 7px center #fff;
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
font-weight: 400; font-weight: 400;
font-size: 13px; font-size: 13px;
...@@ -1005,17 +1005,17 @@ body.discussion { ...@@ -1005,17 +1005,17 @@ body.discussion {
.sort-bar { .sort-bar {
height: auto; height: auto;
min-height: 27px; min-height: 27px;
border-bottom: 1px solid $gray-l3; border-bottom: 1px solid #a3a3a3;
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
background-color: $gray-l2; background-color: #aeaeae;
box-shadow: 0 1px 0 $white-t1 inset; box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
span, span,
a { a {
font-size: 9px; font-size: 9px;
font-weight: bold; font-weight: bold;
line-height: 25px; line-height: 25px;
color: $gray-d3; color: #333;
text-transform: uppercase; text-transform: uppercase;
text-shadow: 0 1px 0 rgba(255, 255, 255, .4); text-shadow: 0 1px 0 rgba(255, 255, 255, .4);
} }
...@@ -1036,12 +1036,12 @@ body.discussion { ...@@ -1036,12 +1036,12 @@ body.discussion {
height: 18px; height: 18px;
padding: 0 9px; padding: 0 9px;
border-radius: 19px; border-radius: 19px;
color: $gray-d3; color: #333;
line-height: 17px; line-height: 17px;
&:hover { &:hover {
@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, .2)); @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, .2));
color: $gray-d3; color: #333;
} }
&.active { &.active {
...@@ -1372,7 +1372,7 @@ body.discussion { ...@@ -1372,7 +1372,7 @@ body.discussion {
.row-title { .row-title {
padding: 30px $baseline; padding: 30px $baseline;
background-color: $gray-l6; background-color: #dedede;
font-size: 12px; font-size: 12px;
} }
...@@ -2649,7 +2649,7 @@ body.discussion { ...@@ -2649,7 +2649,7 @@ body.discussion {
width: 10px; width: 10px;
height: 14px; height: 14px;
padding-right: 3px; padding-right: 3px;
color: $gray-l2; color: #aeaeae;
} }
.pinned .icon { .pinned .icon {
...@@ -2687,7 +2687,6 @@ display:none; ...@@ -2687,7 +2687,6 @@ display:none;
cursor:pointer; cursor:pointer;
opacity: 0.8; opacity: 0.8;
&:hover { &:hover {
@include transition(opacity .2s linear 0s); @include transition(opacity .2s linear 0s);
opacity: 1.0; opacity: 1.0;
...@@ -2696,19 +2695,18 @@ display:none; ...@@ -2696,19 +2695,18 @@ display:none;
.notflagged .icon { .notflagged .icon {
display: block; display: block;
color: $gray-l2; color: #aeaeae;
float: left; float: left;
margin: 3px; margin: 3px;
width: 10px; width: 10px;
height: 14px; height: 14px;
padding-right: 3px; padding-right: 3px;
} }
.flagged .icon .flagged .icon
{ {
display: block; display: block;
color: $gray-l2; color: #aeaeae;
float: left; float: left;
margin: 3px; margin: 3px;
width: 10px; width: 10px;
......
...@@ -34,6 +34,7 @@ $dark-gray: rgb(51, 51, 51); ...@@ -34,6 +34,7 @@ $dark-gray: rgb(51, 51, 51);
$border-color: rgb(200, 200, 200); $border-color: rgb(200, 200, 200);
$sidebar-color: rgb(246, 246, 246); $sidebar-color: rgb(246, 246, 246);
$outer-border-color: rgb(170, 170, 170); $outer-border-color: rgb(170, 170, 170);
$green: rgb(37, 184, 90);
// old variables // old variables
$light-gray: #ddd; $light-gray: #ddd;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment