Skip to content
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

Improve design ca1 to improve basics aa3 #91

Merged
merged 18 commits into from
Jul 8, 2020
Merged

Improve design ca1 to improve basics aa3 #91

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a24d8cf
Add scss to prettier
Aichnerc Jul 7, 2020
582cfa5
Improve company page
Aichnerc Jul 7, 2020
d30f511
Add color variables
Aichnerc Jul 7, 2020
4fe5507
Improve design
Aichnerc Jul 7, 2020
7eebc4a
Fix Calendar3D
Aichnerc Jul 7, 2020
532224d
Improve Language chart
Aichnerc Jul 7, 2020
1308d04
Improve design
Aichnerc Jul 7, 2020
261c350
Add profile button to main navbar
Aichnerc Jul 7, 2020
afa8237
Improve profile button on navbar
Aichnerc Jul 7, 2020
f4f71fe
Fix day and days seperation
Aichnerc Jul 7, 2020
cabe83b
Improve project cards
Aichnerc Jul 8, 2020
8469dc0
Improve wording
Aichnerc Jul 8, 2020
0034279
Improve stability
Aichnerc Jul 8, 2020
f20e71c
Re-add loading bar styling
schettn Jul 8, 2020
98302bf
Merge branch 'improve-basics-aa3' into improve-design-ca1
schettn Jul 8, 2020
d2d0e08
Improve code quality
schettn Jul 8, 2020
c01d1d6
Apply suggestions from code review
schettn Jul 8, 2020
2e6d448
Apply suggestions from code review
schettn Jul 8, 2020
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
13 changes: 8 additions & 5 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
"editor.snippetSuggestions": "top",
"editor.rulers": [80, 120],
"editor.formatOnSave": false,
"[javascript]": {
"editor.formatOnSave": true
},
"[javascriptreact]": {
"editor.formatOnSave": true
"[javascript]": {
"editor.formatOnSave": true
},
"[scss]": {
"editor.formatOnSave": true
},
"[javascriptreact]": {
"editor.formatOnSave": true
},
"terminal.integrated.fontFamily": "Consolas",
"workbench.colorTheme": "Dracula Soft",
Expand Down
14 changes: 13 additions & 1 deletion src/components/atoms/Pinned/pinned.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
.pinned-item {
.pinned-header {
width: 100%;
padding: 0.2rem;
padding: 0.1rem;

.card {
border: 1px #e1e4e8 solid;
margin-bottom: 2rem;
overflow: hidden;
border-radius: 0.3rem;
}

.card-body {
border: none !important;
padding: 0.3rem;
}
}
}

Expand Down
11 changes: 9 additions & 2 deletions src/components/atoms/Project/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@ class Project extends React.Component {
: "https://img.favpng.com/4/1/20/computer-icons-gregorio-lvarez-museum-png-favpng-xPCKYGtUJihZeAkdqind0HH2N.jpg"
}
/>
<small>/{repo.owner.username}</small>
<small>
@
{repo.owner.username ? (
repo.owner.username
) : (
<span className="text-muted">unknown</span>
)}
</small>
</div>
<div className="pt-3">
{repo.languages.length > 0 && (
Expand All @@ -46,7 +53,7 @@ class Project extends React.Component {
className="pr-1"
style={{ color: repo.languages[0].color }}
/>
{repo.languages[0].name ? repo.languages[0].name : "none"}
{repo.languages[0].name ? repo.languages[0].name : "Unknown"}
</small>
)}
</div>
Expand Down
119 changes: 52 additions & 67 deletions src/components/atoms/charts/Calendar3D/calendar3d.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,73 @@
#calendar3d {
position: relative;
width: 80%;
margin: auto;
display: block;
width: 100%;
padding: 0 1rem;
min-height: 350px;

.ic-stats-block {
position: absolute;
canvas {
width: 80%;
display: block;
margin: auto;
}

.ic-stats-top {
top: 8px;
right: 20px;
}
.top-stats {
position: absolute;
top: 0;
right: 0;
margin: 2rem 2rem 0 0;

.ic-stats-bottom {
top: 225px;
left: 20px;
}
.stats {
padding: 0 0.5rem 0.2rem 0.5rem;
border-radius: 0.5rem;

.ic-stats-table {
display: table;
}
p {
margin-bottom: 0;

.ic-stats-row {
display: table-row;
}
&.lead {
font-size: 1.5rem;
}

.ic-stats-label {
display: table-cell;
padding-bottom: 12px;
font-size: 14px;
color: #777;
text-align: right;
vertical-align: bottom;
}
&.text-muted {
font-size: 0.7rem;
}
}

.ic-stats-count {
display: block;
font-size: 32px;
font-weight: 600;
line-height: 1;
color: #1e6823;
.item {
padding: 0.5rem;
}
}
}

.ic-stats-meta {
display: table-cell;
padding-bottom: 12px;
padding-left: 8px;
text-align: left;
line-height: 1.2;
vertical-align: bottom;
}
.bottom-stats {
position: absolute;
bottom: 0;
left: 0;
margin: 0 0 2rem 2rem;

.ic-stats-total-meta {
vertical-align: middle;
}
.stats {
padding: 0 0.5rem 0.2rem 0.5rem;
border-radius: 0.5rem;

.ic-stats-average {
font-size: 12px;
font-weight: bold;
color: #24292e;
}
p {
margin-bottom: 0;

.ic-stats-unit {
display: block;
font-size: 14px;
}
&.lead {
font-size: 1.5rem;
}

.ic-stats-date {
display: block;
color: #999;
font-size: 12px;
}
&.text-muted {
font-size: 0.7rem;
}

.ic-footer {
position: absolute;
top: 380px;
left: 20px;
font-size: 11px;
color: #999;
}
.days {
font-size: 1rem;
}
}

.ic-footer a {
color: #777;
.item {
padding: 0.5rem;
}
}
}
}

Expand Down
Loading