Skip to content
This repository was archived by the owner on Jan 30, 2022. It is now read-only.

Commit 543debe

Browse files
committed
Talks 2.1.1: Tweaking the table style
1 parent 18d4427 commit 543debe

File tree

3 files changed

+64
-38
lines changed

3 files changed

+64
-38
lines changed

public/css/app.css

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
body {
44
font-family: "Open Sans";
55
background-color: #78909c;
6-
color: white;
6+
color: #e4e4e4;
77
margin: 0;
88
margin-top: 60px;
99
padding: 0;
@@ -15,6 +15,10 @@ h1 {
1515
margin-bottom: 0px;
1616
}
1717

18+
table {
19+
border-collapse: collapse;
20+
}
21+
1822
td.hides {
1923
clear: both;
2024
}
@@ -25,14 +29,24 @@ td.hides button {
2529
background: 0;
2630
/*border: 0;
2731
outline: 0;*/
28-
color: white;
32+
color: #eee;
33+
background-color: #78909c;
34+
margin: 0 2px;
2935

3036
&:hover {
3137
background: white;
3238
color: #78909c;
3339
}
3440
}
3541

42+
table tbody tr:last-child {
43+
background-color: #6C828C;
44+
}
45+
table tbody tr:last-child button {
46+
margin-right: 5px;
47+
}
48+
49+
3650
h3 {
3751
font-size: 24px;
3852
text-align: center;
@@ -70,38 +84,47 @@ h5 {
7084
}
7185

7286
#talks-table {
73-
color: white;
87+
color: #444;
88+
background-color: #fff;
7489
width: 80%;
7590
margin: 0 auto;
7691
font-size: 120%;
92+
box-shadow: 0px 0px 2px black;
7793
}
7894
#talks-table .desc {
7995
word-break: break-word;
8096
}
8197
#talks-table .type {
8298
font-style: italic;
8399
}
84-
#talks-table th {
100+
#talks-table tbody th {
85101
width: 32%;
86102
}
87103
#talks-table thead th {
88104
font-size: 20px;
105+
color: white;
106+
background-color: #6C828C;
107+
padding-bottom: 5px;
108+
}
109+
.event, .name, .type, .desc {
110+
padding: 5px 0;
111+
}
112+
.name {
113+
padding-left: 10px;
114+
}
115+
tbody tr:last-child th {
116+
padding: 10px 0;
89117
}
90118
#talks-table th td {
91119
padding: 5px;
92120
}
93121
#talks-table button {
94122
word-break: normal;
95123
}
96-
#talks-table tr:nth-child(2n+1) {
97-
background-color: #6C828C;
98-
}
99124
#talks-table tr.hidden {
100-
background-color: #070;
101-
opacity: 0.6;
102-
}
103-
#talks-table tr:nth-child(2n+1).hidden {
104-
background-color: #060;
125+
background-color: #888;
126+
/*opacity: 0.6;*/
127+
color: white;
105128
}
106129
.error {
107130
background-color: #662222;
@@ -111,11 +134,11 @@ h5 {
111134
}
112135
.btn_unhide {
113136
border: 0px;
114-
color: #fff;
137+
color: #444;
115138
background-color: inherit;
116139
}
117140
.btn_hide {
118141
border: 0px;
119-
color: #fff;
142+
color: #444;
120143
background-color: inherit;
121144
}

views/all.pug

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ html(ng-app='talksApp')
2121

2222
h1 Talks
2323
h3 Upcoming Events For The Clarkson Open Source Institute Meetings
24-
h3 Next Meeting: Apr. 6
24+
h3 Next Meeting: Aug. 31
2525

2626
table(ng-controller="talksController" id="talks-table")
27-
tr
27+
thead: tr
2828
th Talk Presenter
2929
th Type
3030
th Description
31+
th
3132
tr(class="event" ng-class="{hidden: talk.hidden}" ng-repeat="talk in talks | orderBy: ['type']")
3233
td.name {{ talk.name }}
3334
td.type {{ talk.type }}

views/index.pug

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,35 @@ html(ng-app='talksApp')
2020

2121
h1 Talks
2222
h3 Upcoming Events For The Clarkson Open Source Institute Meetings
23-
h3 Next Meeting: Mar. 30
23+
h3 Next Meeting: Aug. 31
2424

2525
table(ng-controller="talksController" id="talks-table")
26-
tr
27-
th.mdl-data-table__cell--non-numeric Talk Presenter
26+
thead: tr
27+
th Talk Presenter
2828
th Type
2929
th Description
30+
th
3031

31-
tr(class="event" ng-class="{hidden: talk.hidden}" ng-repeat="talk in talks | filter: {'hidden': false} | orderBy: ['type']")
32-
td.name {{ talk.name }}
33-
td.type {{ talk.type }}
34-
td.desc {{ talk.desc }}
35-
td.hides
36-
button(ng-click="hide(this.talk.id)") X
37-
button(ng-click="unhide(this.talk.id)") ↶
38-
tr
39-
form
40-
th: input(id="in_name" size=30 name="name" ng-model="newTalk.name" type="text" placeholder="Name")
41-
th: select(name="type" ng-model="newTalk.type")
42-
option(value="forum topic") Forum Topic
43-
option(value="lightning talk") Lightning Talk
44-
option(value="project update") Project Update
45-
option(value="announcement") Announcement
46-
option(value="after meeting slot") After-Meeting Slot
47-
th: input(id="in_desc" size=50 name="desc" type="text" ng-model="newTalk.desc" placeholder="Description")
48-
th: button(ng-click="createTalk()") Create
32+
tbody
33+
tr(class="event" ng-class="{hidden: talk.hidden}" ng-repeat="talk in talks | filter: {'hidden': false} | orderBy: ['type']")
34+
td.name {{ talk.name }}
35+
td.type {{ talk.type }}
36+
td.desc {{ talk.desc }}
37+
td.hides
38+
button(ng-click="hide(this.talk.id)") X
39+
button(ng-click="unhide(this.talk.id)") ↶
40+
tr
41+
form
42+
th: input(id="in_name" size=30 name="name" ng-model="newTalk.name" type="text" placeholder="Name")
43+
th: select(name="type" ng-model="newTalk.type")
44+
option(value="forum topic") Forum Topic
45+
option(value="lightning talk") Lightning Talk
46+
option(value="project update") Project Update
47+
option(value="announcement") Announcement
48+
option(value="after meeting slot") After-Meeting Slot
49+
th: input(id="in_desc" size=50 name="desc" type="text" ng-model="newTalk.desc" placeholder="Description")
50+
th: button(ng-click="createTalk()") Create
4951

5052
script(src="js/angular.min.js")
5153
script(src='js/app.js')
52-
p(style="text-align:center") V2.0 - Not powered by Fsuvius
54+
p(style="text-align:center") V2.1.1

0 commit comments

Comments
 (0)