Skip to content

Commit

Permalink
small style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
benthemonkey committed Oct 23, 2015
1 parent f6ec9c8 commit 38d37d2
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 15 deletions.
34 changes: 26 additions & 8 deletions css/points-table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,22 @@ $black: #000;
color: $black;
border-collapse: separate;
border-spacing: 3px;

.green {
background-color: $green;
}

.blue {
background-color: $blue;
}

.yellow {
background-color: $yellow;
}

.red {
background-color: $red;
}
}

.points-table-controls .legend td {
Expand Down Expand Up @@ -244,26 +260,28 @@ $black: #000;
}
}

td.end {
tr > td.end {
background-color: $white;
}

.sort-icon,
.name span {
background: url('data:image/gif;base64,R0lGODlhBwAJAIAAACMtMP///yH5BAEAAAEALAAAAAAHAAkAAAINjGEJq8sOk4Qu0IZmKgA7') no-repeat center;
.sorting {
.sort-icon,
&.name span {
background: url('data:image/gif;base64,R0lGODlhBwAJAIAAACMtMP///yH5BAEAAAEALAAAAAAHAAkAAAINjGEJq8sOk4Qu0IZmKgA7') center no-repeat;
}
}

.sorting_asc {
.sort-icon,
span {
background-image: url('data:image/gif;base64,R0lGODlhBwAEAIAAACMtMP///yH5BAEAAAEALAAAAAAHAAQAAAIHjGEJq8sOCwA7');
&.name span {
background: url('data:image/gif;base64,R0lGODlhBwAEAIAAACMtMP///yH5BAEAAAEALAAAAAAHAAQAAAIHjGEJq8sOCwA7') center no-repeat;
}
}

.sorting_desc {
.sort-icon,
span {
background-image: url('data:image/gif;base64,R0lGODlhBwAEAIAAACMtMP///yH5BAEAAAEALAAAAAAHAAQAAAIIhA+BGWoNWSgAOw==');
&.name span {
background: url('data:image/gif;base64,R0lGODlhBwAEAIAAACMtMP///yH5BAEAAAEALAAAAAAHAAQAAAIIhA+BGWoNWSgAOw==') center no-repeat;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ gulp.task('watch', ['clean', 'javascript-watch', 'stylesheets-watch'], function(
plugins.livereload.listen();

gulp.watch('js/**/*.js', ['javascript-lint']);
gulp.watch('css/*.css', ['stylesheets-watch']);
gulp.watch('css/*.scss', ['stylesheets-watch']);
});

gulp.task('build', ['clean', 'javascript-build', 'stylesheets-build']);
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"del": "2.0.2",
"gulp": "3.9.0",
"gulp-cached": "1.1.0",
"gulp-concat": "2.6.0",
"gulp-eslint": "1.0.0",
"gulp-ignore": "1.2.1",
"gulp-livereload": "3.8.1",
Expand Down
4 changes: 2 additions & 2 deletions spc-committee-headquarters.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ function getFullName($slivkans, $nu_email)
<div class="col-lg-4 col-md-5 col-sm-6">
<div>Colors:</div>
<table class="legend text-center" style="width: 100%;">
<tr class="odd">
<tr>
<td class="green">Attendee</td>
<td class="blue">Point Taker</td>
<td class="yellow">Other Points</td>
<td>None</td>
<td class="red">None</td>
</tr>
</table>
</div>
Expand Down
6 changes: 3 additions & 3 deletions spc-table.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
?></p>
</div>
<table class="legend">
<tr class="odd">
<td style="background-color: white;">Colors: </td>
<tr>
<td>Colors: </td>
<td class="green">Point</td>
<td class="blue">Committee</td>
<td class="gold">Helper</td>
<td>None</td>
<td class="red">None</td>
</tr>
</table>
</div>
Expand Down

0 comments on commit 38d37d2

Please sign in to comment.