aboutsummaryrefslogtreecommitdiffhomepage
path: root/presentation/css/style.css
diff options
context:
space:
mode:
Diffstat (limited to 'presentation/css/style.css')
-rw-r--r--presentation/css/style.css14
1 files changed, 14 insertions, 0 deletions
diff --git a/presentation/css/style.css b/presentation/css/style.css
index d68e1ab..cf0e33b 100644
--- a/presentation/css/style.css
+++ b/presentation/css/style.css
@@ -30,6 +30,17 @@
right: 35%;
}
+<<<<<<< HEAD
+.description {
+ margin-top: 16px;
+}
+
+.history .fragment:not(.visible) {
+ display: none;
+}
+
+=======
+>>>>>>> origin/master
table, tbody, tr {
border: 0;
!important;
@@ -39,8 +50,11 @@ td, th {
text-align: center !important;
border: 1px solid white !important;
border-collapse: collapse;
+<<<<<<< HEAD
+=======
}
.description {
margin-top: 16px;
+>>>>>>> origin/master
} \ No newline at end of file