Merge branch 'developer'

This commit is contained in:
Nokita Kaze 2015-01-02 19:06:10 +03:00
commit 865f489dc0

View file

@ -233,12 +233,12 @@ div#markItUpText-input {
#point-plus-debug {
float: right;
display: block;
color: rgba(255,255,255,.75);
color: rgba(255, 255, 255, .75);
padding: 10px 0px;
}
/* User hints */
.current-user-hint{
.current-user-hint {
min-height: 30px;
position: relative;
}
@ -258,37 +258,37 @@ div#markItUpText-input {
display: block;
}
.current-user-hint > .text{
.current-user-hint > .text {
margin: 1em 0;
color: green;
font-style: italic;
}
.aside .aside-content #counters{
.aside .aside-content #counters {
clear: both;
}
.current-user-hint .change_hint_block{
.current-user-hint .change_hint_block {
}
.current-user-hint .change_hint_block textarea{
.current-user-hint .change_hint_block textarea {
width: 98%;
max-width: 98%;
margin-bottom: 10px;
height: 140px;
}
.current-user-hint .change_hint_block .button_save{
.current-user-hint .change_hint_block .button_save {
margin-right: 10px;
}
.current-user-hint .change_hint_block .button_cancel{
.current-user-hint .change_hint_block .button_cancel {
}
/* Шваброточки */
#comments .post .nesting{
#comments .post .nesting {
height: 24px;
float: left;
}