From 3349f399579623921d1ba3d6bac54bd24c02bf5d Mon Sep 17 00:00:00 2001 From: Matthew Twomey Date: Fri, 29 Sep 2017 16:00:44 -0500 Subject: [PATCH 1/8] New branch and deployment for bug bash --- circle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/circle.yml b/circle.yml index fd35990be..2084eb9ca 100644 --- a/circle.yml +++ b/circle.yml @@ -28,6 +28,11 @@ deployment: owner: appirio-tech commands: - ./deploy.sh TEST01 + test02: + branch: test02 + owner: appirio-tech + commands: + - ./deploy.sh TEST02 qa: branch: qa owner: appirio-tech From 36887cee696a58c0e397e62ebd62163dda06d1b5 Mon Sep 17 00:00:00 2001 From: Zhouxing Shi Date: Sat, 30 Sep 2017 23:01:27 +0800 Subject: [PATCH 2/8] Fix issue #994 --- src/projects/detail/containers/Specification.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/projects/detail/containers/Specification.scss b/src/projects/detail/containers/Specification.scss index e12db078e..637700415 100644 --- a/src/projects/detail/containers/Specification.scss +++ b/src/projects/detail/containers/Specification.scss @@ -85,7 +85,8 @@ $sideBarWidth: 280px; text-transform: none; } - &:-moz-placeholder { + &::-moz-placeholder { + line-height: 45px; color: #888894; opacity: 1; text-transform: none; From f6706e6db10c3cc1e4f56f0100b5866b79cf3758 Mon Sep 17 00:00:00 2001 From: Zhouxing Shi Date: Sat, 30 Sep 2017 23:20:37 +0800 Subject: [PATCH 3/8] Fix issue #946 --- src/components/ActionCard/ActionCard.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/ActionCard/ActionCard.scss b/src/components/ActionCard/ActionCard.scss index 166967f6a..ed0990f37 100644 --- a/src/components/ActionCard/ActionCard.scss +++ b/src/components/ActionCard/ActionCard.scss @@ -124,6 +124,10 @@ &::before { content: " ยท "; } + + a { + color: $tc-gray-70; + } } .card-status { From b28f7d79b7e9b9725f86eae346b1541f40d8a5b7 Mon Sep 17 00:00:00 2001 From: Hammad Siddiqui Date: Sun, 1 Oct 2017 12:21:01 +0500 Subject: [PATCH 4/8] Fix for Code Blocks breaking in Feed The following fix wraps the code block in the feed to the size of its parent (i.e the size of the post) --- src/components/Feed/draftjs.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Feed/draftjs.scss b/src/components/Feed/draftjs.scss index de1d851e8..cac45de63 100644 --- a/src/components/Feed/draftjs.scss +++ b/src/components/Feed/draftjs.scss @@ -104,6 +104,7 @@ color: #333; border: 1px solid #ededf2; border-radius: 4px; + white-space: pre-wrap; } strong { font-weight: bold; From 6e824100e1a2aea6d9aa6e8f2bd0133cc784a4dd Mon Sep 17 00:00:00 2001 From: Hammad Siddiqui Date: Sun, 1 Oct 2017 14:55:51 +0500 Subject: [PATCH 5/8] Paragraph dividing fix --- src/projects/create/components/ProjectOutline.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/projects/create/components/ProjectOutline.scss b/src/projects/create/components/ProjectOutline.scss index 172aed47b..41750e8b0 100644 --- a/src/projects/create/components/ProjectOutline.scss +++ b/src/projects/create/components/ProjectOutline.scss @@ -37,6 +37,7 @@ margin-top: $base-unit * 4; margin-bottom: $base-unit * 4; word-break: break-all; + white-space: pre; } .project-meta-data { From 83849e2c5cf8dc3cd03b08315c03f8dba05f1870 Mon Sep 17 00:00:00 2001 From: shubhu Date: Sun, 1 Oct 2017 23:57:13 +0530 Subject: [PATCH 6/8] fixes #1165 changed fonts path from absolute to relative --- src/styles/_fonts.scss | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss index aba02dca7..b955b4c88 100644 --- a/src/styles/_fonts.scss +++ b/src/styles/_fonts.scss @@ -1,17 +1,16 @@ // FONT STACK // -------------------------------------------------------------------------------------------- // Use the mixin to include fonts. - @mixin font-family($font-name, $font-weight, $font-style, $font-url, $font-file) { @font-face { - font-family: '#{$font-name}'; - src: url('#{$font-url}#{$font-file}.eot'); - src: url('#{$font-url}#{$font-file}.eot?#iefix') format('embedded-opentype'), - url('#{$font-url}#{$font-file}.woff') format('woff'), - url('#{$font-url}#{$font-file}.ttf') format('truetype'), - url('#{$font-url}.svg##{$font-file}') format('svg'); - font-weight: $font-weight; - font-style: $font-style; + font-family: '#{$font-name}'; + src: url('#{$font-url}#{$font-file}.eot'); + src: url('#{$font-url}#{$font-file}.eot?#iefix') format('embedded-opentype'), + url('#{$font-url}#{$font-file}.woff') format('woff'), + url('#{$font-url}#{$font-file}.ttf') format('truetype'), + url('#{$font-url}#{$font-file}.svg##{$font-name}') format('svg'); + font-weight: $font-weight; + font-style: $font-style; } } @@ -30,20 +29,20 @@ // 900 Black (Heavy) // Roboto -@include font-family('Roboto', 900, normal, '~/src/assets/fonts/roboto/', 'roboto-black'); -@include font-family('Roboto', 900, italic, '~/src/assets/fonts/roboto/', 'roboto-blackitalic'); +@include font-family('Roboto', 900, normal, '../assets/fonts/roboto/', 'roboto-black'); +@include font-family('Roboto', 900, italic, '../assets/fonts/roboto/', 'roboto-blackitalic'); -@include font-family('Roboto', 700, normal, '~/src/assets/fonts/roboto/', 'roboto-bold'); -@include font-family('Roboto', 700, italic, '~/src/assets/fonts/roboto/', 'roboto-bolditalic'); +@include font-family('Roboto', 700, normal, '../assets/fonts/roboto/', 'roboto-bold'); +@include font-family('Roboto', 700, italic, '../assets/fonts/roboto/', 'roboto-bolditalic'); -@include font-family('Roboto', 500, normal, '~/src/assets/fonts/roboto/', 'roboto-medium'); -@include font-family('Roboto', 500, italic, '~/src/assets/fonts/roboto/', 'roboto-mediumitalic'); +@include font-family('Roboto', 500, normal, '../assets/fonts/roboto/', 'roboto-medium'); +@include font-family('Roboto', 500, italic, '../assets/fonts/roboto/', 'roboto-mediumitalic'); -@include font-family('Roboto', 400, normal, '~/src/assets/fonts/roboto/', 'roboto-regular'); -@include font-family('Roboto', 400, italic, '~/src/assets/fonts/roboto/', 'roboto-italic'); +@include font-family('Roboto', 400, normal, '../assets/fonts/roboto/', 'roboto-regular'); +@include font-family('Roboto', 400, italic, '../assets/fonts/roboto/', 'roboto-italic'); -@include font-family('Roboto', 300, normal, '~/src/assets/fonts/roboto/', 'roboto-light'); -@include font-family('Roboto', 300, italic, '~/src/assets/fonts/roboto/', 'roboto-lightitalic'); +@include font-family('Roboto', 300, normal, '../assets/fonts/roboto/', 'roboto-light'); +@include font-family('Roboto', 300, italic, '../assets/fonts/roboto/', 'roboto-lightitalic'); -@include font-family('Roboto', 100, normal, '~/src/assets/fonts/roboto/', 'roboto-thin'); -@include font-family('Roboto', 100, italic, '~/src/assets/fonts/roboto/', 'roboto-thinitalic'); +@include font-family('Roboto', 100, normal, '../assets/fonts/roboto/', 'roboto-thin'); +@include font-family('Roboto', 100, italic, '../assets/fonts/roboto/', 'roboto-thinitalic'); From a1307f5d9d053be4a69220ddd5655e580c0913da Mon Sep 17 00:00:00 2001 From: Samir Gondzetovic Date: Fri, 6 Oct 2017 12:50:16 +0100 Subject: [PATCH 7/8] add scrollbar to code blocks in posts --- src/components/ActionCard/ActionCard.jsx | 2 +- src/components/ActionCard/ActionCard.scss | 5 +++++ src/components/Feed/Feed.jsx | 2 +- src/components/Feed/draftjs.scss | 1 - src/projects/create/components/ProjectOutline.scss | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/ActionCard/ActionCard.jsx b/src/components/ActionCard/ActionCard.jsx index f9bcf8a36..1b5106820 100644 --- a/src/components/ActionCard/ActionCard.jsx +++ b/src/components/ActionCard/ActionCard.jsx @@ -75,7 +75,7 @@ class Header extends React.Component{
 
-
+
{this.props.title}
diff --git a/src/components/ActionCard/ActionCard.scss b/src/components/ActionCard/ActionCard.scss index ed0990f37..14e64fcc2 100644 --- a/src/components/ActionCard/ActionCard.scss +++ b/src/components/ActionCard/ActionCard.scss @@ -136,6 +136,10 @@ } } + .topicBody{ + width: calc(100% - 40px); + } + .card-body { @include roboto; font-size: $tc-label-lg; @@ -143,6 +147,7 @@ line-height: $base-unit*5; padding: 10px 0; word-break: break-word; + overflow-x:auto; &.comment-section { margin-bottom: -50px; diff --git a/src/components/Feed/Feed.jsx b/src/components/Feed/Feed.jsx index b2742f455..b51cc2e51 100644 --- a/src/components/Feed/Feed.jsx +++ b/src/components/Feed/Feed.jsx @@ -77,7 +77,7 @@ class Feed extends React.Component {
-
+
{title}
{self && ( diff --git a/src/components/Feed/draftjs.scss b/src/components/Feed/draftjs.scss index cac45de63..de1d851e8 100644 --- a/src/components/Feed/draftjs.scss +++ b/src/components/Feed/draftjs.scss @@ -104,7 +104,6 @@ color: #333; border: 1px solid #ededf2; border-radius: 4px; - white-space: pre-wrap; } strong { font-weight: bold; diff --git a/src/projects/create/components/ProjectOutline.scss b/src/projects/create/components/ProjectOutline.scss index 41750e8b0..7f5766f6a 100644 --- a/src/projects/create/components/ProjectOutline.scss +++ b/src/projects/create/components/ProjectOutline.scss @@ -37,7 +37,7 @@ margin-top: $base-unit * 4; margin-bottom: $base-unit * 4; word-break: break-all; - white-space: pre; + white-space: pre-line; } .project-meta-data { From c34f03af439ab15e0b6d0fe55c9f31c9ed3c467e Mon Sep 17 00:00:00 2001 From: kevinkid Date: Sat, 7 Oct 2017 13:58:08 +0300 Subject: [PATCH 8/8] Trial fix Issue: #990 --- src/components/Home/Home.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/Home/Home.scss b/src/components/Home/Home.scss index f48b1f5e9..bf2d5755d 100644 --- a/src/components/Home/Home.scss +++ b/src/components/Home/Home.scss @@ -70,6 +70,7 @@ padding-bottom: $base-unit*6; } .tc-btn{ + color: #cfe6ff; height:$base-unit*8; width: $base-unit*50; text-align: center; @@ -79,6 +80,14 @@ font-size: $tc-label-lg; display: block; margin-bottom: $base-unit * 4; + &:hover { + color:#ffffff; + background-image: linear-gradient(#3996FF 0%, #127BF3 100%) !important; + } + &:active { + color:#ffffff; + background-image: linear-gradient(#3996FF 0%, #127BF3 100%) !important; + } } } } \ No newline at end of file