Skip to content

Commit 01e44cc

Browse files
committed
Fixing bootstrap for my local copy. Working on integrating FontAwesome 5.
1 parent 8c3b1b4 commit 01e44cc

17 files changed

+13483
-8422
lines changed

CryptoToolKit/CryptoToolKit.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,4 @@
2424
<Folder Include="Models\Coinbase\" />
2525
</ItemGroup>
2626

27-
<ItemGroup>
28-
<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css.map" />
29-
<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css.map" />
30-
<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap.css.map" />
31-
<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap.min.css.map" />
32-
<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.js" />
33-
<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.min.js" />
34-
</ItemGroup>
35-
3627
</Project>

CryptoToolKit/Views/Home/Index.cshtml

Lines changed: 44 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,51 @@
11
@{
22
ViewData["Title"] = "Home Page";
33
}
4-
5-
<style type="text/css">
6-
.btn-ddl-container {
7-
position: relative;
8-
padding: 1rem;
9-
margin: 1rem -15px 0;
10-
border: solid #f8f9fa;
11-
}
12-
13-
14-
</style>
15-
<div class="row">
16-
<div clas="col"></div>
17-
<div clas="col">
18-
<div class="card">
19-
<div class="card-header">
20-
<h3 class="text-info">
21-
Current Market Price
22-
</h3>
23-
</div>
24-
<div class="card-body">
25-
<div class="row">
26-
<div class="col text-center">
27-
<select class="current-crypto-symbol">
4+
<div class="row">
5+
<div class="col"></div>
6+
<div class="col"></div>
7+
<div class="col">
8+
<button class="sidebar-right-toggle btn-info btn-sm pull-right">
9+
<i class="fab fa-newspaper"></i>
10+
</button>
11+
</div>
12+
</div>
13+
<div class="row">
14+
<div clas="col">
15+
</div>
16+
<div clas="col">
17+
<div class="card">
18+
<div class="card-body">
19+
<h4 class="card-corner bg-primary text-white ml-0 mt-0">Market info</h4>
20+
<div class="row">
21+
<div class="col text-center">
22+
<form class="form-material">
23+
<select class="form-control current-crypto-symbol">
2824
</select>
2925
<h3 class="current-crypto-price"></h3>
3026
<button id="refresh-price" class="btn btn-primary">
3127
Refresh
3228
</button>
33-
</div>
29+
</form>
3430
</div>
3531
</div>
3632
</div>
3733
</div>
38-
<div clas="col"></div>
3934
</div>
35+
<div clas="col">
36+
</div>
37+
</div>
38+
39+
<div class="sidebar-right">
40+
<div class="slimscroll-right">
41+
<div class="sidebar-right-title">
42+
News Feed
43+
</div>
44+
<div class="sidebar-right-body">
45+
46+
</div>
47+
</div>
48+
</div>
4049

4150
@section Scripts{
4251
<script type="text/javascript">
@@ -108,7 +117,14 @@
108117
getCryptoPrice();
109118
});
110119
111-
$.ajax('@Url.Action("ConvertPrice")',
120+
$(".slimscroll-right").slimScroll({
121+
height: '100%',
122+
position: 'right',
123+
size: '5px',
124+
color: '#dcdcdc'
125+
});
126+
127+
@*$.ajax('@Url.Action("ConvertPrice")',
112128
{
113129
method: "GET",
114130
data: {
@@ -123,7 +139,7 @@
123139
console.log(response.result);
124140
},
125141
traditional: true
126-
});
142+
});*@
127143
});
128144
</script>
129145
}

CryptoToolKit/Views/Shared/_Layout.cshtml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>@ViewData["Title"] - Crypto-Kit</title>
7-
6+
<title>@ViewData["Title"] - Crypto-KIT</title>
7+
<script src="https://kit.fontawesome.com/386a2f1f5a.js"></script>
88
<environment include="Development">
99
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
1010
<link rel="stylesheet" href="~/css/site.css" />
1111
</environment>
1212
<environment exclude="Development">
13-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
14-
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
13+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
14+
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
1515
crossorigin="anonymous"
1616
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
17-
asp-fallback-test-class="sr-only"
17+
asp-fallback-test-class="sr-only"
1818
asp-fallback-test-property="position"
1919
asp-fallback-test-value="absolute" />
2020
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
2121
</environment>
2222
</head>
2323
<body>
2424
<nav class="navbar navbar-inverse fixed-top navbar-expand-sm bg-dark navbar-dark mb-5">
25-
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">CryptoToolKit</a>
25+
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">Crypto-KIT</a>
2626
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
2727
<span class="navbar-toggler-icon"></span>
2828
</button>
@@ -47,7 +47,6 @@
4747
</li>
4848
</ul>
4949
</div>
50-
<partial name="_CookieConsentPartial" />
5150
</nav>
5251

5352
<div class="container body-content mt-5">
@@ -70,7 +69,10 @@
7069
crossorigin="anonymous"
7170
integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT">
7271
</script>
73-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
72+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
73+
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
74+
crossorigin="anonymous">
75+
</script>
7476
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
7577
asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
7678
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"

CryptoToolKit/wwwroot/css/site.css

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,112 @@ body {
3535
display: none;
3636
}
3737
}
38+
39+
/*
40+
** Right sidebar
41+
*/
42+
43+
.sidebar-right {
44+
position: fixed;
45+
right: -240px;
46+
width: 240px;
47+
display: none;
48+
z-index: 1100;
49+
background: #fff;
50+
top: 0px;
51+
padding-bottom: 20px;
52+
height: 100%;
53+
box-shadow: 5px 1px 40px rgba(0, 0, 0, 0.1);
54+
-webkit-box-shadow: 5px 1px 40px rgba(0, 0, 0, 0.1);
55+
transition: all 0.3s ease;
56+
-o-transition: all 0.3s ease;
57+
-webkit-transition: all 0.3s ease;
58+
}
59+
60+
.sidebar-right .sidebar-right-title {
61+
display: block;
62+
padding: 24px 20px;
63+
color: #fff;
64+
text-transform: uppercase;
65+
font-size: 15px;
66+
background: #009efb;
67+
}
68+
69+
.sidebar-right .sidebar-right-title span {
70+
float: right;
71+
cursor: pointer;
72+
font-size: 11px;
73+
}
74+
75+
.sidebar-right .sidebar-right-title span:hover {
76+
color: #fff;
77+
}
78+
79+
.sidebar-right .sidebar-right-body {
80+
padding: 20px;
81+
}
82+
83+
.sidebar-right .sidebar-right-body ul {
84+
margin: 0px;
85+
padding: 0px;
86+
}
87+
88+
.sidebar-right .sidebar-right-body ul li {
89+
list-style: none;
90+
padding: 5px 0;
91+
}
92+
93+
/**
94+
Material Forms
95+
*/
96+
.form-material .form-group {
97+
overflow: hidden; }
98+
99+
.form-material .form-control {
100+
background-color: transparent;
101+
background-position: center bottom, center calc(100% - 1px);
102+
background-repeat: no-repeat;
103+
background-size: 0 2px, 100% 1px;
104+
padding: 0;
105+
-webkit-transition: background 0s ease-out 0s;
106+
-o-transition: background 0s ease-out 0s;
107+
transition: background 0s ease-out 0s;
108+
}
109+
110+
.form-material .form-control, .form-material .form-control.focus, .form-material .form-control:focus {
111+
background-image: -webkit-gradient(linear, left top, left bottom, from(#009efb), to(#009efb)), -webkit-gradient(linear, left top, left bottom, from(#d9d9d9), to(#d9d9d9));
112+
background-image: -webkit-linear-gradient(#009efb, #009efb), -webkit-linear-gradient(#d9d9d9, #d9d9d9);
113+
background-image: -o-linear-gradient(#009efb, #009efb), -o-linear-gradient(#d9d9d9, #d9d9d9);
114+
background-image: linear-gradient(#009efb, #009efb), linear-gradient(#d9d9d9, #d9d9d9);
115+
border: 0 none;
116+
border-radius: 0;
117+
-webkit-box-shadow: none;
118+
box-shadow: none;
119+
float: none;
120+
}
121+
122+
.form-material .form-control.focus, .form-material .form-control:focus {
123+
background-size: 100% 2px, 100% 1px;
124+
outline: 0 none;
125+
-webkit-transition-duration: 0.3s;
126+
-o-transition-duration: 0.3s;
127+
transition-duration: 0.3s;
128+
}
129+
130+
.form-control-line .form-group {
131+
overflow: hidden;
132+
}
133+
134+
.form-control-line .form-control {
135+
border: 0px;
136+
border-radius: 0px;
137+
padding-left: 0px;
138+
border-bottom: 1px solid #d9d9d9;
139+
}
140+
141+
.form-control-line .form-control:focus {
142+
border-bottom: 1px solid #009efb;
143+
}
144+
145+
146+
.card-body .

0 commit comments

Comments
 (0)