aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2015-03-01 14:19:16 +0100
committerMaZderMind2015-03-01 14:19:16 +0100
commitf8362a9c02778b12b90b9e0f497f883fcca7c994 (patch)
tree5ca3bcc8486d41cab786a8f64d1642d5135f572a
parent83a5c99209d7eba013dcd89c3a42190b59d20e57 (diff)
Feedback-Form and Chat-Tab tweaks
-rw-r--r--assets/css/_room.less18
-rw-r--r--assets/css/_structure.less2
-rw-r--r--template/assemblies/chat.phtml30
-rw-r--r--template/assemblies/feedback.phtml7
4 files changed, 35 insertions, 22 deletions
diff --git a/assets/css/_room.less b/assets/css/_room.less
index 65b45b9..e7b3af3 100644
--- a/assets/css/_room.less
+++ b/assets/css/_room.less
@@ -55,6 +55,20 @@
}
}
}
-}
-@import "_program.less";
+ #feedback {
+ padding: floor(@grid-gutter-width/2) 0;
+
+ .feedback-thankyou {
+ font-size: @jumbo-font-size;
+ text-align: center;
+ padding: 30px;
+
+ display: none;
+ }
+ }
+
+ #program {
+ @import "_program.less";
+ }
+}
diff --git a/assets/css/_structure.less b/assets/css/_structure.less
index 8a616a8..65c9898 100644
--- a/assets/css/_structure.less
+++ b/assets/css/_structure.less
@@ -9,7 +9,7 @@
@jumbo-line-height: 45px;
@program-now: @brand-danger;
-@program-now-bg: fade(lighten(@brand-danger, 20%), 60%);
+@program-now-bg: fade(lighten(@brand-danger, 5%), 60%);
@program-room: darken(@brand-primary, 15%);
@program-author: #444;
diff --git a/template/assemblies/chat.phtml b/template/assemblies/chat.phtml
index e3aab6c..13da67e 100644
--- a/template/assemblies/chat.phtml
+++ b/template/assemblies/chat.phtml
@@ -1,16 +1,14 @@
-<div class="chat">
- <? if(room_has_irc($room)): ?>
- <div>
- <a class="btn btn-primary irclink" href="<?=h(room_get_irc_url($room))?>">
- <span class="fa fa-comment"></span> <?=h(room_get_irc_display($room))?>
- </a>
- </div>
- <? endif ?>
- <? if(room_has_twitter($room)): ?>
- <div>
- <a class="btn btn-success twitterlink" href="https://twitter.com/intent/tweet?text=<?=h(rawurlencode(room_get_twitter_hashtag($room)))?>" target="_blank">
- <span class="fa fa-twitter"></span> <?=h(room_get_twitter_display($room))?>
- </a>
- </div>
- <? endif ?>
-</div>
+<? if(room_has_irc($room)): ?>
+ <div>
+ <a class="btn btn-primary irclink" href="<?=h(room_get_irc_url($room))?>">
+ <span class="fa fa-comment"></span> <?=h(room_get_irc_display($room))?>
+ </a>
+ </div>
+<? endif ?>
+<? if(room_has_twitter($room)): ?>
+ <div>
+ <a class="btn btn-success twitterlink" href="https://twitter.com/intent/tweet?text=<?=h(rawurlencode(room_get_twitter_hashtag($room)))?>" target="_blank">
+ <span class="fa fa-twitter"></span> <?=h(room_get_twitter_display($room))?>
+ </a>
+ </div>
+<? endif ?>
diff --git a/template/assemblies/feedback.phtml b/template/assemblies/feedback.phtml
index 6633d32..6979bfc 100644
--- a/template/assemblies/feedback.phtml
+++ b/template/assemblies/feedback.phtml
@@ -1,4 +1,4 @@
-<form action="feedback/" target="feedback-target" method="post" role="form" class="feedback-form form-horizontal">
+<form action="feedback/" target="feedback-target" method="post" role="form" class="feedback-form">
<div class="col-sm-4 col">
<div class="form-group">
<label for="net">Network Connection</label>
@@ -134,9 +134,10 @@
</div>
<div class="form-group">
- <input type="submit" value="Submit" />
+ <input class="btn btn-primary" type="submit" value="Submit" />
</div>
</div>
</form>
+
<h3 class="feedback-thankyou">Thank you!</h3>
-<iframe name="feedback-target"></iframe>
+<iframe name="feedback-target" style="display: none;"></iframe>