Adds twitter account, update build deps

This commit is contained in:
Nikolai Kristiansen
2015-11-25 22:24:52 +01:00
parent 97740d30bf
commit 02e0e77fe7
8 changed files with 62 additions and 67 deletions

2
dist/index.html vendored
View File

@@ -57,7 +57,7 @@
<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>
<li>Twitter: <a href="http://twitter.com/edbgjengen">@edbgjengen</a> eller <a href="http://twitter.com/KAK_DNS">@KAK_DNS</a></li>
</ul>
<div class="form-link">

72
dist/styles/main.css vendored
View File

@@ -1,11 +1,17 @@
@charset "UTF-8";
/*!
* Bootstrap v3.3.5 (http://getbootstrap.com)
* Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
img {
border: 0;
}
body {
margin: 0;
}
@@ -14,8 +20,6 @@ html {
font-family: sans-serif;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
font-size: 10px;
-webkit-tap-highlight-color: transparent;
}
header {
@@ -36,7 +40,6 @@ h1 {
}
img {
border: 0;
vertical-align: middle;
}
@@ -89,16 +92,16 @@ input::-moz-focus-inner {
}
}
body {
background-color: #fff;
}
.btn,
.btn-primary:active,
.btn:active {
background-image: none;
}
body {
background-color: #fff;
}
@font-face {
font-family: 'Glyphicons Halflings';
src: url(../bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot);
@@ -111,6 +114,11 @@ body {
box-sizing: border-box;
}
html {
font-size: 10px;
-webkit-tap-highlight-color: transparent;
}
body {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 14px;
@@ -167,10 +175,6 @@ h4 {
font-size: 18px;
}
.btn {
text-align: center;
}
.page-header {
padding-bottom: 9px;
margin: 40px 0 20px;
@@ -185,36 +189,36 @@ ul {
margin-bottom: 10px;
}
@media (min-width:768px) {
.container {
width: 750px;
}
}
.container:after,
.row:after,
[class*=block-grid-]:after {
clear: both;
}
.container:after,
.container:before,
.row:after,
.row:before {
display: table;
content: " ";
}
.container {
margin-right: auto;
margin-left: auto;
}
.container:after,
.container:before,
.row:after,
.row:before {
content: " ";
display: table;
}
.container {
padding-left: 15px;
padding-right: 15px;
}
@media (min-width:768px) {
.container {
width: 750px;
}
}
@media (min-width:992px) {
.container {
width: 970px;
@@ -258,10 +262,16 @@ ul {
color: #999;
}
.form-control::-ms-expand {
border: 0;
background-color: transparent;
}
.btn {
display: inline-block;
margin-bottom: 0;
font-weight: 400;
text-align: center;
vertical-align: middle;
touch-action: manipulation;
cursor: pointer;
@@ -381,6 +391,10 @@ ul {
.block-grid-sm-3>.block-grid-item:nth-of-type(3n+1) {
clear: both;
}
.form-link {
display: none;
}
}
@media (min-width:992px) {
@@ -414,12 +428,6 @@ h3 {
font-weight: 700;
}
@media (min-width:768px) {
.form-link {
display: none;
}
}
.join-us-title {
margin-top: 40px;
margin-bottom: 0;