Some changes and trying to dropdown

ankitjain28may · Jan 21, 2017 · de24cb4 · de24cb4
1 parent 06d3fe5
commit de24cb4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/public/assests/css/message.css b/public/assests/css/message.css
@@ -52,28 +52,27 @@ body {
   height: 100%;
 }
 .side-one {
+  position: relative;
+  top: 0;
   padding: 0;
   margin: 0;
   height: 100%;
   width: 100%;
   z-index: 1;
-  position: relative;
   display: block;
-  top: 0;
 }
 
 .side-two {
+  position: absolute;
+  top: 0;
+  left: -100%;
   padding: 0;
   margin: 0;
   height: 100%;
   width: 100%;
   z-index: 2;
-  position: relative;
-  top: -100%;
-  left: -100%;
   -webkit-transition: left 0.3s ease;
   transition: left 0.3s ease;
-
 }
 
 
@@ -83,7 +82,7 @@ body {
   height: 60px;
   width: 100%;
   background-color: #eee;
-  z-index: 1000;
+  z-index: 10;
 }
 
 .heading-avatar {
@@ -140,6 +139,7 @@ body {
   padding: 5px;
   color: #93918f;
   cursor: pointer;
+  margin: 0;
 }
 
 .searchBox {
@@ -240,16 +240,14 @@ body {
   padding: 0;
   margin: 0;
   height: 100%;
-  position: relative;
-  left: -100%;
 }
 .newMessage-heading {
   padding: 10px 16px 10px 15px;
   margin: 0;
   height: 100px;
   width: 100%;
   background-color: #00bfa5;
-  z-index: 1001;
+  z-index: 11;
 }
 
 .newMessage-main {
@@ -258,7 +256,7 @@ body {
   height: 60px;
   margin-top: 30px;
   width: 100%;
-  z-index: 1001;
+  z-index: 11;
   color: #fff;
 }
 
@@ -420,7 +418,7 @@ body {
   padding: 10px 5px 10px 5px;
   margin: 0;
   vertical-align: middle;
-  z-index: 1000;
+  z-index: 12;
 }
 
 .reply-icons {
@@ -446,7 +444,7 @@ body {
   background-color: #333;
   padding: 5px;
   margin: 0;
-  z-index: 1000;
+  z-index: 13;
   vertical-align: middle;
   display: none;
 }
@@ -618,7 +616,7 @@ body {
     background-color: #333;
     padding: 5px;
     margin: 0;
-    z-index: 1000;
+    z-index: 13;
     vertical-align: middle;
     display: none;
   }

diff --git a/public/assests/js/message.js b/public/assests/js/message.js
@@ -152,7 +152,7 @@ function setConversationDetails(details)
   headingEleName.append(headingOnline);
 
   var headingDot = $("<div></div>").addClass("col-sm-1 col-xs-1  heading-dot pull-right");
-  var headingDotIcon = $("<i></i>").addClass("fa fa-ellipsis-v fa-2x  pull-right").attr({"aria-hidden" : "true"});
+  var headingDotIcon = $("<i></i>").addClass("fa fa-ellipsis-v fa-2x").attr({"aria-hidden" : "true"});
   headingDot.append(headingDotIcon);
 
 
@@ -448,6 +448,7 @@ $(document).ready(function(){
 
   $(".newMessage-back").click(function() {
     hideComposeScreen();
+    $("#composeText").val("");
   });
 
   $("#conversation").scroll(function() {

diff --git a/views/message.php b/views/message.php
@@ -40,11 +40,16 @@
                 <img src="../public/assests/img/ankit.png">
               </div>
             </div>
-            <div class="col-sm-1 col-xs-1  heading-dot  pull-right">
-              <i class="fa fa-ellipsis-v fa-2x  pull-right" aria-hidden="true"></i>
+            <div class="col-sm-1 col-xs-2  heading-dot  pull-right dropdown">
+              <i class="fa fa-ellipsis-v fa-2x dropdown-toggle" aria-hidden="true" data-toggle="dropdown"></i>
+              <ul class="dropdown-menu">
+                <li><a href="#">HTML</a></li>
+                <li><a href="#">CSS</a></li>
+                <li><a href="#">JavaScript</a></li>
+              </ul>
             </div>
             <div class="col-sm-2 col-xs-2 heading-compose  pull-right">
-              <i class="fa fa-comments fa-2x  pull-right" aria-hidden="true"></i>
+              <i class="fa fa-comments fa-2x" aria-hidden="true"></i>
             </div>
           </div>
           <!-- Heading End -->