Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 506727d

Browse files
ammmzeammmze
committed
Merge branch 'lucanso/DeployMint/dev' into 'ammmze/DeployMint/master'
# By Luke Stevenson # Via Luke Stevenson * dev: Formatted code in preparation for refactoring Correction for ee85799 Standardised File Names Formatted Views Formatted CSS & Created Minified Version Conflicts: deploymint.php views/index.php views/manageBlogs.php views/manageProject.php
2 parents 9c25670 + 12f4d8c commit 506727d

13 files changed

+1588
-1711
lines changed

Diff for: ‎css/admin.css

+44-46
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,84 @@
1-
table.deploymintTable {
2-
width: auto;
3-
}
1+
table.deploymintTable ,
42
.deploymintTable td {
5-
width: auto;
3+
width:auto;
64
}
75
.deploymintTable th {
8-
font-weight: bold;
6+
font-weight:bold;
97
}
108
.deployMintWarn {
11-
color: #F00;
9+
color:#F00;
1210
}
1311
.deployMintWarn strong {
14-
text-decoration: underline;
15-
font-weight: bold;
12+
text-decoration:underline;
13+
font-weight:bold;
1614
}
1715
.deploymintPadCell {
18-
padding: 0 20px 5px 0;
16+
padding:0 20px 5px 0;
1917
}
2018
.deploymintCellHeading {
21-
font-weight: bold;
19+
font-weight:bold;
2220
}
2321
.depProjWrap {
24-
margin: 0px 0 20px 20px;
25-
border-bottom: 1px solid #EFEFEF;
22+
margin:0px 0px 20px 20px;
23+
border-bottom:1px solid #EFEFEF;
2624
}
2725
.depSmallHead {
28-
margin: 10px 0 5px 0;
29-
font-weight: bold;
30-
font-size: 14px;
26+
margin:10px 0px 5px 0px;
27+
font-weight:bold;
28+
font-size:14px;
3129
}
3230
.depList li {
33-
margin-left: 0px;
31+
margin-left:0px;
3432
}
3533
h2.depmintHead {
36-
padding: 9px 15px 4px 32px;
37-
background-image: url(../images/deployMint28.png);
38-
background-repeat: no-repeat;
39-
background-position: 0 9px;
40-
font-size: 23px;
41-
line-height: 29px;
34+
padding:9px 15px 4px 32px;
35+
background-image:url(../images/deployMint28.png);
36+
background-repeat:no-repeat;
37+
background-position:0 9px;
38+
font-size:23px;
39+
line-height:29px;
4240
}
4341

4442
tr.note {
45-
font-size: 10px;
46-
font-style: italic;
47-
color: #555;
43+
font-size:10px;
44+
font-style:italic;
45+
color:#555;
4846
}
4947
tr.note th {
50-
color: #555;
51-
padding-top: 0;
48+
color:#555;
49+
padding-top:0;
5250
}
5351

5452
table.deploymint-blogs {
55-
border: 1px solid #EFEFEF;
53+
border:1px solid #EFEFEF;
5654
}
57-
table.deploymint-blogs th{
58-
text-align: left;
59-
border-bottom: 1px solid #EFEFEF;
55+
table.deploymint-blogs th {
56+
text-align:left;
57+
border-bottom:1px solid #EFEFEF;
6058
}
61-
table.deploymint-blogs th,
62-
table.deploymint-blogs td{
63-
padding: 3px 5px;
59+
table.deploymint-blogs th ,
60+
table.deploymint-blogs td {
61+
padding:3px 5px;
6462
}
6563

6664
.DeployMint-Modal {
67-
background: #FFF;
68-
max-width: 260px;
69-
padding: 20px;
65+
background:#FFF;
66+
max-width:260px;
67+
padding:20px;
7068
}
7169
#DeployMint-Working {
72-
padding-left: 68px;
73-
background-image: url(../images/working.gif);
74-
background-repeat: no-repeat;
75-
background-position: 10px center;
76-
min-height: 48px;
70+
padding-left:68px;
71+
background-image:url(../images/working.gif);
72+
background-repeat:no-repeat;
73+
background-position:10px center;
74+
min-height:48px;
7775
}
7876
.deploymint-error {
79-
color: #F00;
77+
color:#F00;
8078
}
8179
.deploymint-success {
82-
color: #0A0;
80+
color:#0A0;
8381
}
8482
.deployPart {
85-
margin-right: 10px;
86-
}
83+
margin-right:10px;
84+
}

Diff for: ‎css/admin.min.css

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* /css/admin.css */
2+
table.deploymintTable,.deploymintTable td{width:auto}
3+
.deployMintWarn strong{text-decoration:underline;font-weight:700}
4+
.deploymintPadCell{padding:0 20px 5px 0}
5+
.depProjWrap{border-bottom:1px solid #EFEFEF;margin:0 0 20px 20px}
6+
.depSmallHead{font-weight:700;font-size:14px;margin:10px 0 5px}
7+
.depList li{margin-left:0}
8+
h2.depmintHead{background-image:url(../images/deployMint28.png);background-repeat:no-repeat;background-position:0 9px;font-size:23px;line-height:29px;padding:9px 15px 4px 32px}
9+
tr.note{font-size:10px;font-style:italic;color:#555}
10+
tr.note th{color:#555;padding-top:0}
11+
table.deploymint-blogs{border:1px solid #EFEFEF}
12+
table.deploymint-blogs th{text-align:left;border-bottom:1px solid #EFEFEF}
13+
table.deploymint-blogs th,table.deploymint-blogs td{padding:3px 5px}
14+
.DeployMint-Modal{background:#FFF;max-width:260px;padding:20px}
15+
#DeployMint-Working{padding-left:68px;background-image:url(../images/working.gif);background-repeat:no-repeat;background-position:10px center;min-height:48px}
16+
.deploymint-success{color:#0A0}
17+
.deployPart{margin-right:10px}
18+
.deploymintTable th,.deploymintCellHeading{font-weight:700}
19+
.deployMintWarn,.deploymint-error{color:red}

0 commit comments

Comments
 (0)