Merge pull request #225 from m1x0n/hot-fix-modern-style

Hot fix modern style
B1naryStudio · Oct 19, 2015 · 2897561 · 2897561
2 parents 823959c + a365e4f
commit 2897561
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 42 deletions.
diff --git a/public/assets/css/style.css b/public/assets/css/style.css
@@ -592,7 +592,7 @@ body.modal-open {
 
 .single-answer .best-controls {
     position: absolute;
-    left: 13px;
+    left: 0;
     top: 0;
 }
 
@@ -633,13 +633,12 @@ body.modal-open {
 
 .entry-controls {
     position: absolute;
-    right: 10px;
+    right: 0;
 }
 
 .single-comment .entry-controls {
     position: absolute;
     bottom: 0;
-    right: 10px;
 }
 
 .best .single-answer,
@@ -1149,6 +1148,10 @@ blockquote .author {
     outline-offset: 0;
 }
 
+#answers .single-comment .user-info {
+    min-width: 100px;
+}
+
 .form-open {
     background-color: #5b5b5b;
     border-color: #adadad;
@@ -1317,30 +1320,37 @@ blockquote .author {
 }
 
 .single-answer .user-info {
-    margin-left: 18px;
+    margin: auto 20px;
 }
 
 .single-answer .answer-body {
     display: table;
+    width: 100%;
+    margin: 0;
 }
 
 .answer-body .avatar-block,
 .answer-body .content-block {
     float: none;
     display: table-cell;
+    padding: 0;
 }
 
 .answer-body .content-block {
     vertical-align: top;
     padding-bottom: 30px;
 }
 
+.answer-body .content-block,
+.single-answer .actions {
+    padding-left: 10px;
+}
+
 .single-answer .actions {
     position: absolute;
     bottom: 0;
     left: 0;
     width: 100%;
-    padding-left: 15px;
 }
 
 /*
@@ -1426,7 +1436,7 @@ div .fa-05 {
 }
 
 .paginator .active a:hover {
-    background-color: #5b5b5b;
+    background-color: #222;
     color: #ffffff;
 }
 
@@ -1695,10 +1705,6 @@ div .fa-05 {
     #answers .votes .like-vote {
         left: 0;
     }
-
-    .single-answer .best-controls {
-        left: 5px;
-    }
 }
 
 @media (max-width: 350px) {
@@ -2012,6 +2018,7 @@ div .fa-05 {
     }
 
     #question-list .img-thumbnail.big,
+    #answers .img-thumbnail,
     .my-questions .img-thumbnail,
     .my-answers .img-thumbnail {
         max-width: 75px;
@@ -2046,8 +2053,9 @@ div .fa-05 {
         display: none !important;
     }
 
-    .single-answer .best-controls {
-        left: 8px;
+    .answer-body .avatar-block,
+    .answer-body .content-block {
+        display: block;
     }
 }
 
@@ -2066,9 +2074,10 @@ div .fa-05 {
     }
 
     .comments-region,
-    .comment-form {
-        width: 80%;
-        margin-left: 20%;
+    .comment-form,
+    .comment-list .folding-controls .control {
+        width: 84%;
+        margin-left: 16%;
     }
 
     .questions-answers {
@@ -2104,8 +2113,12 @@ div .fa-05 {
         margin-left: 6.2%;
     }
 
-    .single-answer .best-controls {
-        left: 8px;
+    #answers .col-md-2 {
+        width: 25%;
+    }
+
+    #answers .col-md-10 {
+        width: 75%;
     }
 }
 
@@ -2120,25 +2133,19 @@ div .fa-05 {
     .tag-element:nth-child(5n) {
         margin-left: 3.7%;
     }
-
-    .single-answer .best-controls {
-        left: 8px;
-    }
 }
 
-/*@media (min-width: 1000px) {
-    .container {
-        width: 940px;
-    }
-}*/
-
 @media (min-width: 1250px) {
     .container {
         width: 1100px;
     }
 
-    .single-answer .best-controls {
-        left: 10px;
+    #answers .col-md-2 {
+        width: 17%;
+    }
+
+    #answers .col-md-10 {
+        width: 83%;
     }
 }
 
@@ -2147,13 +2154,6 @@ div .fa-05 {
         width: 1170px;
     }
 
-    .comments-region,
-    .comment-form,
-    .comment-list .folding-controls .control {
-        width: 88%;
-        margin-left: 12%;
-    }
-
     .tag-element {
         width: 17%;
     }
@@ -2164,8 +2164,4 @@ div .fa-05 {
     .tag-element:nth-child(5n) {
         margin-left: 3.7%;
     }
-
-    .single-answer .best-controls {
-        left: 13px;
-    }
 }
diff --git a/public/assets/fonts/glyphicons-halflings-regular.ttf b/public/assets/fonts/glyphicons-halflings-regular.ttf
diff --git a/public/assets/fonts/glyphicons-halflings-regular.woff b/public/assets/fonts/glyphicons-halflings-regular.woff
diff --git a/public/assets/fonts/glyphicons-halflings-regular.woff2 b/public/assets/fonts/glyphicons-halflings-regular.woff2
diff --git a/public/js/views/templates/comment/single-comment.tpl b/public/js/views/templates/comment/single-comment.tpl
@@ -1,6 +1,6 @@
 <div class="row">
     <!-- User info -->
-    <div class="col-md-2 col-lg-2 col-sm-2">
+    <div class="col-md-2 col-lg-2 col-sm-2 user-info-container">
         <figure class="user-info text-center">
             <img src="<%- user.thumb_avatar %>" alt="100x100" class="img-thumbnail medium">
             <h5><%= user.first_name + ' ' + user.last_name %></h5>

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
@@ -5,7 +5,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, width=device-width">
     <title>Asciit</title>
     <link href="assets/css/bootstrap.min.css" rel="stylesheet" />
-    <link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css" rel="stylesheet" />
     <link href="http://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/css/select2.min.css" rel="stylesheet" />
     <link href="http://team.binary-studio.com/app/styles/css/style.css" rel="stylesheet" />
     @if ($is_min)