Adjusting Tyler's corrections

bigbluebutton · Jun 8, 2015 · e44617b · e44617b
1 parent 8cf7328
commit e44617b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 16 deletions.
diff --git a/bigbluebutton-html5/app/client/stylesheets/chat.less b/bigbluebutton-html5/app/client/stylesheets/chat.less
@@ -6,7 +6,7 @@
     -webkit-order: 1;
     -ms-flex-order: 1;
     -ms-order: 1;
-    background-color: #EEEEEE;
+    border-bottom: 1px solid #E5E5E5;
     min-width: 205px;
     height: 45px;
     min-height: 45px;
@@ -43,6 +43,9 @@
     -ms-flex: 3 3 30%;
     flex: 3 3 30%;
     height: 100%;
+    border-top: 0px;
+    border-right: 0px;
+    border-top-left-radius: 0px;
   }
   order: 3;
 }
@@ -51,7 +54,7 @@
   list-style: none;
   margin: 0px;
   padding: 0px;
-
+  height: 100%;
   @media @desktop-portrait, @landscape {
     li {
       margin: 0px;
@@ -91,6 +94,7 @@
     grow:1;
     -webkit-grow: 1;
     -moz-grow: 1;
+    height: calc(~'100% - 45px');
   }
   overflow-y: auto;
   padding-left: 0px;
@@ -141,10 +145,6 @@
   float: left;
   width: 75%;
   resize: none;
-  border-bottom-left-radius: 10px;
-  border-top-left-radius: 10px;
-  border-bottom-right-radius: 0px;
-  border-top-right-radius: 0px;
   padding-top: 5px;
   padding-bottom: 0px;
 
@@ -173,7 +173,7 @@
   position: relative;
   background: extract(@white, 1);
   padding: 0;
-  border-top: 1px solid extract(@lightGrey, 3);
+  border-top: 1px solid #E5E5E5;
 }
 
 #sendMessageButton {
@@ -183,12 +183,7 @@
   font-weight: bold;
   height: 50px;
   margin: 0px;
-
   border: 1px solid extract(@lightGrey, 3);
-  border-bottom-left-radius: 00px;
-  border-top-left-radius: 0px;
-  border-top-right-radius: 10px;
-  border-bottom-right-radius: 10px;
 
   @media @desktop-portrait {
     width: 20%; /* 75% for the message input, 5% margin between the two */

diff --git a/bigbluebutton-html5/app/client/stylesheets/users.less b/bigbluebutton-html5/app/client/stylesheets/users.less
@@ -4,6 +4,10 @@
   font-size: 16px;
 }
 
+#usericons {
+  text-align: right;
+}
+
 .usernameEntry {
   float:left;
   overflow: hidden;
@@ -12,10 +16,11 @@
   width: 60%;
   @media @landscape {
     height: 20px;
+    font-size: 4.5mm;
   }
   @media @desktop-portrait {
     height: 25px;
-    font-size: 2vh;
+    font-size: 4.5mm;
   }
   @media @mobile-portrait, @mobile-portrait-with-keyboard {
     font-size: 4vw;
@@ -28,6 +33,10 @@
     -moz-flex: 1 1 20%;
     -ms-flex: 1 1 20%;
     flex: 1 1 20%;
+    border-left: 0px;
+    border-top: 0px;
+    border-top-right-radius: 0px;
+    background-color: #FAFAFA;
   }
   @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
     position: absolute;
@@ -82,4 +91,11 @@
   @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
     display: none;
   }
+  .closeSettings {
+    @media @landscape {    
+      color: #aaa;
+      font-style: normal;
+      font-size: 30px;
+    }
+  }
 }
diff --git a/bigbluebutton-html5/app/client/stylesheets/whiteboard.less b/bigbluebutton-html5/app/client/stylesheets/whiteboard.less
@@ -4,6 +4,9 @@
   padding: 0 !important;
   min-width: 0;
   @media @landscape {
+    border-top: 0px;
+    border-left: 0px;
+    border-right: 0px;
     -webkit-order: 2;
     order: 2;
     -webkit-flex: 7 7 70%;

diff --git a/bigbluebutton-html5/app/client/views/chat/chat_bar.html b/bigbluebutton-html5/app/client/views/chat/chat_bar.html
@@ -46,8 +46,10 @@
 </template>
 
 <template name="chatInputControls">
-  <textarea id="newMessageInput" rel="tooltip" data-placement="top" title="Write a new message"></textarea>
-  <button type="submit" id="sendMessageButton" class="btn" rel="tooltip" data-placement="top">Send</button>
+  <div class="button-group radius">
+    <textarea id="newMessageInput" rel="tooltip" data-placement="top" title="Write a new message"></textarea>
+    <input type="submit" id="sendMessageButton" class="button radius" rel="tooltip" data-placement="top" value="Send" />
+  </div>
 </template>
 
 <!-- Displays and styles an individual message in the chat -->

diff --git a/bigbluebutton-html5/app/client/views/users/users_list.html b/bigbluebutton-html5/app/client/views/users/users_list.html
@@ -2,7 +2,7 @@
   <div id="{{id}}" {{visibility name}} class="component {{class}}">
     <h3 class="meetingTitle">
       {{getMeetingName}}
-      <span class="closeUserlistIcon"><i class="ion-close-circled"></i></span>
+      <span class="closeUserlistIcon"><i class="closeSettings close-reveal-modal">&#215;</i></span>
     </h3>
     <div id="user-contents">
       <div class="userlist ScrollableWindowY">