Pārlūkot izejas kodu

Remove neat grid fm again. We won't be using it.

JC Brand 10 gadi atpakaļ
vecāks
revīzija
b176545605
3 mainītis faili ar 12 papildinājumiem un 21 dzēšanām
  1. 4 16
      css/converse.css
  2. 2 0
      css/converse.css.map
  3. 6 5
      sass/converse.scss

+ 4 - 16
css/converse.css

@@ -27,10 +27,6 @@
   content: "\e600"; }
 
 #conversejs {
-  /* Neat 1.7.0
-   * http://neat.bourbon.io
-   * Copyright 2012-2014 thoughtbot, inc.
-   * MIT License */
   color: #6C4C44;
   font-size: 14px;
   bottom: 0;
@@ -46,14 +42,10 @@
   box-sizing: border-box;
   /* @group Tabs */
   /* status dropdown styles */ }
-  #conversejs html {
+  #conversejs *, #conversejs *:before, #conversejs *:after {
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box; }
-  #conversejs *, #conversejs *:before, #conversejs *:after {
-    -webkit-box-sizing: inherit;
-    -moz-box-sizing: inherit;
-    box-sizing: inherit; }
   #conversejs a, #conversejs a:visited {
     text-decoration: none;
     color: #436F64;
@@ -462,8 +454,6 @@
     border: 0;
     background-color: #ffffff;
     line-height: 1.3em;
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
     height: 206px;
     height: calc(100% - 84px); }
   #conversejs .chat-info {
@@ -1073,9 +1063,9 @@
       border-bottom-right-radius: 4px;
       border: 0;
       height: 64px;
-      padding: 8px;
-      resize: none;
-      width: 100%; }
+      padding: 0.5em;
+      width: 100%;
+      resize: none; }
   #conversejs .chat-toolbar {
     font-size: 14px;
     margin: 0;
@@ -1229,5 +1219,3 @@
     margin-left: 0;
     cursor: n-resize;
     z-index: 20; }
-
-/*# sourceMappingURL=converse.css.map */

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 2 - 0
css/converse.css.map


+ 6 - 5
sass/converse.scss

@@ -32,7 +32,6 @@
 
 #conversejs {
   @import "../bourbon/bourbon";
-  @import "../components/neat/app/assets/stylesheets/neat";
   @import "variables";
   
   color: $text-color;
@@ -45,7 +44,11 @@
   right: 0;
   z-index: 30;
   display: block;
+
   @include box-sizing(border-box);
+  *, *:before, *:after {
+    @include box-sizing(border-box);
+  }
 
   a, a:visited {
     text-decoration: none;
@@ -393,8 +396,6 @@
     border: 0;
     background-color: #ffffff;
     line-height: 1.3em;
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
     height: 206px;
     height: calc(100% - #{$toolbar-height + $chat-textarea-height});
   }
@@ -1240,9 +1241,9 @@
       @include border-bottom-radius(4px);
       border: 0;
       height: $chat-textarea-height;
-      padding: 8px;
-      resize: none;
+      padding: 0.5em;
       width: 100%;
+      resize: none;
     }
   }
 

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels