Skip to content

Commit ed61a4e

Browse files
jemsgitjemsgit
committed
Edit css
1 parent 96401c9 commit ed61a4e

File tree

16 files changed

+216
-132
lines changed

16 files changed

+216
-132
lines changed

‎EPAM.MyBlog.UI.Web/Content/css/style.css

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ body{
6161
.footer .row {
6262
padding:10px;
6363
text-align:center;
64+
vertical-align:middle;
6465
}
6566

6667
a img {
@@ -116,6 +117,7 @@ p {
116117
border: 0;
117118
border-bottom: 1px solid #e5e5e5;
118119
display:inline-block;
120+
margin-bottom:10px;
119121
}
120122

121123
.title p{
@@ -135,4 +137,13 @@ p {
135137
.post{
136138
margin-bottom: 40px;
137139
margin-top: 40px;
138-
}
140+
}
141+
142+
.bold {
143+
font-weight: bold;
144+
}
145+
146+
.btn{
147+
margin:5px 10px;
148+
}
149+

‎EPAM.MyBlog.UI.Web/Logs/Debug/2015.01.16.log

Whitespace-only changes.

‎EPAM.MyBlog.UI.Web/Logs/Errors/2015.01.16.log

Whitespace-only changes.

‎EPAM.MyBlog.UI.Web/Views/Account/AboutMe.cshtml

Lines changed: 81 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,90 @@
44
ViewBag.Title = "UserInfo";
55
}
66

7-
<fieldset>
8-
<legend>@Model.Login</legend>
7+
<div class="col-sm-12 title">
8+
<div class="col-sm-6 col-md-6 col-lg-6 col-sx-6 col-sm-offset-4 col-md-offset-4 col-sx-offset-4 col-lg-offset-4">
9+
<p>@Model.Login</p>
10+
</div>
11+
</div>
12+
13+
14+
<div class="row">
15+
<div class="col-lg-4 col-md-4 col-sm-4">
16+
@Html.Action("Avatar", new { name = User.Identity.Name})
17+
</div>
18+
<div class="col-lg-8 col-md-8 col-sm-8">
919

10-
<div class="display-label">
11-
@Html.DisplayNameFor(model => model.Sex)
20+
<div class="row">
21+
22+
<div class="col-lg-4 col-md-4 col-sm-4 bold">
23+
@Html.DisplayNameFor(model => model.Name)
1224

25+
</div>
26+
@if (Model.Name != null)
27+
{
28+
<div class="col-lg-8 col-md-8 col-sm-8">
29+
@Html.DisplayFor(model => model.Name)
30+
<div class="pull-right">
31+
@Html.ActionLink("Изменить", "EditName", null, new { @class="btn btn-default"})
32+
</div>
33+
</div>
34+
}
35+
36+
</div>
37+
<div class="row">
38+
39+
<div class="col-lg-4 col-md-4 col-sm-4 bold">
40+
@Html.DisplayNameFor(model => model.Sex)
41+
42+
</div>
43+
@if(Model.Sex != null){
44+
<div class="col-lg-8 col-md-8 col-sm-8">
45+
@Html.DisplayFor(model => model.Sex)
46+
<div class="pull-right">
47+
@Html.ActionLink("Изменить", "EditSex", null, new { @class="btn btn-default"})
48+
</div>
49+
</div>
50+
}
51+
</div>
52+
<div class="row">
53+
54+
<div class="col-lg-4 col-md-4 col-sm-4 bold">
55+
@Html.DisplayNameFor(model => model.Birthday)
56+
57+
</div>
58+
@if (Model.Birthday != null)
59+
{
60+
<div class="col-lg-8 col-md-8 col-sm-8">
61+
@Html.DisplayFor(model => model.Birthday)
62+
<div class="pull-right">
63+
@Html.ActionLink("Изменить", "EditDate", null, new { @class="btn btn-default"})
64+
</div>
65+
</div>
66+
}
67+
</div>
68+
69+
<div class="row">
70+
71+
<div class="col-lg-4 col-md-4 col-sm-4 bold">
72+
@Html.DisplayNameFor(model => model.AboutMe)
73+
74+
</div>
75+
@if (Model.AboutMe != null)
76+
{
77+
<div class="col-lg-8 col-md-8 col-sm-8">
78+
@Html.DisplayFor(model => model.AboutMe)
79+
<div class="pull-right">
80+
@Html.ActionLink("Изменить", "EditAbout", null, new { @class="btn btn-default"})
81+
</div>
82+
</div>
83+
}
84+
</div>
85+
</div>
1386
</div>
14-
@if(Model.Sex != null){
15-
<div class="display-field">
16-
@Html.DisplayFor(model => model.Sex)
17-
18-
</div>
19-
}
20-
@Html.ActionLink("Изменить", "EditSex", null, new { @class="btn btn-default"})
21-
<div class="display-label">
22-
@Html.DisplayNameFor(model => model.Birthday)
23-
24-
</div>
25-
@if(Model.Birthday != null){
26-
<div class="display-field">
27-
@Html.DisplayFor(model => model.Birthday)
28-
</div>
29-
}
30-
@Html.ActionLink("Изменить", "EditDate", null, new { @class="btn btn-default"})
31-
<div class="display-label">
32-
@Html.DisplayNameFor(model => model.Name)
33-
</div>
34-
@if(Model.Name != null){
35-
<div class="display-field">
36-
@Html.DisplayFor(model => model.Name)
37-
</div>
38-
}
39-
@Html.ActionLink("Изменить", "EditName", null, new { @class="btn btn-default"})
40-
<div class="display-label">
41-
@Html.DisplayNameFor(model => model.AboutMe)
42-
</div>
43-
@if(Model.AboutMe != null){
44-
<div class="display-field">
45-
@Html.DisplayFor(model => model.AboutMe)
46-
</div>
47-
}
48-
@Html.ActionLink("Изменить", "EditAbout", null, new { @class="btn btn-default"})
49-
</fieldset>
5087

51-
@Html.Action("Avatar", new { name = User.Identity.Name})
88+
89+
90+
91+
5292

5393

‎EPAM.MyBlog.UI.Web/Views/Account/Avatar.cshtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@model EPAM.MyBlog.UI.Web.Models.AvatarModel
22

33

4-
<p>@Model.Login</p>
5-
64
@if (Model.Avatar == null)
75
{
86
<div>
@@ -17,6 +15,6 @@
1715
}
1816

1917

20-
<div>
18+
<div class="post">
2119
@Html.ActionLink("Изменить аватар", "EditInfoAvatar", "Files", null, new { @class="btn btn-default"})
2220
</div>

‎EPAM.MyBlog.UI.Web/Views/Account/DeleteAc.cshtml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,25 @@
33
@{
44
ViewBag.Title = "DeleteAc";
55
}
6+
<div class="col-sm-12 title">
7+
8+
<div class="col-sm-6 col-md-6 col-lg-6 col-sx-6 ">
9+
<p>Удаление аккаунта </p>
10+
</div>
11+
</div>
12+
<p>Вы действиетльно хотите удалить аккаунт?</p>
613

7-
814
@using (Html.BeginForm())
915
{
1016
<div class="editor-label">
1117
@Html.LabelFor(model => model.Reason)
1218
</div>
1319
<div class="editor-field">
14-
@Html.EditorFor(model => model.Reason)
20+
@Html.TextAreaFor(model => model.Reason, new { cols = 60, @rows = 3 })
1521
</div>
16-
<h2>Вы действиетльно хотите удалить аккаунт?</h2>
17-
<button name="Confirm" value ="true">Да</button>
18-
<button name="Confirm" value ="false">Нет</button>
22+
23+
<button name="Confirm" value ="true" class="btn btn-default">Да</button>
24+
<button name="Confirm" value ="false" class="btn btn-default">Нет</button>
1925

2026

2127
}

‎EPAM.MyBlog.UI.Web/Views/Account/EditAbout.cshtml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
ViewBag.Title = "EditAbout";
55
}
66

7-
<h2></h2>
87

98
@using (Html.BeginForm()) {
109
@Html.ValidationSummary(true)
@@ -13,20 +12,15 @@
1312
<fieldset>
1413
<legend>О себе</legend>
1514

16-
<div class="editor-label">
17-
@Html.LabelFor(model => model.AboutMe)
18-
</div>
1915
<div class="editor-field">
2016
@Html.EditorFor(model => model.AboutMe)
2117
@Html.ValidationMessageFor(model => model.AboutMe)
2218
</div>
2319

2420
<p>
25-
<input type="submit" value="Сохранить" />
21+
<input type="submit" value="Сохранить" class="btn btn-default"/>
22+
@Html.ActionLink("Вернуться", "AboutMe", null, new { @class="btn btn-default"})
2623
</p>
2724
</fieldset>
2825
}
2926

30-
<div>
31-
@Html.ActionLink("Вернуться", "AboutMe")
32-
</div>

‎EPAM.MyBlog.UI.Web/Views/Account/EditDate.cshtml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,23 @@
44
ViewBag.Title = "EditDate";
55
}
66

7-
<h2>EditInfoText</h2>
8-
97
@using (Html.BeginForm()) {
108
@Html.ValidationSummary(true)
119
@Html.AntiForgeryToken()
1210

1311
<fieldset>
1412
<legend>День Рождения</legend>
1513

16-
<div class="editor-label">
17-
@Html.LabelFor(model => model.Birthday)
18-
</div>
1914
<div class="editor-field">
2015
@Html.EditorFor(model => model.Birthday)
2116
@Html.ValidationMessageFor(model => model.Birthday)
2217
</div>
2318

2419
<p>
25-
<input type="submit" value="Сохранить" />
20+
<input type="submit" value="Сохранить" class="btn btn-default"/>
21+
@Html.ActionLink("Вернуться", "AboutMe", null, new { @class="btn btn-default"})
2622
</p>
2723
</fieldset>
2824
}
2925

30-
<div>
31-
@Html.ActionLink("Вернуться", "AboutMe")
32-
</div>
26+

‎EPAM.MyBlog.UI.Web/Views/Account/EditName.cshtml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
ViewBag.Title = "EditName";
55
}
66

7-
<h2>EditInfoText</h2>
87

98
@using (Html.BeginForm()) {
109
@Html.ValidationSummary(true)
@@ -13,20 +12,16 @@
1312
<fieldset>
1413
<legend>Имя</legend>
1514

16-
<div class="editor-label">
17-
@Html.LabelFor(model => model.Name)
18-
</div>
1915
<div class="editor-field">
2016
@Html.EditorFor(model => model.Name)
2117
@Html.ValidationMessageFor(model => model.Name)
2218
</div>
2319

2420
<p>
25-
<input type="submit" value="Сохранить" />
21+
<input type="submit" value="Сохранить" class="btn btn-default"/>
22+
@Html.ActionLink("Вернуться", "AboutMe", null, new { @class="btn btn-default"})
2623
</p>
2724
</fieldset>
2825
}
2926

30-
<div>
31-
@Html.ActionLink("Вернуться", "AboutMe")
32-
</div>
27+

‎EPAM.MyBlog.UI.Web/Views/Account/EditSex.cshtml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,24 @@
44
ViewBag.Title = "EditSex";
55
}
66

7-
<h2>EditInfoText</h2>
8-
97
@using (Html.BeginForm()) {
108
@Html.ValidationSummary(true)
119
@Html.AntiForgeryToken()
1210

1311
<fieldset>
1412
<legend>Пол</legend>
1513

16-
<div class="editor-label">
17-
@Html.LabelFor(model => model.Sex)
18-
</div>
1914
<div class="editor-field">
2015
@Html.EditorFor(model => model.Sex)
2116
@Html.ValidationMessageFor(model => model.Sex)
2217
</div>
2318

2419
<p>
25-
<input type="submit" value="Сохранить" />
20+
<input type="submit" value="Сохранить" class="btn btn-default"/>
21+
@Html.ActionLink("Вернуться", "AboutMe", null, new { @class="btn btn-default"})
2622
</p>
2723
</fieldset>
2824
}
2925

30-
<div>
31-
@Html.ActionLink("Вернуться", "AboutMe")
32-
</div>
26+
3327

0 commit comments

Comments
 (0)