Skip to content

Commit

Permalink
Added a tagline promoting the new smartphone apps
Browse files Browse the repository at this point in the history
  • Loading branch information
mortnod committed Sep 6, 2014
1 parent 8c0cdd0 commit 10a3cd8
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 9 deletions.
4 changes: 3 additions & 1 deletion Gruntfile.js
Expand Up @@ -30,6 +30,7 @@ module.exports = function(grunt) {
'js/build/processed/analytics.js' : 'js/analytics.js',
'js/build/processed/global.js' : 'js/global.js',
'js/build/processed/schedule.js' : 'js/schedule.js',
'js/build/processed/content.js' : 'js/content.js',
}
},
web : {
Expand All @@ -41,6 +42,7 @@ module.exports = function(grunt) {
'js/build/processed/analytics.js' : 'js/analytics.js',
'js/build/processed/global.js' : 'js/global.js',
'js/build/processed/schedule.js' : 'js/schedule.js',
'js/build/processed/content.js' : 'js/content.js',
}
}
},
Expand All @@ -55,7 +57,7 @@ module.exports = function(grunt) {
'js/templates.js',
'js/card.js',
'js/modal.js',
'js/content.js',
'js/build/processed/content.js',
'js/build/processed/schedule.js',
'js/build/processed/analytics.js',
'js/header.js',
Expand Down
5 changes: 0 additions & 5 deletions css/_modal.scss
Expand Up @@ -61,11 +61,6 @@
margin-left: 20px;
}

a {
text-decoration: none;
color: rgb(170, 16, 16);
}

p {
margin-bottom: 10px;

Expand Down
5 changes: 5 additions & 0 deletions css/_typography.scss
Expand Up @@ -11,6 +11,11 @@ h2 {
font-size: 1.9em;
}

a {
color: rgb(170, 16, 16);
text-decoration: none;
}

.front {
h2 {
color: rgba(black, 0.8);
Expand Down
2 changes: 2 additions & 0 deletions js/analytics.js
Expand Up @@ -112,6 +112,8 @@ var Analytics = {
this.outboundEvent('Modal', 'Visual Basic (built with)', '#track-vb');

this.outboundEvent('Other Links', 'mvn.no', '#track-mvn');
this.outboundEvent('Other Links', 'Download app (Android)', '#track-android');
this.outboundEvent('Other Links', 'Download app (iOS)', '#track-ios');
this.outboundEvent('Other Links', 'https://innsida.ntnu.no/wiki/-/wiki/Norsk/Programfarm', '#track-farm-extra');
this.outboundEvent('Other Links', 'http://www.ntnu.no/studieinformasjon/rom/', '#track-romres-extra');
this.outboundEvent('Other Links', 'https://innsida.ntnu.no/wiki/-/wiki/Norsk/Slik+bruker+du+webmail#section-Slik+bruker+du+webmail-Videresende+epost+til+andre+kontoer', '#track-email-extra');
Expand Down
9 changes: 6 additions & 3 deletions js/content.js
Expand Up @@ -76,6 +76,11 @@ var data = {
],

taglines: [
// @if ENV='web'
{
tagline: 'Har du mobil? Er den smart? Last ned appen til <a href="https://itunes.apple.com/no/app/instabart/id903592925?mt=8" id="track-ios">iOS</a> og <a href="https://play.google.com/store/apps/details?id=com.mvn.instabart" id="track-android">Android</a>!'
},
// @endif
{
tagline: "Kjekke NTNU-tjenester. Umiddel<strong>bart</strong>."
}, {
Expand All @@ -88,8 +93,6 @@ var data = {
tagline: "La barten bane vei i NTNUs frodige IT-jungel!"
}, {
tagline: "NTNUs IT-tjenester? Gotta know 'em all!"
}//, {
// tagline: "Forskning viser at NTNU-studenter flest bare vet om halvbarten av disse tjenestene"
// }
}
]
};

0 comments on commit 10a3cd8

Please sign in to comment.