Commits

Anonymous committed 223e3bd Merge

Merge branch 'development' of github.com:encuestame/encuestame into dianmorales

  • Participants
  • Parent commits 980fb67, bfed538

Comments (0)

Files changed (2)

File encuestame-war/src/main/webapp/WEB-INF/views/home/web/item.jsp

                         hashTagName="${h.hashTagName}"></span>
                 </c:forEach>
             </div>
-<!--             <div class="stats"> -->
-
-<!--             </div> -->
         </div>
+        <div class="stats-rating">
+              <nav>
+                  <div class="stats-rating-section">
+                        <div class="like total">2134</div>
+                        <div class="image">
+                            <img src="<%=request.getContextPath()%>/resources/images/icons/enme_like.png" width="20px" height="20px" />
+                        </div>
+                  </div>
+                  <div class="stats-rating-section">
+                       <div class="unlike total">213</div>
+                        <div class="image">
+                            <img src="<%=request.getContextPath()%>/resources/images/icons/emne_unlike.png" width="20px" height="20px" />
+                       </div>
+                  </div>
+              </nav>
+       </div>
     </div>
 </section>

File encuestame-war/src/main/webapp/resource/css/web/public.css

 }
 
 #web-main-public-line .web-left-wrapper .section .web-aside-section {
-	min-height: 130px;
+    min-height: 130px;
 }
 
 #web-main-public-line .web-left-wrapper .section div.link {
     padding: 7px;
 }
 
+.web-item-wrapper .item .stats-rating {
+  background-color: #6A6D6F;
+  border-radius: 7px 7px 7px 7px;
+  color: #FFFFFF;
+  float: right;
+  font-size: 120%;
+  font-weight: bold;
+  max-height: 26px;
+  padding: 0;
+}
+
+.web-item-wrapper .item .stats-rating .stats-rating-section {
+  float: left;
+  padding: 2px;
+  width: 65px;
+}
+
+.web-item-wrapper .item  .stats-rating .stats-rating-section .image{
+
+}
+
+.web-item-wrapper .item .stats-rating .stats-rating-section .total {
+  float: left;
+  margin-top: 4px;
+}
+
+.web-item-wrapper .item  .stats-rating .like{
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
+.web-item-wrapper .item  .stats-rating .unlike{
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
+
 .web-item-wrapper .item .img {
     float: left;
     margin-right: 10px;
 }
 
 .web-item-wrapper .item .content .bottom {
-  position: relative;
+  float: left;
   width: auto;
 }