edb/edb-www
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update deps, remove some stuff

Browse Source
This commit is contained in:
Nikolai R Kristiansen
2015-06-28 18:05:35 +02:00
parent ddf1081d27
commit 97740d30bf
25 changed files with 794 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/index.html
View File

@@ -56,7 +56,7 @@
<h3>Kontaktinfo:</h3>
<ul>
<li><a href="mailto:kak-edb@studentersamfundet.no">kak-edb@studentersamfundet.no</a></li>
<li>Leder: Jonas +47 454 80 454</li>
<li>Leder: Jonas Braathen +47 454 80 454</li>
<li>IRC: <a href="irc://irc.oftc.net/edb">#EDB@OFTC</a></li>
<li>M&oslash;tetid: Hver onsdag kl. 18.13.37 p&aring; KAK (<a href="https://viteboka.studentersamfundet.no/4._etasje">4. etg</a>)</li>
<li>Twitter: <a href="http://twitter.com/KAK_DNS">@KAK_DNS</a></li>

4
app/styles/_block_grid.scss
View File

@@ -24,7 +24,7 @@
& > .block-grid-item {
width: (100%/$per-row);
$nth-equation: #{$per-row}n+'+'+1;
$nth-equation: #{$per-row}n+1;
&:nth-of-type(n) { clear: none; }
&:nth-of-type(#{$nth-equation}) { clear: both; }
}
@@ -48,4 +48,4 @@
@include block-grids(xs);
@media (min-width: $screen-sm-min) { @include block-grids(sm) }
@media (min-width: $screen-md-min) { @include block-grids(md) }
@media (min-width: $screen-lg-min) { @include block-grids(lg) }
@media (min-width: $screen-lg-min) { @include block-grids(lg) }

6
app/styles/main.scss
View File

@@ -1,7 +1,7 @@
$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";
$icon-font-path: "../bower_components/bootstrap-sass/assets/fonts/bootstrap/";
// bower:scss
@import "../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap.scss";
@import "../bower_components/bootstrap-sass/assets/stylesheets/bootstrap.scss";
// endbower
@import "block_grid"; // from foundation 5
@@ -55,4 +55,4 @@ h3 {
text-align: center;
color: #666;
font-size: 12px;
}
}