Skip to content

Commit 91c06fe

Browse files
committed
css and alerts changes
1 parent 2235888 commit 91c06fe

File tree

4 files changed

+35
-14
lines changed

4 files changed

+35
-14
lines changed

.gitattributes

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
*.RTF diff=astextplain
1818

1919
# Vendor Folders
20-
assets/css/* linguist-vendored=false
20+
assets/css/* linguist-vendored
2121
assets/sass/* linguist-vendored
2222
assets/fonts/* linguist-vendored
2323
assets/js/* linguist-vendored
2424
assets/* linguist-vendored
25-
# assets/css/main.css linguist-vendored=false
25+
assets/css/git-challenge.css linguist-vendored=false

assets/css/git-challenge.css

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@import url(font-awesome.min.css);
2+
@import "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400";
3+
4+
.progress-bar-issue {
5+
background-color: #8665c8;
6+
}
7+
.progress-striped .progress-bar-issue {
8+
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
9+
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
10+
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
11+
}
12+
13+
.progress-bar-pr-merged {
14+
background-color: #4500c8;
15+
}
16+
.progress-striped .progress-bar-pr-merged {
17+
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
18+
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
19+
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
20+
}

include/configuration-template.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/** Git Configuration */
1515

1616
/** Git Organization */
17-
define("GIT_ORG", "NHSTechTeam");
17+
define("GIT_ORG", "GitHubOrg");
1818
/** Git Client */
1919
define("GIT_CLIENT", "Git Client");
2020
/** Git Secret */
@@ -23,12 +23,12 @@
2323
/** App Options */
2424
define("SIGN_UP", "FALSE");
2525
define("DEBUG", "OFF");
26-
define("MAXCALLS", "500");
26+
define("MAXCALLS", "2500");
2727

28-
// Point Scaling
28+
/** Point Scaling */
2929
define("ADDITIONS", "1");
3030
define("DELETIONS", "1");
3131
define("CHALLENGES", "1");
3232
define("COMMITS", "10");
3333
define("ISSUES", "25");
34-
define("PULLREQUESTS", "50");
34+
define("PULLREQUESTS", "50");

index.php

+9-8
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@
2121
<!--[if lte IE 8]>
2222
<script src="assets/js/ie/respond.min.js"></script><![endif]-->
2323
<script src="assets/js/main.js"></script>
24-
<!-- Latest compiled and minified CSS
25-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
26-
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
27-
-->
2824
<!-- Latest compiled and minified JavaScript -->
2925
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
3026
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
3127
crossorigin="anonymous"></script>
3228
<link rel="stylesheet" href="assets/css/main.css"/>
29+
<link rel="stylesheet" href="assets/css/git-challenge.css"/>
3330
<!--[if lte IE 9]>
3431
<link rel="stylesheet" href="assets/css/ie9.css"/><![endif]-->
3532
<!--[if lte IE 8]>
@@ -53,7 +50,8 @@
5350
// Create database
5451
$sql = "CREATE DATABASE Git-Challenge";
5552
if ($conn->query($sql) === TRUE) {
56-
echo "<div class=\"alert alert-success alert-dismissable\"><a class=\"close fa fa-close\" data-dismiss=\"alert\" aria-label=\"close\"></a>Database created successfully</div>";
53+
$message = "Database created successfully";
54+
$alert->success($message);
5755
}
5856

5957
$conn = new mysqli(CONF_LOCATION, CONF_ADMINID, CONF_ADMINPASS, CONF_DATABASE);
@@ -62,21 +60,24 @@
6260
$sql = "CREATE TABLE Tracked (sha VARCHAR(256), issueID VARCHAR(256))";
6361

6462
if ($conn->query($sql) === TRUE) {
65-
echo "<div class=\"alert alert-success alert-dismissable\"><a class=\"close fa fa-close\" data-dismiss=\"alert\" aria-label=\"close\"></a>Table <i>Tracked</i> created successfully</div>";
63+
$message = "Table Tracked created successfully";
64+
$alert-success($message);
6665
}
6766

6867
// sql to create table
6968
$sql = "CREATE TABLE Users (name VARCHAR(256) NOT NULL, username VARCHAR(128) NOT NULL, id INT(35) NOT NULL, score INT(25) DEFAULT 0, added INT(25) DEFAULT 0, removed INT(25) DEFAULT 0, challenge INT(25) DEFAULT 0, commits INT(25) DEFAULT 0, issues INT(25) DEFAULT 0, pullRequests INT(25) DEFAULT 0)";
7069

7170
if ($conn->query($sql) === TRUE) {
72-
echo "<div class=\"alert alert-success alert-dismissable\"><a class=\"close fa fa-close\" data-dismiss=\"alert\" aria-label=\"close\"></a>Table <i>Users</i> created successfully</div>";
71+
$message = "Table Users created successfully";
72+
$alert-success($message);
7373
}
7474

7575
// sql to create table
7676
$sql = "CREATE TABLE Stats (repository VARCHAR(256), commits INT(25) DEFAULT 0)";
7777

7878
if ($conn->query($sql) === TRUE) {
79-
echo "<div class=\"alert alert-success alert-dismissable\"><a class=\"close fa fa-close\" data-dismiss=\"alert\" aria-label=\"close\"></a>Table <i>Stats</i> created successfully</div>";
79+
$message = "Table Stats created successfully";
80+
$alert-success($message);
8081
}
8182

8283
$call_count = 0;

0 commit comments

Comments
 (0)