Merge pull request #54 from topcoder-platform/develop

v1.7

Author: jmgasper

design/custom.css

@@ -0,0 +1,8 @@
+"use strict"
+$( document ).ready(function() {
+  $( "ul.DataList.GroupList li.Item .ItemContent.Group" ).each(function( index ) {
+    var originalMeta = $( this ).find('.Meta.Meta-Group');
+    $(this).append(originalMeta.clone().addClass('view-comment-container hide-desktop'));
+    originalMeta.addClass('status-container');
+  });
+})

design/custom.css.map

@@ -8,6 +8,7 @@ import "../../node_modules/@vanillaforums/theme-boilerplate/src/js/index";
 import "./header";
 import "./body";
 import "./discussions";
+import "./groups";
 import "./pageControls";
 import "./categories";
 import "./formsFields";

design/images/topcoder-image.png

@@ -5,17 +5,28 @@
 .Button:not(.GroupOptionsTitle), .Buttons .btn-primary,
 .BoxButtons.BoxNewDiscussion .Button.Primary,
 .PageControls .Button-Controls .Button.Primary,
-.Form-BodyWrap .FormTitleWrapper .Buttons .Button.Primary,
-.Form-BodyWrap .FormWrapper .Buttons .Button.Primary
+.FormTitleWrapper .Buttons .Button, .FormWrapper .Buttons .Button,
+.FormTitleWrapper .Buttons .Button.Primary, .FormWrapper .Buttons .Button.Primary,
+body.Post .FormTitleWrapper .Buttons .Button.Primary, body.Post .FormWrapper .Buttons .Button.Primary,
+body.Post .FormTitleWrapper .Buttons .Button, body.Post .FormWrapper .Buttons .Button,
+form .Buttons .Button, form .Buttons .Button.Cancel,
+form .Buttons .Button.PreviewButton,
+form .Buttons .Button.WriteButton,
+form .Buttons .Button.Primary.CommentButton,
+.Button.CancelReplyComment,
+.FormTitleWrapper .Buttons .Button.CancelReplyComment, .FormWrapper .Buttons .Button.CancelReplyComment
 {
   font-size: $global-small_fontSize !important;
   font-weight: $global-medium_fontWeight !important;
   letter-spacing: 0.69px !important;
   height: 30px;
-  line-height: 34px;
+  min-height: 30px;
+  line-height: 30px;
   text-transform: uppercase;
   border-radius: 20px !important;
   padding: 0 20px !important;
+  min-width: 100px;
+  text-align: center;
 }
 .Button.Primary.Delete, .Buttons .Close {
   letter-spacing: 0.8px !important;
@@ -30,6 +41,19 @@
   height: 40px;
 }
 
+.watchButton{
+  vertical-align: top;
+}
+h1 .watchButton {
+   padding: 5px 10px;
+   display: inline-block;
+   line-height: 22px !important;
+
+   &.isWatching {
+     padding: 1px 10px;
+     line-height: 21px !important;
+   }
+}
 
 .ReactButton.Quote {
   vertical-align: inherit;

js/custom.js

@@ -31,6 +31,21 @@
   flex: auto;
 }
 
+.block {
+  clear: both;
+  overflow: hidden;
+}
+.col-span-1 {
+  flex-grow: 1;
+}
+
+.col-span-2 {
+  flex-grow: 2;
+}
+.flex-grow, .flex-grow-1 {
+  flex-grow: 1;
+}
+
 @media screen and (max-width: 768px) {
   .hide-mobile {
     display: none !important;

js/custom.js.map

@@ -9,7 +9,7 @@
 
     .Options {
        a.Delete {
-         color: #555555;
+         color: $global-color_grey;
          font-family: $global-image_fontFamily;
          font-size: 32px;
          font-weight: $global-image_fontWeight;

src/js/groups.js

@@ -64,8 +64,3 @@
     border-right: 2px solid #EF476F;
   }
 }
-.DiscussionForm {
-   .countOfRemainingChars {
-     display: none;
-   }
-}