twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-26 22:54:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #285 from slr/tasty-fixes-11

Browse Source 
tasty fixes 11
This commit is contained in:
miguelfreitas 2015-07-29 13:57:40 -03:00
commit 0396462356
6 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/style.css
View File

@ -654,12 +654,17 @@ textarea.splited-post {
font-size: 11px; font-size: 11px;
margin: 4px 0; margin: 4px 0;
padding: 4px; padding: 4px;
word-wrap: break-word;
} }
#post-preview a { #post-preview a {
color: #E34F42; color: #E34F42;
} }
#post-preview samp {
background-color: #F0EFCC;
}
.splited-post-counter { .splited-post-counter {
color: rgba(0, 0, 0, 0.3); color: rgba(0, 0, 0, 0.3);
font-weight: bold; font-weight: bold;
@ -1045,7 +1050,7 @@ ol.toptrends-list {
} }
.post-text samp { .post-text samp {
background: #f0efcc; background-color: #F0EFCC;
} }
.post-context .post-context

14
js/interface_common.js
View File

@ -704,10 +704,12 @@ function replyTextInput(event) {
} }
} }
if (textArea[0].value.length) if ($.Options.postPreview.val) {
textAreaForm.find('#post-preview').html(htmlFormatMsg(textArea[0].value, [])).show(); if (textArea[0].value.length)
else textAreaForm.find('#post-preview').html(htmlFormatMsg(textArea[0].value, [])).show();
textAreaForm.find('#post-preview').html('').hide(); else
textAreaForm.find('#post-preview').html('').hide();
}
} }
function getPostSplitingPML() { function getPostSplitingPML() {
@ -1276,9 +1278,7 @@ function postSubmit(e, oldLastPostId) {
var remainingCount = tweetForm.find('.post-area-remaining'); var remainingCount = tweetForm.find('.post-area-remaining');
remainingCount.text(140); remainingCount.text(140);
if ($this.parents('.modal-wrapper').length) if ($this.parents('.prompt-wrapper').length)
closeModal();
else if ($this.parents('.prompt-wrapper').length)
closeModalHandler('.prompt-wrapper'); closeModalHandler('.prompt-wrapper');
if ($this.closest('.post-area,.post-reply-content')) { if ($this.closest('.post-area,.post-reply-content')) {

7
theme_calm/css/style.css
View File

@ -783,6 +783,11 @@ textarea.splited-post {
font-size: 11px; font-size: 11px;
margin: 4px 0; margin: 4px 0;
padding: 4px; padding: 4px;
word-wrap: break-word;
}
#post-preview samp {
background-color: #EEE;
} }
.splited-post-counter { .splited-post-counter {
@ -1247,7 +1252,7 @@ textarea.splited-post {
} }
.post-text samp { .post-text samp {
background: #eee; background: #EEE;
} }
.post-context .post-context

7
theme_nin/css/style.css
View File

@ -879,7 +879,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
} }
.post-text samp { .post-text samp {
background: #eee; background-color: #EEE;
} }
/* line 138, ../sass/_postboard.sass */ /* line 138, ../sass/_postboard.sass */
@ -2276,6 +2276,7 @@ textarea.splited-post {
font-size: 12px; font-size: 12px;
margin: 4px 0; margin: 4px 0;
padding: 4px; padding: 4px;
word-wrap: break-word;
} }
#post-preview a { #post-preview a {
@ -2286,6 +2287,10 @@ textarea.splited-post {
color: #B4C669; color: #B4C669;
} }
#post-preview samp {
background-color: #EEE;
}
/* line 384, ../sass/style.sass */ /* line 384, ../sass/style.sass */
.splited-post-counter { .splited-post-counter {
color: rgba(0, 0, 0, 0.3); color: rgba(0, 0, 0, 0.3);

2
theme_nin/sass/_postboard.sass
View File

@ -135,7 +135,7 @@
min-height: 25px min-height: 25px
padding: 0 padding: 0
samp samp
background: #eee background-color: #EEE
.post-context .post-context
font-size: 11px font-size: 11px

3
theme_nin/sass/style.sass
View File

@ -360,10 +360,13 @@ ul.userMenu-search-profiles
font-size: 12px font-size: 12px
margin: 4px 0 margin: 4px 0
padding: 4px padding: 4px
word-wrap: break-word
a a
color: #AAA color: #AAA
a:hover a:hover
color: $color-green color: $color-green
samp
background-color: #EEE
#postboard-top #postboard-top
clear: both clear: both