Skip to content

Commit f104bf8

Browse files
mtwomeymtwomey
authored
Merge pull request #1256 from appirio-tech/test02
Merge of Fixes from Community fixes 01 Challenge
2 parents 913b29c + c34f03a commit f104bf8

File tree

8 files changed

+48
-24
lines changed

8 files changed

+48
-24
lines changed

‎circle.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ deployment:
2828
owner: appirio-tech
2929
commands:
3030
- ./deploy.sh TEST01
31+
test02:
32+
branch: test02
33+
owner: appirio-tech
34+
commands:
35+
- ./deploy.sh TEST02
3136
qa:
3237
branch: qa
3338
owner: appirio-tech

‎src/components/ActionCard/ActionCard.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class Header extends React.Component{
7575
<div className="portrait">
7676
&nbsp;
7777
</div>
78-
<div className="object">
78+
<div className="object topicBody">
7979
<div className="card-header">
8080
<div className="card-title">
8181
<div>{this.props.title}</div>

‎src/components/ActionCard/ActionCard.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@
124124
&::before {
125125
content: " · ";
126126
}
127+
128+
a {
129+
color: $tc-gray-70;
130+
}
127131
}
128132

129133
.card-status {
@@ -132,13 +136,18 @@
132136
}
133137
}
134138

139+
.topicBody{
140+
width: calc(100% - 40px);
141+
}
142+
135143
.card-body {
136144
@include roboto;
137145
font-size: $tc-label-lg;
138146
color: $tc-gray-70;
139147
line-height: $base-unit*5;
140148
padding: 10px 0;
141149
word-break: break-word;
150+
overflow-x:auto;
142151

143152
&.comment-section {
144153
margin-bottom: -50px;

‎src/components/Feed/Feed.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Feed extends React.Component {
7777
<div className="portrait">
7878
<Avatar avatarUrl={user.photoURL} userName={authorName} />
7979
</div>
80-
<div className="object">
80+
<div className="object topicBody">
8181
<div className="card-title">
8282
<div>{title}</div>
8383
{self && (

‎src/components/Home/Home.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
padding-bottom: $base-unit*6;
7171
}
7272
.tc-btn{
73+
color: #cfe6ff;
7374
height:$base-unit*8;
7475
width: $base-unit*50;
7576
text-align: center;
@@ -79,6 +80,14 @@
7980
font-size: $tc-label-lg;
8081
display: block;
8182
margin-bottom: $base-unit * 4;
83+
&:hover {
84+
color:#ffffff;
85+
background-image: linear-gradient(#3996FF 0%, #127BF3 100%) !important;
86+
}
87+
&:active {
88+
color:#ffffff;
89+
background-image: linear-gradient(#3996FF 0%, #127BF3 100%) !important;
90+
}
8291
}
8392
}
8493
}

‎src/projects/create/components/ProjectOutline.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
margin-top: $base-unit * 4;
3838
margin-bottom: $base-unit * 4;
3939
word-break: break-all;
40+
white-space: pre-line;
4041
}
4142

4243
.project-meta-data {

‎src/projects/detail/containers/Specification.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ $sideBarWidth: 280px;
8585
text-transform: none;
8686
}
8787

88-
&:-moz-placeholder {
88+
&::-moz-placeholder {
89+
line-height: 45px;
8990
color: #888894;
9091
opacity: 1;
9192
text-transform: none;

‎src/styles/_fonts.scss‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
// FONT STACK
22
// --------------------------------------------------------------------------------------------
33
// Use the mixin to include fonts.
4-
54
@mixin font-family($font-name, $font-weight, $font-style, $font-url, $font-file) {
65
@font-face {
7-
font-family: '#{$font-name}';
8-
src: url('#{$font-url}#{$font-file}.eot');
9-
src: url('#{$font-url}#{$font-file}.eot?#iefix') format('embedded-opentype'),
10-
url('#{$font-url}#{$font-file}.woff') format('woff'),
11-
url('#{$font-url}#{$font-file}.ttf') format('truetype'),
12-
url('#{$font-url}.svg##{$font-file}') format('svg');
13-
font-weight: $font-weight;
14-
font-style: $font-style;
6+
font-family: '#{$font-name}';
7+
src: url('#{$font-url}#{$font-file}.eot');
8+
src: url('#{$font-url}#{$font-file}.eot?#iefix') format('embedded-opentype'),
9+
url('#{$font-url}#{$font-file}.woff') format('woff'),
10+
url('#{$font-url}#{$font-file}.ttf') format('truetype'),
11+
url('#{$font-url}#{$font-file}.svg##{$font-name}') format('svg');
12+
font-weight: $font-weight;
13+
font-style: $font-style;
1514
}
1615
}
1716

@@ -30,20 +29,20 @@
3029
// 900 Black (Heavy)
3130

3231
// Roboto
33-
@include font-family('Roboto', 900, normal, '~/src/assets/fonts/roboto/', 'roboto-black');
34-
@include font-family('Roboto', 900, italic, '~/src/assets/fonts/roboto/', 'roboto-blackitalic');
32+
@include font-family('Roboto', 900, normal, '../assets/fonts/roboto/', 'roboto-black');
33+
@include font-family('Roboto', 900, italic, '../assets/fonts/roboto/', 'roboto-blackitalic');
3534

36-
@include font-family('Roboto', 700, normal, '~/src/assets/fonts/roboto/', 'roboto-bold');
37-
@include font-family('Roboto', 700, italic, '~/src/assets/fonts/roboto/', 'roboto-bolditalic');
35+
@include font-family('Roboto', 700, normal, '../assets/fonts/roboto/', 'roboto-bold');
36+
@include font-family('Roboto', 700, italic, '../assets/fonts/roboto/', 'roboto-bolditalic');
3837

39-
@include font-family('Roboto', 500, normal, '~/src/assets/fonts/roboto/', 'roboto-medium');
40-
@include font-family('Roboto', 500, italic, '~/src/assets/fonts/roboto/', 'roboto-mediumitalic');
38+
@include font-family('Roboto', 500, normal, '../assets/fonts/roboto/', 'roboto-medium');
39+
@include font-family('Roboto', 500, italic, '../assets/fonts/roboto/', 'roboto-mediumitalic');
4140

42-
@include font-family('Roboto', 400, normal, '~/src/assets/fonts/roboto/', 'roboto-regular');
43-
@include font-family('Roboto', 400, italic, '~/src/assets/fonts/roboto/', 'roboto-italic');
41+
@include font-family('Roboto', 400, normal, '../assets/fonts/roboto/', 'roboto-regular');
42+
@include font-family('Roboto', 400, italic, '../assets/fonts/roboto/', 'roboto-italic');
4443

45-
@include font-family('Roboto', 300, normal, '~/src/assets/fonts/roboto/', 'roboto-light');
46-
@include font-family('Roboto', 300, italic, '~/src/assets/fonts/roboto/', 'roboto-lightitalic');
44+
@include font-family('Roboto', 300, normal, '../assets/fonts/roboto/', 'roboto-light');
45+
@include font-family('Roboto', 300, italic, '../assets/fonts/roboto/', 'roboto-lightitalic');
4746

48-
@include font-family('Roboto', 100, normal, '~/src/assets/fonts/roboto/', 'roboto-thin');
49-
@include font-family('Roboto', 100, italic, '~/src/assets/fonts/roboto/', 'roboto-thinitalic');
47+
@include font-family('Roboto', 100, normal, '../assets/fonts/roboto/', 'roboto-thin');
48+
@include font-family('Roboto', 100, italic, '../assets/fonts/roboto/', 'roboto-thinitalic');

0 commit comments

Comments
 (0)