Skip to content

Merge of Fixes from Community fixes 01 Challenge #1256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtwomey merged 13 commits into from
Oct 10, 2017
Merged

Merge of Fixes from Community fixes 01 Challenge #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3349f39
New branch and deployment for bug bash
mtwomey Sep 29, 2017
36887ce
Fix issue #994
shizhouxing Sep 30, 2017
f6706e6
Fix issue #946
shizhouxing Sep 30, 2017
b28f7d7
Fix for Code Blocks breaking in Feed
Oct 1, 2017
6e82410
Paragraph dividing fix
Oct 1, 2017
83849e2
fixes #1165 changed fonts path from absolute to relative
shubhendusaurabh Oct 1, 2017
0dcf0a1
Merge pull request #1216 from shubhendusaurabh/issue-1165
gondzo Oct 2, 2017
663053a
Merge pull request #1214 from shizhouxing/issue-946
gondzo Oct 6, 2017
5dc969f
Merge pull request #1213 from shizhouxing/issue-994
gondzo Oct 6, 2017
4c557f8
Merge branch 'test02' of git://github.com/HammadSiddiqui/connect-app …
gondzo Oct 6, 2017
a1307f5
add scrollbar to code blocks in posts
gondzo Oct 6, 2017
5ad56fb
Merge branch 'HammadSiddiqui-test02' into test02
gondzo Oct 6, 2017
c34f03a
Trial fix Issue: #990
kevinkid Oct 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionCard/ActionCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class Header extends React.Component{
<div className="portrait">
&nbsp;
</div>
<div className="object">
<div className="object topicBody">
<div className="card-header">
<div className="card-title">
<div>{this.props.title}</div>
Expand Down
9 changes: 9 additions & 0 deletions src/components/ActionCard/ActionCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@
&::before {
content: " · ";
}

a {
color: $tc-gray-70;
}
}

.card-status {
Expand All @@ -132,13 +136,18 @@
}
}

.topicBody{
width: calc(100% - 40px);
}

.card-body {
@include roboto;
font-size: $tc-label-lg;
color: $tc-gray-70;
line-height: $base-unit*5;
padding: 10px 0;
word-break: break-word;
overflow-x:auto;

&.comment-section {
margin-bottom: -50px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Feed/Feed.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class Feed extends React.Component {
<div className="portrait">
<Avatar avatarUrl={user.photoURL} userName={authorName} />
</div>
<div className="object">
<div className="object topicBody">
<div className="card-title">
<div>{title}</div>
{self && (
Expand Down
9 changes: 9 additions & 0 deletions src/components/Home/Home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
padding-bottom: $base-unit*6;
}
.tc-btn{
color: #cfe6ff;
height:$base-unit*8;
width: $base-unit*50;
text-align: center;
Expand All @@ -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;
}
}
}
}
1 change: 1 addition & 0 deletions src/projects/create/components/ProjectOutline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
margin-top: $base-unit * 4;
margin-bottom: $base-unit * 4;
word-break: break-all;
white-space: pre-line;
}

.project-meta-data {
Expand Down
3 changes: 2 additions & 1 deletion src/projects/detail/containers/Specification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ $sideBarWidth: 280px;
text-transform: none;
}

&:-moz-placeholder {
&::-moz-placeholder {
line-height: 45px;
color: #888894;
opacity: 1;
text-transform: none;
Expand Down
41 changes: 20 additions & 21 deletions src/styles/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}

Expand All @@ -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');