Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
caa7c22
Delete CNAME
Oct 13, 2014
4365e2d
Add navbar. Initial try
Oct 14, 2014
8808013
Try to add flags to navbar
Oct 14, 2014
92d078c
Another try at flags in navbar
Oct 14, 2014
47ca5af
Add navbar to english page
Oct 14, 2014
6560bee
Remove extraneous header with flags
Oct 14, 2014
ce806d6
Add norwegian consultants html file
Oct 14, 2014
bff900c
Change index files to point to consultants and references
Oct 14, 2014
976d1a0
Add english consultants and both reference files
Oct 14, 2014
88ebc72
Change expert.analytics links in english pages
Oct 14, 2014
b62e603
Add dummy text to consultants pages
Oct 14, 2014
22d6bcb
Try adding headline to paragraph
Oct 14, 2014
a098bdd
Remove row class from text
Oct 14, 2014
7547c35
Remove grid specifications as well
Oct 14, 2014
c40b667
Debug
Oct 14, 2014
fce225c
Another debug
Oct 14, 2014
8d1662a
Another debug
Oct 14, 2014
2510777
Testing
Oct 14, 2014
87987ac
Test
Oct 14, 2014
b4022d2
Change body padding for large displays
Oct 14, 2014
973f5ae
Change max-width to min-width
Oct 14, 2014
d61e4e2
Another modification
Oct 14, 2014
a5a3ba0
Add wrap div tag to references pages
Oct 14, 2014
cdbc584
Add dummy text to all pages
Oct 14, 2014
223e1b9
Make padding not size dependent
Oct 14, 2014
58223a8
Change padding-top to only be true for body
Oct 14, 2014
190f02c
Add experimental stuff to consultants page
Oct 14, 2014
ebb72a9
Add info on Ola as well
Oct 14, 2014
0566f5a
Try to standardize picture size
Oct 14, 2014
4ea9648
Test another image class for the pictures
Oct 14, 2014
974feca
Add carousel example
Oct 15, 2014
448cef6
Test
Oct 15, 2014
4f302d1
Debug
Oct 15, 2014
90be898
Test
Oct 15, 2014
0234de1
Test
Oct 15, 2014
7c1dad0
Test
Oct 15, 2014
8b08499
Test
Oct 15, 2014
891bf4a
Test
Oct 15, 2014
c35114f
Test whether having carousel on top looks nice
Oct 15, 2014
22bc87b
Revert switching, add real pics
Oct 15, 2014
bb7979e
Debug: Pic of Ola wrong path
Oct 15, 2014
b334d57
Try to make carousel link to pages
Oct 15, 2014
f70a4af
Add rest of links to carousel
Oct 15, 2014
099616b
Fiddle with image sizes - too small on mobile
Oct 15, 2014
4c4cd3d
Another fiddling to make image look good
Oct 15, 2014
87e296a
More fiddling
Oct 15, 2014
a0945f1
yet more fiddling
Oct 15, 2014
8e29b1a
Attempt to fix too small footer on mobile
Oct 15, 2014
e9a6da7
Experiment with carousel width
Oct 15, 2014
f51ce42
More experimentation
Oct 15, 2014
15be9d9
Debug
Oct 15, 2014
ec4d215
Add other placeholder images again
eirikgje Oct 15, 2014
ee483ba
First test with xal logo in the navbar
eirikgje Oct 15, 2014
aec207e
Try to make image right size
eirikgje Oct 15, 2014
24382c5
Test
eirikgje Oct 15, 2014
9c643fe
Test
eirikgje Oct 15, 2014
c3817cc
Add transparent logo
eirikgje Oct 15, 2014
94bdd2d
Add small version of logo
eirikgje Oct 15, 2014
94127db
Try another way to shrink image
eirikgje Oct 15, 2014
936febb
Debug
eirikgje Oct 15, 2014
713d853
Another debug
eirikgje Oct 15, 2014
e826d4e
Add cropped picture; remove main logo
eirikgje Oct 15, 2014
3846cc0
Try to remove padding and more decisively remove main xal logo
eirikgje Oct 15, 2014
3cd14ac
Second attempt to remove padding
eirikgje Oct 15, 2014
e97d8fd
Another attempt at removing padding
eirikgje Oct 15, 2014
20dacbe
Debug
eirikgje Oct 15, 2014
11cb2f9
Debug
eirikgje Oct 15, 2014
9b920f0
Another attempt to make navbar fit logo
eirikgje Oct 15, 2014
65b0f77
Change top padding because of larger navbar
eirikgje Oct 15, 2014
ada46c3
Add overlay to norwegian flag
eirikgje Oct 15, 2014
06fd92a
Debug
eirikgje Oct 15, 2014
4c5770e
Reduce padding in overlay-flag
eirikgje Oct 15, 2014
116bec3
Debug
eirikgje Oct 15, 2014
27b8342
Debug
eirikgje Oct 15, 2014
403f72c
Debug
eirikgje Oct 15, 2014
63cc421
Debug
eirikgje Oct 15, 2014
7805627
Debug
eirikgje Oct 15, 2014
6b87bd2
Debug
eirikgje Oct 15, 2014
feffe3e
Debug
eirikgje Oct 15, 2014
5a33353
Debug
eirikgje Oct 15, 2014
8952868
Debug
eirikgje Oct 15, 2014
06b9ac0
Debug
eirikgje Oct 15, 2014
800ff2a
Debug
eirikgje Oct 15, 2014
03cb90e
Debug
eirikgje Oct 15, 2014
1d0c545
Debug
eirikgje Oct 15, 2014
c6ce4e9
Debug
eirikgje Oct 15, 2014
06f0fcc
Update english page with carousel and changes
eirikgje Oct 15, 2014
230d1fe
Update all pages with changes
eirikgje Oct 15, 2014
3bf5fd3
Experiment with padding
eirikgje Oct 15, 2014
35d4c59
Let body padding be 85 pixels at top
eirikgje Oct 15, 2014
19c37f5
Experiment with logo in slides
eirikgje Oct 15, 2014
5ff463b
First attempt at making better body text on landing page
eirikgje Oct 16, 2014
a294ffe
Add glyphicons and center text
eirikgje Oct 16, 2014
f934ddb
Center glyphicons and make bigger
eirikgje Oct 16, 2014
d1458c4
Last attempt didn't center glyphicons
eirikgje Oct 16, 2014
47e2fae
Attempt to make wells equal height
eirikgje Oct 16, 2014
1142b47
Cosmetic changes to the wells
eirikgje Oct 16, 2014
9b5b999
Debug
eirikgje Oct 16, 2014
6830aab
Removed superfluous large display contingency
eirikgje Oct 16, 2014
0ae96e2
Debug
eirikgje Oct 16, 2014
93da5df
Debug
eirikgje Oct 16, 2014
91b4739
Debug
eirikgje Oct 16, 2014
5b4b20b
Debug
eirikgje Oct 16, 2014
e6cdc00
Debug
eirikgje Oct 16, 2014
9e1f033
Debug
eirikgje Oct 16, 2014
ec22379
Debug
eirikgje Oct 16, 2014
c60329a
Try without wells
eirikgje Oct 16, 2014
77c1088
Debug
eirikgje Oct 16, 2014
f54d54d
Center all text
eirikgje Oct 16, 2014
8b8aa10
Try to center-align facebook
eirikgje Oct 16, 2014
929c2f9
Debug
eirikgje Oct 16, 2014
c0a1385
Debug
eirikgje Oct 16, 2014
79f8824
Debug
eirikgje Oct 16, 2014
55cb25f
Debug
eirikgje Oct 16, 2014
d626ce9
Debug
eirikgje Oct 16, 2014
13e5ff4
Debug
eirikgje Oct 16, 2014
8567271
Debug
eirikgje Oct 16, 2014
b862bd7
Debug
eirikgje Oct 16, 2014
4d1a986
Debug
eirikgje Oct 16, 2014
607515b
Experimenting with rows
eirikgje Oct 16, 2014
ec1f625
Add logo that fits with slideshow
eirikgje Oct 16, 2014
2275c82
Debug
eirikgje Oct 16, 2014
38cc00c
Add 1900x1080 logo, since that's easier to scale
eirikgje Oct 16, 2014
8b2c93a
Wrong image
eirikgje Oct 16, 2014
fe90f4b
Add Mcash scaled logo.. looks weird
eirikgje Oct 16, 2014
a34d025
Debug
eirikgje Oct 16, 2014
ce5ed82
Fix some links
eirikgje Oct 16, 2014
0e4746b
Change header text of landing page
eirikgje Oct 16, 2014
5e26937
Change carousel font color
eirikgje Oct 16, 2014
aa0f064
Change mcash-caption
eirikgje Oct 16, 2014
36d6bc3
Remove grey area in carousel edges
eirikgje Oct 17, 2014
ff2d804
Debug
eirikgje Oct 17, 2014
0d1a9b5
Debug
eirikgje Oct 17, 2014
108adfd
Debug
eirikgje Oct 17, 2014
29b4c09
Debug
eirikgje Oct 17, 2014
84a0cd6
Remove XAL caption
eirikgje Oct 17, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CNAME

This file was deleted.

81 changes: 81 additions & 0 deletions consultants.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- use a font from google fonts -->
<link href='http://fonts.googleapis.com/css?family=Noto+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- bootstrap -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-wip/css/bootstrap.min.css">
<link href="css/xal.css" rel="stylesheet" type="text/css">
<title>[expert . analytics]</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
</head>
<body>

<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index_en.html"><img height="50px" src="graphics/logo_transparent_cropped.png"></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="index_en.html">Home</a></li>
<li class="active"><a href="consultants.html">Consultants</a></li>
<li><a href="references.html">References</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="konsulenter.html"><img src="graphics/no.png" alt="NO"/></a></li>
<li><a href="consultants.html"><img src="graphics/gb.png" alt="EN" style="border:2px solid #666; padding:1px"/></a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
<div id="wrap"><!-- wrap page to move footer down -->
<div class="container">
<div class="jumbotron">
<h1>Our consultants</h1>
<p>Ipsum totam ullam hic fuga vitae perferendis. A praesentium eos architecto cumque alias incidunt. Dolores ipsa iste atque maiores dicta deleniti. Illum quas laboriosam cumque ex sit dolorum soluta. Autem!</p>
</div>
</div> <!-- /.container -->
</div>

<div id="footer">
<div class="container">
<p class="text-muted credit">Expert Analytics AS | P.O.box 134, 1325 Lysaker, Norway | Org.nr 912
208 559. &mdash; A spin-out company from <a
href="http://simula.no">Simula Research Laboratory</a></p>
</div><!-- /.container -->
</div><!-- /#footer -->

<!-- Include jQuery (needed for bootstrap and other goodies) -->
<script src="//code.jquery.com/jquery.js"></script>
<!-- boostrap javascript -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0-wip/js/bootstrap.min.js"></script>

<!-- google analytics tracking -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-85255-7', 'expertanalytics.no');
ga('send', 'pageview');

(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-48679357-1', 'xal.no');
ga('send', 'pageview');
</script>
</body>
</html>
82 changes: 76 additions & 6 deletions css/xal.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,20 @@ body {
/* The html and body elements cannot have any padding or margin */
}

body{
padding-top: 85px;
}

IMG.displayed {
display: block;
margin-left: auto;
margin-right: auto;
text-align: center;
padding: 40px 15px;
max-width: 30%;
max-width: 30%;
}


IMG.small-display {
display: inline;
margin-left: auto;
Expand All @@ -24,15 +29,15 @@ IMG.small-display {
}

/* Overlay to grey out inactive flags */
#overlay-flag {
/*#overlay-flag {
display: inline;
}
}*/

#overlay-flag img {
padding: 1px;
/*#overlay-flag img {
border: 2px solid #666;
padding: 1px;
margin 1px;
}
}*/

/* Wrapper for page content to push down footer */
#wrap {
Expand All @@ -52,13 +57,76 @@ IMG.small-display {
background-color: #000000;
}

.carousel {
margin: 0 auto;
margin-bottom: 60px;
width: 700px;
}

.carousel-caption {
color: black;
}

.carousel-indicators li {
background-color: #ffffff;
}

.carousel-indicators .active {
background-color: #ffffff;
}

.carousel-control.left {
background-image: none;
}

.carousel-control.right {
background-image: none;
}

.navbar-nav li a {
line-height: 50px;
}


.well-fill {
margin-bottom: -99999px;
padding-bottom: 99999px;
}

.col-fill {
margin-bottom: -99999px;
padding-bottom: 99999px;
}

.col-wrap {
overflow: hidden;
}
/*.navbar-brand {
position: absolute;
left: 0px;
top: 0px;
width: 50px;
margin-left: 0px;
margin-top: 0px;
padding-top: 0px;
} */

/* Responsive fixes as necessary */
@media (max-width: 767px) {
#footer {
margin-left: -20px;
margin-right: -20px;
padding-left: 20px;
padding-right: 20px;
height: 90px;
}

IMG.displayed {
max-width: 100%;
}

.carousel {
width: 100%
}
}

Expand All @@ -84,3 +152,5 @@ IMG.small-display {
margin-top: 10px;
margin-right: 10px;
}


Binary file added graphics/asmund.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/logo_mcash_1900x1080.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/logo_notext_1900x1080.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/logo_notext_700x400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/logo_transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/logo_transparent_45px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/logo_transparent_cropped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/ola.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading