Skip to content

Commit 8cc8033

Browse files
author
Ian Redpath
committed
custom css. fixed span closures
1 parent f7ec468 commit 8cc8033

File tree

5 files changed

+89
-61
lines changed

5 files changed

+89
-61
lines changed

‎public/assignment/admin.html‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
<!-- Custom styles for this template -->
1717
<link href="./css/dashboard.css" rel="stylesheet">
18+
<link href="./css/style.css" rel="stylesheet">
1819
</head>
1920
<body>
2021
<nav class="navbar navbar-inverse navbar-fixed-top">
@@ -81,42 +82,42 @@ <h2>Users</h2>
8182
</div>
8283
</th>
8384
</tr>
85+
</thead>
86+
<tbody
8487
<tr>
8588
<th><input type="text" placeholder="username"></th>
8689
<th><input type="text" placeholder="password"></th>
8790
<th><input type="text" placeholder="role1, role2"></th>
88-
<th><div class="icon-div">
89-
<span class="glyphicon glyphicon-plus" />
90-
<span class="glyphicon glyphicon-ok" />
91+
<th><div class="icon-div-2">
92+
<span class="glyphicon glyphicon-plus"></span>
93+
<span class="glyphicon glyphicon-ok"></span>
9194
</div></th>
9295
</tr>
93-
</thead>
94-
<tbody>
9596
<tr>
9697
<th>alice</th>
9798
<th>
9899
<th>student</th>
99-
<th><div class="icon-div">
100-
<span class="glyphicon glyphicon-remove" />
101-
<span class="glyphicon glyphicon-pencil" />
100+
<th><div class="icon-div-2">
101+
<span class="glyphicon glyphicon-remove"></span>
102+
<span class="glyphicon glyphicon-pencil"></span>
102103
</div></th>
103104
</tr>
104105
<tr>
105106
<th>bob</th>
106107
<th>
107108
<th>faculty | admin</th>
108-
<th><div class="icon-div">
109-
<span class="glyphicon glyphicon-remove" />
110-
<span class="glyphicon glyphicon-pencil" />
109+
<th><div class="icon-div-2">
110+
<span class="glyphicon glyphicon-remove"></span>
111+
<span class="glyphicon glyphicon-pencil"></span>
111112
</div></th>
112113
</tr>
113114
<tr>
114115
<th>charlie</th>
115116
<th>
116117
<th>
117-
<th><div class="icon-div">
118-
<span class="glyphicon glyphicon-remove" />
119-
<span class="glyphicon glyphicon-pencil" />
118+
<th><div class="icon-div-2">
119+
<span class="glyphicon glyphicon-remove"></span>
120+
<span class="glyphicon glyphicon-pencil"></span>
120121
</div></th>
121122
</tr>
122123
</table>

‎public/assignment/css/style.css‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
span.glyphicon:hover {
2+
cursor: pointer;
3+
color: #337ab7;
4+
text-decoration: none;
5+
}
6+
7+
.icon-div-2 > span {
8+
width: 50%;
9+
max-width: 30px;
10+
float: left;
11+
}
12+
13+
.icon-div-4 > span {
14+
width: 25%;
15+
max-width: 30px;
16+
float: left;
17+
}
18+
19+
.icon-div-4 > .left-spacer {
20+
height: 1px; /* will not space without height >= 1 */
21+
}
22+
.nav-tabs {
23+
margin-bottom: 25px;
24+
}

‎public/assignment/form-fields.html‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
<!-- Custom styles for this template -->
1717
<link href="./css/dashboard.css" rel="stylesheet">
18+
<link href="./css/style.css" rel="stylesheet">
1819
</head>
1920
<body>
2021
<nav class="navbar navbar-inverse navbar-fixed-top">
@@ -62,35 +63,35 @@ <h1 class="page-header">Forms : Registration Form</h1>
6263
<div class="col-sm-6">
6364
<input type="text" class="form-control" id="first-name" placeholder="Username">
6465
</div>
65-
<div class="col-sm-4 icons">
66-
<span class="glyphicon glyphicon-pencil" />
67-
<span class="glyphicon glyphicon-plus" />
68-
<span class="glyphicon glyphicon-remove" />
69-
<span class="glyphicon glyphicon-menu-hamburger" />
66+
<div class="col-sm-4 icon-div-4">
67+
<span class="glyphicon glyphicon-pencil"></span>
68+
<span class="glyphicon glyphicon-plus"></span>
69+
<span class="glyphicon glyphicon-remove"></span>
70+
<span class="glyphicon glyphicon-menu-hamburger"></span>
7071
</div>
7172
</div>
7273
<div class="form-group">
7374
<label for="last-name" class="col-sm-2 control-label">Last Name:</label>
7475
<div class="col-sm-6">
7576
<input type="text" class="form-control" id="last-name" placeholder="Password">
7677
</div>
77-
<div class="col-sm-4 icons">
78-
<span class="glyphicon glyphicon-pencil" />
79-
<span class="glyphicon glyphicon-plus" />
80-
<span class="glyphicon glyphicon-remove" />
81-
<span class="glyphicon glyphicon-menu-hamburger" />
78+
<div class="col-sm-4 icon-div-4">
79+
<span class="glyphicon glyphicon-pencil"></span>
80+
<span class="glyphicon glyphicon-plus"></span>
81+
<span class="glyphicon glyphicon-remove"></span>
82+
<span class="glyphicon glyphicon-menu-hamburger"></span>
8283
</div>
8384
</div>
8485
<div class="form-group">
8586
<label for="dob" class="col-sm-2 control-label">Date of Birth:</label>
8687
<div class="col-sm-6">
8788
<input type="date" class="form-control" id="dob" placeholder="Select date">
8889
</div>
89-
<div class="col-sm-4 icons">
90-
<span class="glyphicon glyphicon-pencil" />
91-
<span class="glyphicon glyphicon-plus" />
92-
<span class="glyphicon glyphicon-remove" />
93-
<span class="glyphicon glyphicon-menu-hamburger" />
90+
<div class="col-sm-4 icon-div-4">
91+
<span class="glyphicon glyphicon-pencil"></span>
92+
<span class="glyphicon glyphicon-plus"></span>
93+
<span class="glyphicon glyphicon-remove"></span>
94+
<span class="glyphicon glyphicon-menu-hamburger"></span>
9495
</div>
9596
</div>
9697
<div class="form-group">
@@ -101,11 +102,11 @@ <h1 class="page-header">Forms : Registration Form</h1>
101102
<option>Female</option>
102103
<select>
103104
</div>
104-
<div class="col-sm-4 icons">
105-
<span class="glyphicon glyphicon-pencil" />
106-
<span class="glyphicon glyphicon-plus" />
107-
<span class="glyphicon glyphicon-remove" />
108-
<span class="glyphicon glyphicon-menu-hamburger" />
105+
<div class="col-sm-4 icon-div-4">
106+
<span class="glyphicon glyphicon-pencil"></span>
107+
<span class="glyphicon glyphicon-plus"></span>
108+
<span class="glyphicon glyphicon-remove"></span>
109+
<span class="glyphicon glyphicon-menu-hamburger"></span>
109110
</div>
110111
</div>
111112
<div class="form-group">
@@ -115,11 +116,11 @@ <h1 class="page-header">Forms : Registration Form</h1>
115116
<label><input type="checkbox" class="form-control">Student</label>
116117
<label><input type="checkbox" class="form-control">User</label>
117118
</div>
118-
<div class="col-sm-4 icons">
119-
<span class="glyphicon glyphicon-pencil" />
120-
<span class="glyphicon glyphicon-plus" />
121-
<span class="glyphicon glyphicon-remove" />
122-
<span class="glyphicon glyphicon-menu-hamburger" />
119+
<div class="col-sm-4 icon-div-4">
120+
<span class="glyphicon glyphicon-pencil"></span>
121+
<span class="glyphicon glyphicon-plus"></span>
122+
<span class="glyphicon glyphicon-remove"></span>
123+
<span class="glyphicon glyphicon-menu-hamburger"></span>
123124
</div>
124125
</div>
125126
<div class="form-group">
@@ -128,11 +129,11 @@ <h1 class="page-header">Forms : Registration Form</h1>
128129
<label><input type="radio" name="license-radio" class="form-control">Yes</label>
129130
<label><input type="radio" name="license-radio" class="form-control">No</label>
130131
</div>
131-
<div class="col-sm-4 icons">
132-
<span class="glyphicon glyphicon-pencil" />
133-
<span class="glyphicon glyphicon-plus" />
134-
<span class="glyphicon glyphicon-remove" />
135-
<span class="glyphicon glyphicon-menu-hamburger" />
132+
<div class="col-sm-4 icon-div-4">
133+
<span class="glyphicon glyphicon-pencil"></span>
134+
<span class="glyphicon glyphicon-plus"></span>
135+
<span class="glyphicon glyphicon-remove"></span>
136+
<span class="glyphicon glyphicon-menu-hamburger"></span>
136137
</div>
137138
</div>
138139
<br>
@@ -148,8 +149,9 @@ <h1 class="page-header">Forms : Registration Form</h1>
148149
<option>Paragraph Text Field</option>
149150
</select>
150151
</div>
151-
<div class="col-sm-4 icons">
152-
<span class="glyphicon glyphicon-plus" />
152+
<div class="col-sm-4 icon-div-4">
153+
<span class="glyphicon left-spacer"></span>
154+
<span class="glyphicon glyphicon-plus"></span>
153155
</div>
154156
</div>
155157
</form>

‎public/assignment/forms.html‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
<!-- Custom styles for this template -->
1717
<link href="./css/dashboard.css" rel="stylesheet">
18+
<link href="./css/style.css" rel="stylesheet">
1819
</head>
1920
<body>
2021
<nav class="navbar navbar-inverse navbar-fixed-top">
@@ -72,34 +73,34 @@ <h1 class="page-header">Forms</h1>
7273
</div>
7374
</th>
7475
</tr>
76+
</thead>
77+
<tbody>
7578
<tr>
7679
<th><input type="text" placeholder="name"></th>
77-
<th><div class="icon-div">
78-
<span class="glyphicon glyphicon-plus" />
79-
<span class="glyphicon glyphicon-ok" />
80+
<th><div class="icon-div-2">
81+
<span class="glyphicon glyphicon-plus"></span>
82+
<span class="glyphicon glyphicon-ok"></span>
8083
</div></th>
8184
</tr>
82-
</thead>
83-
<tbody>
8485
<tr>
8586
<th><a href="./form-fields.html">Registration Form</a></th>
86-
<th><div class="icon-div">
87-
<span class="glyphicon glyphicon-remove" />
88-
<span class="glyphicon glyphicon-pencil" />
87+
<th><div class="icon-div-2">
88+
<span class="glyphicon glyphicon-remove"></span>
89+
<span class="glyphicon glyphicon-pencil"></span>
8990
</div></th>
9091
</tr>
9192
<tr>
9293
<th><a href="./form-fields.html">Contact List</a></th>
93-
<th><div class="icon-div">
94-
<span class="glyphicon glyphicon-remove" />
95-
<span class="glyphicon glyphicon-pencil" />
94+
<th><div class="icon-div-2">
95+
<span class="glyphicon glyphicon-remove"></span>
96+
<span class="glyphicon glyphicon-pencil"></span>
9697
</div></th>
9798
</tr>
9899
<tr>
99100
<th><a href="./form-fields.html">To Do List</a></th>
100-
<th><div class="icon-div">
101-
<span class="glyphicon glyphicon-remove" />
102-
<span class="glyphicon glyphicon-pencil" />
101+
<th><div class="icon-div-2">
102+
<span class="glyphicon glyphicon-remove"></span>
103+
<span class="glyphicon glyphicon-pencil"></span>
103104
</div></th>
104105
</tr>
105106
</table>

‎public/assignment/profile.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
<!-- Custom styles for this template -->
1717
<link href="./css/dashboard.css" rel="stylesheet">
18+
1819
</head>
1920
<body>
2021
<nav class="navbar navbar-inverse navbar-fixed-top">
@@ -86,7 +87,6 @@ <h1 class="page-header">Profile</h1>
8687
<div class="form-group">
8788
<div class="col-sm-offset-2 col-sm-10">
8889
<a class="btn btn-default" href="./profile.html">Update</a>
89-
<!--<button type="submit" class="btn btn-default" id="register">Register</button>-->
9090
</div>
9191
</div>
9292
</form>

0 commit comments

Comments
 (0)