This commit is contained in:
Nikolai R Kristiansen
2014-09-13 17:53:08 +02:00
parent 6d098eb913
commit 53b8d22859
42 changed files with 1130 additions and 201 deletions

View File

@@ -1,157 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Page Not Found :(</title>
<style>
::-moz-selection {
background: #b3d4fc;
text-shadow: none;
}
::selection {
background: #b3d4fc;
text-shadow: none;
}
html {
padding: 30px 10px;
font-size: 20px;
line-height: 1.4;
color: #737373;
background: #f0f0f0;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
html,
input {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
body {
max-width: 500px;
_width: 500px;
padding: 30px 20px 50px;
border: 1px solid #b3b3b3;
border-radius: 4px;
margin: 0 auto;
box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff;
background: #fcfcfc;
}
h1 {
margin: 0 10px;
font-size: 50px;
text-align: center;
}
h1 span {
color: #bbb;
}
h3 {
margin: 1.5em 0 0.5em;
}
p {
margin: 1em 0;
}
ul {
padding: 0 0 0 40px;
margin: 1em 0;
}
.container {
max-width: 380px;
_width: 380px;
margin: 0 auto;
}
/* google search */
#goog-fixurl ul {
list-style: none;
padding: 0;
margin: 0;
}
#goog-fixurl form {
margin: 0;
}
#goog-wm-qt,
#goog-wm-sb {
border: 1px solid #bbb;
font-size: 16px;
line-height: normal;
vertical-align: top;
color: #444;
border-radius: 2px;
}
#goog-wm-qt {
width: 220px;
height: 20px;
padding: 5px;
margin: 5px 10px 0 0;
box-shadow: inset 0 1px 1px #ccc;
}
#goog-wm-sb {
display: inline-block;
height: 32px;
padding: 0 10px;
margin: 5px 0 0;
white-space: nowrap;
cursor: pointer;
background-color: #f5f5f5;
background-image: -webkit-linear-gradient(rgba(255,255,255,0), #f1f1f1);
background-image: -moz-linear-gradient(rgba(255,255,255,0), #f1f1f1);
background-image: -ms-linear-gradient(rgba(255,255,255,0), #f1f1f1);
background-image: -o-linear-gradient(rgba(255,255,255,0), #f1f1f1);
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
*overflow: visible;
*display: inline;
*zoom: 1;
}
#goog-wm-sb:hover,
#goog-wm-sb:focus {
border-color: #aaa;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
background-color: #f8f8f8;
}
#goog-wm-qt:hover,
#goog-wm-qt:focus {
border-color: #105cb6;
outline: 0;
color: #222;
}
input::-moz-focus-inner {
padding: 0;
border: 0;
}
</style>
</head>
<body>
<div class="container">
<h1>Not found <span>:(</span></h1>
<p>Sorry, but the page you were trying to view does not exist.</p>
<p>It looks like this was the result of either:</p>
<ul>
<li>a mistyped address</li>
<li>an out-of-date link</li>
</ul>
<script>
var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),GOOG_FIXURL_SITE = location.host;
</script>
<script src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
</div>
</body>
</html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

0
app/images/brick1.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
app/images/edb_brick.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/images/gitlab.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

BIN
app/images/gitweb.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
app/images/observium.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

BIN
app/images/wiki.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

View File

@@ -5,12 +5,6 @@
<title>edb www</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<!-- build:css styles/vendor.css -->
<!-- bower:css -->
<!-- endbower -->
<!-- endbuild -->
<!-- build:css styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
@@ -55,28 +49,43 @@
<div class="container">
<header class="page-header">
<h1>EDB</h1>Kommunikasjonsavdelingen, <a href="http://studentersamfundet.no/">Det Norske Studentersamfund</a>, Chateau Neuf, Oslo
<h1><img src="images/edb_brick.png" class="edb-brick"> EDB</h1>Kommunikasjonsavdelingen, <a href="http://studentersamfundet.no/">Det Norske Studentersamfund</a>, Chateau Neuf, Oslo
</header>
<div class="row">
<div class="col-md-6">
<h3 class="form-link">Interressert i EDB? <a href="#form">meld din interesse!</a></h3>
<div class="col-md-12">
<h3>Kontaktinfo:</h3>
<ul style="list-style-type:none;">
<ul>
<li><a href="mailto:kak-edb@studentersamfundet.no">kak-edb@studentersamfundet.no</a></li>
<li>Leder: Jonas +47 454 80 454</li>
<li>Twitter: <a href="http://twitter.com/KAK_DNS">@KAK_DNS</a></li>
<li>IRC: <a href="irc://irc.oftc.net/edb">#EDB@OFTC</a></li>
<li>IRL: M&oslash;te hver onsdag kl. 18.13.37 p&aring; KAK (<a href="https://viteboka.studentersamfundet.no/4._etasje">4. etg</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>
</ul>
<a href="https://edb.neuf.no/wiki/"><h3>EDBWiki</h3><img src="images/brick1.png" alt="EDB brick" /></a>
<a href="https://mdb.neuf.no/"><h3>MDB</h3><img src="images/mdb.png" alt="MDB" /></a>
<a href="https://brukerinfo.neuf.no/"><h3>Brukerinfo</h3><img src="images/brukerinfo.png" alt="Brukerinfo" /></a>
<a href="http://oliver.neuf.no/"><h3>Oliver - Current track</h3><img src="images/oliver_current.png" alt="Oliver - Current track" /></a>
<a href="http://mbftns.neuf.no/"><h3>MBFTNS</h3><img src="images/mbftns.png" alt="MBFTNS" /></a>
<div class="form-link">
<h3>Interressert i EDB?</h3>
<a href="#form" class="btn btn-primary btn-lg">Meld din interesse!</a>
</div>
</div>
<div class="col-md-6" id="form">
<iframe id="contact_form" src="https://docs.google.com/spreadsheet/embeddedform?formkey=dFZnWGE4NjFTemdvVFYxeWtXMGNKbGc6MQ" width="760" height="917">Loading...</iframe>
<div class="col-md-12">
<h3>Verktøy:</h3>
<ul class="block-grid-xs-2 block-grid-sm-3 block-grid-md-4 projects-list">
<li class="block-grid-item"><a href="https://edb.neuf.no/wiki/"><h4>EDBWiki</h4><img src="images/wiki.png" alt="EDBWiki" /></a></li>
<li class="block-grid-item"><a href="https://mdb.neuf.no/"><h4>MDB</h4><img src="images/mdb.png" alt="MDB" /></a></li>
<li class="block-grid-item"><a href="https://observium.neuf.no/"><h4>Observium</h4><img src="images/observium.png" alt="Observium" /></a></li>
<li class="block-grid-item"><a href="https://brukerinfo.neuf.no/"><h4>Brukerinfo</h4><img src="images/brukerinfo.png" alt="Brukerinfo" /></a></li>
<li class="block-grid-item"><a href="https://aktiv.neuf.no/"><h4>aktiv.neuf.no</h4><img src="images/aktiv.neuf.no.png" alt="aktiv.neuf.no" /></a></li>
<li class="block-grid-item"><a href="http://git.neuf.no/"><h4>git.neuf.no</h4><img src="images/gitweb.png" alt="aktiv.neuf.no" /></a></li>
<li class="block-grid-item"><a href="http://fairchild.neuf.no/"><h4>Gitlab</h4><img src="images/gitlab.png" alt="Gitlab" /></a></li>
</ul>
</div>
<div class="col-md-12" class="join-us-form" id="form">
<h3 class="join-us-title">Bli med</h3>
<iframe id="contact_form" src="https://docs.google.com/spreadsheet/embeddedform?formkey=dFZnWGE4NjFTemdvVFYxeWtXMGNKbGc6MQ" width="440" height="917">Loading...</iframe>
</div>
</div>
<div class="credits-wrap">
<div class="credits">Laget med <span class="love" title="kærlighed"></span> av <a href="http://kak.studentersamfundet.no/" title="Kommunikasjonsavdelingen">KAK</a></div>
</div>
</div>
@@ -90,14 +99,5 @@
ga('create','UA-52914-10');ga('send','pageview');
</script>
<!-- build:js scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js scripts/main.js -->
<script src="scripts/main.js"></script>
<!-- endbuild -->
</body>
</html>

View File

@@ -1 +0,0 @@
console.log('\'Allo \'Allo!');

View File

@@ -0,0 +1,51 @@
// Block Grid
// Technique adapted from Foundation 5 for Bootstrap 3.
// https://github.com/zurb/foundation/blob/f755d8704123f86c281ede0b171881e2672f150d/scss/foundation/components/_block-grid.scss
// Original LESS Version by Christopher Mitchell (https://gist.github.com/ChrisTM)
// Converted to SCSS by Rasmus Jürs (https://github.com/Jursdotme)
[class*="block-grid-"] {
display: block;
margin: -($grid-gutter-width/2);
padding: 0;
@include clearfix();
}
.block-grid-item {
display: inline;
margin: 0;
padding: ($grid-gutter-width/2);
height: auto;
float: left;
list-style: none;
}
@mixin block-grid($per-row) {
& > .block-grid-item {
width: (100%/$per-row);
$nth-equation: #{$per-row}n+'+'+1;
&:nth-of-type(n) { clear: none; }
&:nth-of-type(#{$nth-equation}) { clear: both; }
}
}
@mixin block-grids($size) {
.block-grid-#{$size}-1 { @include block-grid(1); }
.block-grid-#{$size}-2 { @include block-grid(2); }
.block-grid-#{$size}-3 { @include block-grid(3); }
.block-grid-#{$size}-4 { @include block-grid(4); }
.block-grid-#{$size}-5 { @include block-grid(5); }
.block-grid-#{$size}-6 { @include block-grid(6); }
.block-grid-#{$size}-7 { @include block-grid(7); }
.block-grid-#{$size}-8 { @include block-grid(8); }
.block-grid-#{$size}-9 { @include block-grid(9); }
.block-grid-#{$size}-10 { @include block-grid(10); }
.block-grid-#{$size}-11 { @include block-grid(11); }
.block-grid-#{$size}-12 { @include block-grid(12); }
}
@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) }

View File

@@ -4,19 +4,55 @@ $icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/font
@import "../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap.scss";
// endbower
@import "block_grid"; // from foundation 5
.page-header h1 {
line-height: 1;
vertical-align: bottom;
}
.edb-brick {
height: 40px;
width: auto;
}
/* Projects */
.block-grid-item {
padding-bottom: 0;
h3 {
margin-top: 0;
}
img {
max-width: 100%;
}
}
h3 {
font-weight: bold;
}
@media (min-width: 768px) {
.form-link {
display:none;
}
}
.join-us-title {
margin-top: 40px;
margin-bottom: 0px;
}
#contact_form {
border:0;
margin:0;
}
.browsehappy {
margin: 0.2em 0;
background: #ccc;
color: #000;
padding: 0.2em 0;
}
@media (min-width: 768px) {
.form-link {
display:none;
}
}
#contact_form {
border:0;
margin:0;
.love {
color: #faafba;
}
.credits {
margin-top: 25px;
margin-bottom: 25px;
text-align: center;
color: #666;
font-size: 12px;
}