From 5100aacfc64dd9d83b2633128f3ef70f647823a9 Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Sun, 21 Jan 2018 13:40:16 +0530 Subject: [PATCH 01/17] Fixed issue#282 --- index.html | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/index.html b/index.html index 95661ed..655a462 100644 --- a/index.html +++ b/index.html @@ -201,6 +201,30 @@ border-width: 0 0 1px; } + .heading{ + height:auto; + width:100%; + padding:50px 0; + font-size:40px; + font-family: 'Lato'; + color:#222; + text-align: center; + margin:0 auto; + font-weight:300; + } + + .heading:after{ + content: ''; + display: block; + height:2px; + width:70px; + margin:0 auto; + background: #ee0979; /* fallback for old browsers */ + background: -webkit-linear-gradient(to right, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to right, #ee0979, #ff6a00); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + +} + From 91411119f311b0fba2ccb6c33b3ecd829b132af8 Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Mon, 22 Jan 2018 22:26:06 +0530 Subject: [PATCH 02/17] Solved issue#380 --- css/issues-style.css | 17 ++++++++++++----- js/issue-loader.js | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/css/issues-style.css b/css/issues-style.css index 27cdbfc..bcbed1f 100644 --- a/css/issues-style.css +++ b/css/issues-style.css @@ -1,3 +1,10 @@ +.issue1{ +height:auto; +padding:40px 0 20px 0; +background: #ee0979; +text-align: center; +} + .issues{ height:auto; @@ -40,8 +47,8 @@ .issues .project-title.ui-state-active{ background: #ee0979; /* fallback for old browsers */ - background: -webkit-linear-gradient(to right, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ - background: linear-gradient(to right, #ee0979, #ff6a00); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + /*background: -webkit-linear-gradient(to right, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ + /*background: linear-gradient(to right, #ee0979, #ff6a00);*/ /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ transition: all 200ms ease-in-out; color:white; @@ -66,7 +73,7 @@ font-size:120%; float: right; - color:#222; + /*color:#222;*/ } .issues .project-issues-list{ @@ -129,8 +136,8 @@ outline:none; cursor: pointer; background: #ee0979; /* fallback for old browsers */ - background: -webkit-linear-gradient(135deg, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ - background: linear-gradient(135deg, #ee0979, #ff6a00); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + /*background: -webkit-linear-gradient(135deg, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ + /*background: linear-gradient(135deg, #ee0979, #ff6a00); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ margin:0 auto!important; } diff --git a/js/issue-loader.js b/js/issue-loader.js index 618e018..16f369a 100644 --- a/js/issue-loader.js +++ b/js/issue-loader.js @@ -35,7 +35,7 @@ function loadMoreIssues(user, repo) { '
' + '
' + '

' + title + '

' + - '' + + '
' + author + ' in ' + repo_name + '
' + '
' + labels + '' + From e30c8fa2bf2691846d10e5efb7682308d7e773e8 Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Tue, 23 Jan 2018 15:26:33 +0530 Subject: [PATCH 03/17] Changed colour for issues section --- css/issues-style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/issues-style.css b/css/issues-style.css index bcbed1f..a5bedbc 100644 --- a/css/issues-style.css +++ b/css/issues-style.css @@ -1,7 +1,7 @@ .issue1{ height:auto; padding:40px 0 20px 0; -background: #ee0979; +background: #07ee99; text-align: center; } @@ -46,7 +46,7 @@ text-align: center; } .issues .project-title.ui-state-active{ - background: #ee0979; /* fallback for old browsers */ + background: #9208ee; /* fallback for old browsers */ /*background: -webkit-linear-gradient(to right, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ /*background: linear-gradient(to right, #ee0979, #ff6a00);*/ /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ transition: all 200ms ease-in-out; @@ -135,7 +135,7 @@ text-align: center; font-weight: 700; outline:none; cursor: pointer; - background: #ee0979; /* fallback for old browsers */ + background: #9208ee; /* fallback for old browsers */ /*background: -webkit-linear-gradient(135deg, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ /*background: linear-gradient(135deg, #ee0979, #ff6a00); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ margin:0 auto!important; From 59a4bc8f5cf851dd2a0c74f9c3f57615389e399c Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Wed, 24 Jan 2018 01:09:48 +0530 Subject: [PATCH 04/17] Updated scores.json --- json/scores.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/json/scores.json b/json/scores.json index ade7b0b..668a090 100644 --- a/json/scores.json +++ b/json/scores.json @@ -102,9 +102,24 @@ "Issuelink":"https://github.com/opencode18/CodeStash/issues/150", "PRlink":"https://github.com/opencode18/CodeStash/pull/143", "score":"10" + },{ + "name":"Day12 #163", + "Issuelink":"https://github.com/opencode18/CodeStash/issues/163", + "PRlink":"https://github.com/opencode18/CodeStash/pull/167", + "score":"10" + },{ + "name":"Make each heading as same as issues heading #282", + "Issuelink":"https://github.com/opencode18/OpenCode-Collaborative/issues/282", + "PRlink":"https://github.com/opencode18/OpenCode-Collaborative/pull/373", + "score":"10" + },{ + "name":"Add a fork Ribbon in the corner. #52", + "Issuelink":"https://github.com/opencode18/OpenNews/issues/52", + "PRlink":"https://github.com/opencode18/OpenNews/pull/70", + "score":"10" } ], - "Total":"170" + "Total":"200" } ] } From ac0f97e05ec847d83b454984300f19039fd5ebbd Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Wed, 24 Jan 2018 23:27:59 +0530 Subject: [PATCH 05/17] Updated scores.json --- json/scores.json | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/json/scores.json b/json/scores.json index 095841d..ee6e3dc 100644 --- a/json/scores.json +++ b/json/scores.json @@ -100,8 +100,29 @@ "Issuelink": "https://github.com/opencode18/CodeStash/issues/150", "PRlink": "https://github.com/opencode18/CodeStash/pull/143", "score": "10" - }], - "Total": "170" + },{ + "name": "Update scores.json #325", + "Issuelink": "https://github.com/opencode18/OpenCode-Collaborative/issues/325", + "PRlink": "https://github.com/opencode18/OpenCode-Collaborative/pull/344", + "score": "10" + },{ + "name":"Day12 #163", + "Issuelink":"https://github.com/opencode18/CodeStash/issues/163", + "PRlink":"https://github.com/opencode18/CodeStash/pull/167", + "score":"10" + },{ + "name":"Make each heading as same as issues heading #282", + "Issuelink":"https://github.com/opencode18/OpenCode-Collaborative/issues/282", + "PRlink":"https://github.com/opencode18/OpenCode-Collaborative/pull/373", + "score":"10" + },{ + "name":"Add a fork Ribbon in the corner. #52", + "Issuelink":"https://github.com/opencode18/OpenNews/issues/52", + "PRlink":"https://github.com/opencode18/OpenNews/pull/70", + "score":"10" + } + ], + "Total": "210" }, { "name": "Jigar Chavada", @@ -785,24 +806,9 @@ "Issuelink":"https://github.com/rahulkumaran/Utlyz-CLI/issues/23", "PRlink":"", "score":"10" - },{ - "name":"Day12 #163", - "Issuelink":"https://github.com/opencode18/CodeStash/issues/163", - "PRlink":"https://github.com/opencode18/CodeStash/pull/167", - "score":"10" - },{ - "name":"Make each heading as same as issues heading #282", - "Issuelink":"https://github.com/opencode18/OpenCode-Collaborative/issues/282", - "PRlink":"https://github.com/opencode18/OpenCode-Collaborative/pull/373", - "score":"10" - },{ - "name":"Add a fork Ribbon in the corner. #52", - "Issuelink":"https://github.com/opencode18/OpenNews/issues/52", - "PRlink":"https://github.com/opencode18/OpenNews/pull/70", - "score":"10" } ], - "Total":"240" + "Total":"210" } ] } From c770690311dae6329da6a0acb40e954256e2db07 Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Thu, 25 Jan 2018 00:35:24 +0530 Subject: [PATCH 06/17] Rectified score --- json/scores.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/json/scores.json b/json/scores.json index ee6e3dc..2b59d6f 100644 --- a/json/scores.json +++ b/json/scores.json @@ -101,11 +101,6 @@ "PRlink": "https://github.com/opencode18/CodeStash/pull/143", "score": "10" },{ - "name": "Update scores.json #325", - "Issuelink": "https://github.com/opencode18/OpenCode-Collaborative/issues/325", - "PRlink": "https://github.com/opencode18/OpenCode-Collaborative/pull/344", - "score": "10" - },{ "name":"Day12 #163", "Issuelink":"https://github.com/opencode18/CodeStash/issues/163", "PRlink":"https://github.com/opencode18/CodeStash/pull/167", @@ -122,7 +117,7 @@ "score":"10" } ], - "Total": "210" + "Total": "200" }, { "name": "Jigar Chavada", From 765e9a1ed5a50b59df5e0b8ce26860d8ea19e7bb Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Thu, 25 Jan 2018 11:28:52 +0530 Subject: [PATCH 07/17] Resolved conflicts due to merged PRs --- json/scores.json | 1 - 1 file changed, 1 deletion(-) diff --git a/json/scores.json b/json/scores.json index d7d92db..4fb172a 100644 --- a/json/scores.json +++ b/json/scores.json @@ -1,4 +1,3 @@ -<<<<<<< HEAD { "scores": [{ "name": "piyu007", From 1a7a2e662c72fb13b47c569f192e65a7edb81cb8 Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Fri, 26 Jan 2018 14:28:37 +0530 Subject: [PATCH 08/17] Modified bg colour --- css/issues-style.css | 6 ++++-- js/issue-loader.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/css/issues-style.css b/css/issues-style.css index 81b33e4..69b2577 100644 --- a/css/issues-style.css +++ b/css/issues-style.css @@ -1,7 +1,7 @@ .issue1{ height:auto; padding:40px 0 20px 0; -background: #07ee99; +background: #fff; text-align: center; } @@ -64,7 +64,7 @@ text-align: center; .issues .project-title i{ - color:#555; + color:#000000; margin-right:10px; } @@ -107,6 +107,7 @@ text-align: center; height:auto; text-align: left; margin:5px 0; + } @@ -146,6 +147,7 @@ text-align: center; @media only screen and (max-width:800px){ .issues .project-title{ + font-size:12px!important; } } diff --git a/js/issue-loader.js b/js/issue-loader.js index 16f369a..ae50baf 100644 --- a/js/issue-loader.js +++ b/js/issue-loader.js @@ -31,7 +31,7 @@ function loadMoreIssues(user, repo) { labels += '' + this.name +'  '; }); - var issue_markup = '
' + + var issue_markup = '
' + '
' + '
' + '

' + title + '

' + From 65741c2da3f52dec1a2a2ccf5ff9ae79438fcfd4 Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Fri, 26 Jan 2018 15:25:05 +0530 Subject: [PATCH 09/17] Fixing scores.json file --- js/leaderBoard.js | 2 +- json/scores.json | 5 ----- leaderboard.html | 7 ++----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/js/leaderBoard.js b/js/leaderBoard.js index be20839..14ad03a 100644 --- a/js/leaderBoard.js +++ b/js/leaderBoard.js @@ -4,7 +4,7 @@ const app3 = new Vue({ contributors: [] }, created() { - fetch('https://opencode18.github.io/OpenCode-Collaborative/json/scores.json') + fetch('https://shivhek25.github.io/OpenCode-Collaborative/json/scores.json') .then(response => response.json()) .then(json => { diff --git a/json/scores.json b/json/scores.json index 63d5ad5..4ecca95 100644 --- a/json/scores.json +++ b/json/scores.json @@ -806,8 +806,6 @@ "Total":"210" }, { - "scores":[ - { "name":"ashish4321", "Contributions":[ { @@ -892,8 +890,6 @@ "Total":"180" }, { - "scores":[ - { "name":"piyu007", "Contributions":[ { @@ -2125,7 +2121,6 @@ ], "Total":"410" }, - { "name":"re42", "Contributions":[ diff --git a/leaderboard.html b/leaderboard.html index 4b924e6..bec7b7e 100644 --- a/leaderboard.html +++ b/leaderboard.html @@ -50,12 +50,9 @@ {{ index + 1 }} {{ contributor.name }} {{ contributor.Total }} - - - + - - +
Return to Home Page From de10f4e1b5f93f4cc81d1c504bceba41becbf9a7 Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Fri, 26 Jan 2018 15:26:48 +0530 Subject: [PATCH 10/17] Fixing scores.json file --- js/leaderBoard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/leaderBoard.js b/js/leaderBoard.js index 14ad03a..be20839 100644 --- a/js/leaderBoard.js +++ b/js/leaderBoard.js @@ -4,7 +4,7 @@ const app3 = new Vue({ contributors: [] }, created() { - fetch('https://shivhek25.github.io/OpenCode-Collaborative/json/scores.json') + fetch('https://opencode18.github.io/OpenCode-Collaborative/json/scores.json') .then(response => response.json()) .then(json => { From 1ad94913756497f1c04d277804ca750134da776e Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Wed, 31 Jan 2018 13:54:46 +0530 Subject: [PATCH 11/17] Made text visible --- css/issues-style.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/css/issues-style.css b/css/issues-style.css index 69b2577..95b4f4f 100644 --- a/css/issues-style.css +++ b/css/issues-style.css @@ -1,10 +1,14 @@ .issue1{ height:auto; padding:40px 0 20px 0; -background: #fff; +background: white; +color:black; text-align: center; } +.issue_name{ + color:#000; +} .issues{ height:auto; @@ -118,7 +122,7 @@ text-align: center; height:300px; background-color: white; border-radius:4px; - color:#222; + color:#000; font-size:20px; padding:15px; font-family: 'Lato'; @@ -153,7 +157,7 @@ text-align: center; } .issues .project-issues-list .issue blockquote{ - + font-weight:bold; padding: 10px 20px; margin: 0 0 20px; font-size: 17.5px; @@ -163,9 +167,7 @@ text-align: center; } .issues .project-issues-list .issue blockquote footer{ - font-weight:300; - } @@ -192,7 +194,6 @@ text-align: center; /* REUSABLE TITLES */ .section-title{ - color:#222; text-align: center; margin:0 auto; font-weight:300; @@ -208,5 +209,4 @@ text-align: center; background: -webkit-linear-gradient(to right, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ background: linear-gradient(to right, #ee0979, #ff6a00); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ -} - +} \ No newline at end of file From 3c01970ebaa79a6c806a693c133ed5023d601ebe Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Wed, 31 Jan 2018 14:41:59 +0530 Subject: [PATCH 12/17] Removed red and purple combination in button --- css/issues-style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/issues-style.css b/css/issues-style.css index 95b4f4f..96a1789 100644 --- a/css/issues-style.css +++ b/css/issues-style.css @@ -141,7 +141,7 @@ text-align: center; font-weight: 700; outline:none; cursor: pointer; - background: #9208ee; /* fallback for old browsers */ + /*background: #9208ee; /* fallback for old browsers */ /*background: -webkit-linear-gradient(135deg, #ee0979, #ff6a00); /* Chrome 10-25, Safari 5.1-6 */ /*background: linear-gradient(135deg, #ee0979, #ff6a00); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ margin:0 auto!important; From 9ce804397f3abd2d7a4568c2c6f82d6ce61453cc Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Fri, 2 Feb 2018 16:45:03 +0530 Subject: [PATCH 13/17] Updated scores.json --- json/scores.json | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/json/scores.json b/json/scores.json index 88416e8..42a6e4f 100644 --- a/json/scores.json +++ b/json/scores.json @@ -115,8 +115,33 @@ "Issuelink": "https://github.com/opencode18/OpenNews/issues/52", "PRlink": "https://github.com/opencode18/OpenNews/pull/70", "score": "10" + }, { + "name": "Change the color scheme of issues section #380", + "Issuelink": "https://github.com/opencode18/OpenCode-Collaborative/issues/380", + "PRlink": "https://github.com/opencode18/OpenCode-Collaborative/pull/389", + "score": "20" + }, { + "name": "Add scrollspy for Issues section too #436", + "Issuelink": "https://github.com/opencode18/OpenCode-Collaborative/issues/436", + "PRlink": "https://github.com/opencode18/OpenCode-Collaborative/pull/443", + "score": "10" + }, { + "name": "Suggest new issues #136", + "Issuelink": "https://github.com/opencode18/OpenCode-Collaborative/issues/136", + "PRlink": "", + "score": "20" + }, { + "name": "Setup Oh My Zsh on your system #181", + "Issuelink": "https://github.com/opencode18/OpenCode-Collaborative/issues/181", + "PRlink": "", + "score": "20" + }, { + "name": "write a blog post explaining your experince on Opencode #455", + "Issuelink": "https://github.com/opencode18/OpenCode-Collaborative/issues/455", + "PRlink": "", + "score": "50" }], - "Total": "200" + "Total": "320" }, { "name": "ananya-agrawal", From b5cd797e0a1b4e787ab561b8b6b6fc05490dc5af Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Sat, 3 Feb 2018 03:05:20 +0530 Subject: [PATCH 14/17] Solved issue#359 --- css/style.css | 14 +++++++++++ index.html | 7 +++++- js/reading-progressbar.js | 53 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 js/reading-progressbar.js diff --git a/css/style.css b/css/style.css index b17d860..dea9a3a 100644 --- a/css/style.css +++ b/css/style.css @@ -9,6 +9,20 @@ html{ display: inline-block; } +progress { + position: fixed; + left: 0; + top: 0; + width: 100%; + height: .25em; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + border: none; + background-color: transparent; + color: red; +} + .cls-1 { fill: black; stroke:url(#linear-gradient); diff --git a/index.html b/index.html index 9e2266b..f621cb4 100644 --- a/index.html +++ b/index.html @@ -48,7 +48,6 @@ -




@@ -74,6 +73,11 @@