diff options
author | adityacp | 2020-04-27 14:50:28 +0530 |
---|---|---|
committer | adityacp | 2020-04-27 14:50:28 +0530 |
commit | 9fe624415d15f63f45a5327d74fe8c2432b03d13 (patch) | |
tree | 8781ccf6c01c8e124a0c836b487a23499e441bf1 /yaksh/static | |
parent | d5cdfe91335af6c79231d41453991af29a39e96e (diff) | |
parent | 53a0c4ad3e733f3960000527f83565f2fd8fc412 (diff) | |
download | online_test-9fe624415d15f63f45a5327d74fe8c2432b03d13.tar.gz online_test-9fe624415d15f63f45a5327d74fe8c2432b03d13.tar.bz2 online_test-9fe624415d15f63f45a5327d74fe8c2432b03d13.zip |
Resolve conflict
Diffstat (limited to 'yaksh/static')
-rw-r--r-- | yaksh/static/yaksh/css/custom.css | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/yaksh/static/yaksh/css/custom.css b/yaksh/static/yaksh/css/custom.css index c3050d5..697361d 100644 --- a/yaksh/static/yaksh/css/custom.css +++ b/yaksh/static/yaksh/css/custom.css @@ -104,3 +104,25 @@ body, .dropdown-menu { position: fixed !important; } } + +/* --------------------------------------------------- + FORUM STYLE +----------------------------------------------------- */ + +.brown-light { + background: #f4a460; + padding-left: 0.3em; + padding-right: 0.3em; + padding-top: 0.2em; + padding-bottom: 0.2em; +} + +.post_image, .comment_image { + width: 50%; + height: 50%; +} + +.description { + font-size: 16px; +} +>>>>>>> 53a0c4ad3e733f3960000527f83565f2fd8fc412 |