@@ -44,7 +44,11 @@ $presentation-h3-font-size: 1.3em;
4444// Title slide styling
4545.reveal .title-slide {
4646 text-align : center ;
47+ <<<<<<< HEAD
4748
49+ =======
50+
51+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
4852 h1 .title {
4953 font-family : $font-family-sans-serif ;
5054 color : $primary-color ;
@@ -53,7 +57,11 @@ $presentation-h3-font-size: 1.3em;
5357 margin-bottom : 0.5em ;
5458 text-shadow : 2px 2px 4px rgba (0 ,0 ,0 ,0.1 );
5559 }
60+ <<<<<<< HEAD
61+
62+ =======
5663
64+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
5765 .subtitle {
5866 font-family : $font-family-sans-serif ;
5967 color : $theme-dark-gray ;
@@ -95,12 +103,20 @@ $presentation-h3-font-size: 1.3em;
95103 margin-left : 1em ;
96104 margin-top : 0em ;
97105 margin-bottom : 0em ;
106+ <<<<<<< HEAD
107+
108+ =======
98109
110+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
99111 li {
100112 margin-bottom : 0em ;
101113 line-height : 1.2 ;
102114 }
115+ <<<<<<< HEAD
103116
117+ =======
118+
119+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
104120 ul , ol {
105121 margin-top : 0em ;
106122 margin-bottom : 0em ;
@@ -116,7 +132,11 @@ $presentation-h3-font-size: 1.3em;
116132
117133.reveal ul {
118134 list-style-type : none ;
135+ <<<<<<< HEAD
136+
137+ =======
119138
139+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
120140 li ::before {
121141 content : " ›" ;
122142 color : inherit ;
@@ -125,6 +145,7 @@ $presentation-h3-font-size: 1.3em;
125145 margin-left : -1em ;
126146 position : absolute ;
127147 }
148+ <<<<<<< HEAD
128149
129150 ul {
130151 list-style-type : none ;
@@ -136,6 +157,19 @@ $presentation-h3-font-size: 1.3em;
136157 ul {
137158 list-style-type : none ;
138159
160+ =======
161+
162+ ul {
163+ list-style-type : none ;
164+
165+ li ::before {
166+ content : " »" ;
167+ }
168+
169+ ul {
170+ list-style-type : none ;
171+
172+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
139173 li ::before {
140174 content : " ⋙" ;
141175 }
@@ -147,20 +181,32 @@ $presentation-h3-font-size: 1.3em;
147181.reveal table {
148182 border-collapse : collapse ;
149183 margin : 1em auto ;
184+ <<<<<<< HEAD
185+
186+ =======
150187
188+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
151189 th {
152190 background-color : $secondary-color ;
153191 color : white ;
154192 font-weight : 500 ;
155193 padding : 0.8em 1em ;
156194 border : 1px solid darken ($secondary-color , 10% );
157195 }
196+ <<<<<<< HEAD
197+
198+ =======
158199
200+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
159201 td {
160202 padding : 0.6em 1em ;
161203 border : 1px solid $theme-light-gray ;
162204 }
205+ <<<<<<< HEAD
163206
207+ =======
208+
209+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
164210 tr :nth-child (even ) {
165211 background-color : $theme-light-gray ;
166212 }
@@ -172,7 +218,11 @@ $presentation-h3-font-size: 1.3em;
172218 border : 1px solid $theme-medium-gray ;
173219 border-radius : 4px ;
174220 padding : 1em ;
221+ <<<<<<< HEAD
222+
223+ =======
175224
225+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
176226 code {
177227 background-color : transparent ;
178228 color : $text-color ;
@@ -245,7 +295,11 @@ $presentation-h3-font-size: 1.3em;
245295// Custom classes for specific content
246296.course-schedule {
247297 list-style-type : decimal ;
298+ <<<<<<< HEAD
299+
300+ =======
248301
302+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
249303 li {
250304 position : relative ;
251305 padding-left : 0 ;
@@ -270,7 +324,11 @@ $presentation-h3-font-size: 1.3em;
270324.reveal a {
271325 color : $accent-color ;
272326 text-decoration : underline ;
327+ <<<<<<< HEAD
273328
329+ =======
330+
331+ >>>>>>> 7f 3b 078 (Add presentation draft (see folder ))
274332 & :hover {
275333 color : darken ($accent-color , 15% );
276334 }
@@ -365,4 +423,3 @@ $presentation-h3-font-size: 1.3em;
365423.refs-super-small li {
366424 margin-bottom : 0.15em !important ;
367425}
368-
0 commit comments