Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen van Bergerem <svbergerem@online.de>2015-03-06 03:18:17 +0300
committerSteffen van Bergerem <svbergerem@online.de>2015-03-06 03:18:37 +0300
commit0f9ba4885c48fcacf35703f66ff58a609b4b3d74 (patch)
tree1ed9d226bbbcee2d16b77d1600683104ed3b265d /app/assets/stylesheets
parentc2dab008abca5243e3641779acc7713cf930abb7 (diff)
Import chat.scss and change container to container-fluid
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/application.scss1
-rw-r--r--app/assets/stylesheets/chat.scss4
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 1c982d810..7821b63c8 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -71,6 +71,7 @@
@import 'stream';
@import 'stream_element';
@import 'comments';
+@import 'chat';
/* right bar */
@import 'sidebar';
diff --git a/app/assets/stylesheets/chat.scss b/app/assets/stylesheets/chat.scss
index 88232bcf4..3be259038 100644
--- a/app/assets/stylesheets/chat.scss
+++ b/app/assets/stylesheets/chat.scss
@@ -1,7 +1,7 @@
-body > .container.chat-roster-shown {
+body > .container-fluid.chat-roster-shown {
padding-right: 224px;
#back-to-top { right: 244px; }
}
-body > .container.chat-roster-hidden {
+body > .container-fluid.chat-roster-hidden {
#back-to-top { right: 54px; }
}