Skip to content

Commit c488c9c

Browse files
committed
news angepasst...
1 parent ac511b9 commit c488c9c

File tree

3 files changed

+44
-64
lines changed

3 files changed

+44
-64
lines changed

css/coderdojoka.css

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,11 @@ body {
632632
}
633633

634634
@media (max-width: 767px) {
635+
636+
#news_container{
637+
display: none;
638+
}
639+
635640
#timeline:before {
636641
left: 35px;
637642
}
@@ -704,30 +709,32 @@ body {
704709
position: relative;
705710
}
706711

707-
#news_content a{
708-
color: #42dca3 !important;
709-
}
710-
711712
#news_container{
712-
margin-bottom: 200px;
713+
position: absolute;
714+
left: 0;
715+
bottom: 40px;
713716
font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif;
714-
font-size: 20pt;
717+
font-size: 18pt;
715718
text-align: left;
716719
}
717720

721+
#news_container a{
722+
color: #0D7900;
723+
}
724+
718725
.triangle_box{
719726
width: auto;
720727
height: 40px;
721728
line-height: 40px;
722-
font-size: 22pt;
729+
font-size: 18pt;
723730
margin: 5px 0;
724731
}
725732
.triangle_text{
726733
background-color: black;
727734
color: white;
728735
float: left ;
729736
padding-left: 5px;
730-
width: 265px;
737+
width: 220px;
731738
}
732739

733740
.triangle_right {

index.html

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,42 @@
117117

118118

119119
</div>
120-
<div id="news"><span id="news_content"> bubberfisch</span> </div>
121120
<!-- /.container -->
122121
</nav>
123122

124123
<!-- Intro Header -->
125124
<header class="intro">
126125
<div class="intro-body">
126+
127+
128+
<table id="news_container">
129+
<tr>
130+
<td>
131+
<div class="triangle_box">
132+
<div class="triangle_text">Nächstes Treffen</div>
133+
<div class="triangle_right"></div>
134+
</div>
135+
</td>
136+
<td>20. November</td>
137+
</tr>
138+
<tr>
139+
<td>
140+
<div class="triangle_box">
141+
<div class="triangle_text">Neu</div>
142+
<div class="triangle_right"></div>
143+
</div>
144+
</td>
145+
<td><a href="raetsel.html">Das Rätsel der Woche</td>
146+
</tr>
147+
</table>
148+
149+
150+
127151
<div class="container">
128152
<div class="row">
153+
154+
155+
129156
<div class="col-md-8 col-md-offset-2">
130157
<h1 class="brand-heading">CoderDojo</h1>
131158

@@ -147,26 +174,7 @@ <h2 class="brand-heading">Karlsruhe</h2>
147174
<section id="about" class="content-section text-center">
148175
<div class="container">
149176

150-
<table id="news_container">
151-
<tr>
152-
<td>
153-
<div class="triangle_box">
154-
<div class="triangle_text">Nächstes Treffen</div>
155-
<div class="triangle_right"></div>
156-
</div>
157-
</td>
158-
<td>20. November</td>
159-
</tr>
160-
<tr>
161-
<td>
162-
<div class="triangle_box">
163-
<div class="triangle_text">Neu</div>
164-
<div class="triangle_right"></div>
165-
</div>
166-
</td>
167-
<td><a href="raetsel.html">Das Rätsel der Woche</td>
168-
</tr>
169-
</table>
177+
170178

171179
<div class="row">
172180
<div class="col-lg-8 col-lg-offset-2">
@@ -489,10 +497,6 @@ <h2>Unterstützer</h2>
489497
<!-- Custom Theme JavaScript -->
490498
<script src="js/coderdojoka.js"></script>
491499

492-
<!-- News ticker
493-
<script src="js/news_anim.js"></script>
494-
-->
495-
496500
<!-- Init Lightbox -->
497501
<script>
498502
lightbox.option({
@@ -501,8 +505,6 @@ <h2>Unterstützer</h2>
501505
'fitImagesInViewport': true
502506
});
503507

504-
// News.init(["Neu: das <a href='raetsel.html'>Rätsel der Woche</a>", "nächstes Treffen am 20.Nov"]);
505-
// News.animate();
506508
</script>
507509

508510

js/news_anim.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)