From 85a9641af03c288fea466ba2d2abf170abfd3aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20H=C3=A4gg?= Date: Fri, 11 Sep 2015 14:58:35 +0200 Subject: [PATCH] fuck --- .../pages/services/entertainment.dust | 175 +++++++++--------- src/sass/_content.scss | 16 +- src/sass/_layout.scss | 11 +- 3 files changed, 98 insertions(+), 104 deletions(-) diff --git a/server/templates/pages/services/entertainment.dust b/server/templates/pages/services/entertainment.dust index 118abee..962072f 100644 --- a/server/templates/pages/services/entertainment.dust +++ b/server/templates/pages/services/entertainment.dust @@ -20,96 +20,97 @@

There are many different elements that make for great entertainment. Our expertise in perfectly matching the correct level of technology to the application leaves you with a personalised, unique setup that you’ll never want to turn off. Have a look at what we do below.

-
-
-
-

Audio Visual

-

From high fidelity audio to Ultra HD video, our team have a wealth of experience in supplying, installing and supporting the very best whole-home audio visual systems on the market. Ease of operation is an integral part of every setup, whilst maintaining a clean and unobtrusive design that will allow you to experience music and film exactly as the creators intended.

-
-
-

Audio Visual

-

Like you've never seen it before

-
+
+
+
+

Audio Visual

+

From high fidelity audio to Ultra HD video, our team have a wealth of experience in supplying, installing and supporting the very best whole-home audio visual systems on the market. Ease of operation is an integral part of every setup, whilst maintaining a clean and unobtrusive design that will allow you to experience music and film exactly as the creators intended.

-
-
-

Multiroom Audio

-

The ability to move freely around your home whilst listening to your favourite music is a fantastic addition to any property. Seamless incorporation of audio equipment with wireless functionality provides a refined listening experience that’s extremely simple to use, and enjoyable to share with friends and family.

-
-
-

Multiroom Audio

-

Your music, all around your home

-
+
+

Audio Visual

+

Like you've never seen it before

-
-
-

Media

-

The things we watch, listen to and share with friends and family define personal entertainment. We believe that these things should be available all the time and everywhere you go, and as such, develop our media distribution systems to present your favourite digital content, all around your home, at the touch of a button.

-
-
-

Media

-

Access your favourite content, everywhere

-
-
-
-
-

Bespoke Design

-

All of our entertainment services require detailed custom planning and support, but if you have something extraordinary in mind, we can work with you to make this a reality, the only limit is your imagination. Delivery has to be met with perfection, minimising spatial presence and maximising user enjoyment.

-
-
-

Bespoke Design

-

Customised to perfection

-
-
-
-
-

Cinema

-

Our immersive media rooms combine awe-inspiring visuals with breathtaking audio to make sure you see every detail and feel every moment. By working with the finest suppliers of cinema equipment, perfectly suited to your budget, our team can deliver a system that not only impresses, but defies belief.

-
-
-

Cinema

-

Ultra-HD is just the beginning

-
-
-
-
-

Control

-

Technology is only as useful as it is usable, and even complex systems can be intricately designed so that front-end control is simple and user-friendly. We offer varying levels of control with our entertainment setups and can supply you with a fully programmed ‘Smart Control’ or replace conventional remotes with dedicated app support, empowering your smartphone or tablet.

-
-
-

Control

-

Simple, yet powerful

-
-
-
-
-

Click any of the categories above

-
-
-

Audio Visual

-

From high fidelity audio to Ultra HD video, our team have a wealth of experience in supplying, installing and supporting the very best whole-home audio visual systems on the market. Ease of operation is an integral part of every setup, whilst maintaining a clean and unobtrusive design that will allow you to experience music and film exactly as the creators intended.

-
-
-

Multiroom Audio

-

The ability to move freely around your home whilst listening to your favourite music is a fantastic addition to any property. Seamless incorporation of audio equipment with wireless functionality provides a refined listening experience that’s extremely simple to use, and enjoyable to share with friends and family.

-
-
-

Media

-

The things we watch, listen to and share with friends and family define personal entertainment. We believe that these things should be available all the time and everywhere you go, and as such, develop our media distribution systems to present your favourite digital content, all around your home, at the touch of a button.

-
-
-

Bespoke Design

-

All of our entertainment services require detailed custom planning and support, but if you have something extraordinary in mind, we can work with you to make this a reality, the only limit is your imagination. Delivery has to be met with perfection, minimising spatial presence and maximising user enjoyment.

-
-
-

Cinema

-

Our immersive media rooms combine awe-inspiring visuals with breathtaking audio to make sure you see every detail and feel every moment. By working with the finest suppliers of cinema equipment, perfectly suited to your budget, our team can deliver a system that not only impresses, but defies belief.

-
-
-

Control

-

Technology is only as useful as it is usable, and even complex systems can be intricately designed so that front-end control is simple and user-friendly. We offer varying levels of control with our entertainment setups and can supply you with a fully programmed ‘Smart Control’ or replace conventional remotes with dedicated app support, empowering your smartphone or tablet.

-
+
+
+

Multiroom Audio

+

The ability to move freely around your home whilst listening to your favourite music is a fantastic addition to any property. Seamless incorporation of audio equipment with wireless functionality provides a refined listening experience that’s extremely simple to use, and enjoyable to share with friends and family.

+
+
+

Multiroom Audio

+

Your music, all around your home

+
+
+
+
+

Media

+

The things we watch, listen to and share with friends and family define personal entertainment. We believe that these things should be available all the time and everywhere you go, and as such, develop our media distribution systems to present your favourite digital content, all around your home, at the touch of a button.

+
+
+

Media

+

Access your favourite content, everywhere

+
+
+
+
+

Bespoke Design

+

All of our entertainment services require detailed custom planning and support, but if you have something extraordinary in mind, we can work with you to make this a reality, the only limit is your imagination. Delivery has to be met with perfection, minimising spatial presence and maximising user enjoyment.

+
+
+

Bespoke Design

+

Customised to perfection

+
+
+
+
+

Cinema

+

Our immersive media rooms combine awe-inspiring visuals with breathtaking audio to make sure you see every detail and feel every moment. By working with the finest suppliers of cinema equipment, perfectly suited to your budget, our team can deliver a system that not only impresses, but defies belief.

+
+
+

Cinema

+

Ultra-HD is just the beginning

+
+
+
+
+

Control

+

Technology is only as useful as it is usable, and even complex systems can be intricately designed so that front-end control is simple and user-friendly. We offer varying levels of control with our entertainment setups and can supply you with a fully programmed ‘Smart Control’ or replace conventional remotes with dedicated app support, empowering your smartphone or tablet.

+
+
+

Control

+

Simple, yet powerful

+
+
+
+
+

Click any of the categories above

+
+
+

Audio Visual

+

From high fidelity audio to Ultra HD video, our team have a wealth of experience in supplying, installing and supporting the very best whole-home audio visual systems on the market. Ease of operation is an integral part of every setup, whilst maintaining a clean and unobtrusive design that will allow you to experience music and film exactly as the creators intended.

+
+
+

Multiroom Audio

+

The ability to move freely around your home whilst listening to your favourite music is a fantastic addition to any property. Seamless incorporation of audio equipment with wireless functionality provides a refined listening experience that’s extremely simple to use, and enjoyable to share with friends and family.

+
+
+

Media

+

The things we watch, listen to and share with friends and family define personal entertainment. We believe that these things should be available all the time and everywhere you go, and as such, develop our media distribution systems to present your favourite digital content, all around your home, at the touch of a button.

+
+
+

Bespoke Design

+

All of our entertainment services require detailed custom planning and support, but if you have something extraordinary in mind, we can work with you to make this a reality, the only limit is your imagination. Delivery has to be met with perfection, minimising spatial presence and maximising user enjoyment.

+
+
+

Cinema

+

Our immersive media rooms combine awe-inspiring visuals with breathtaking audio to make sure you see every detail and feel every moment. By working with the finest suppliers of cinema equipment, perfectly suited to your budget, our team can deliver a system that not only impresses, but defies belief.

+
+
+

Control

+

Technology is only as useful as it is usable, and even complex systems can be intricately designed so that front-end control is simple and user-friendly. We offer varying levels of control with our entertainment setups and can supply you with a fully programmed ‘Smart Control’ or replace conventional remotes with dedicated app support, empowering your smartphone or tablet.

+
+
+
diff --git a/src/sass/_content.scss b/src/sass/_content.scss index b8a51fc..cbb5cf6 100644 --- a/src/sass/_content.scss +++ b/src/sass/_content.scss @@ -8,7 +8,7 @@ background:$transblack; min-height:500px; height:100%; - height:calc(100% - 150px); + height:calc(100% - 60px); .set-btm{ width:100%; text-align: right; @@ -116,7 +116,6 @@ } .page.services { - overflow-x:visible; h1 { text-align:center; text-transform: uppercase; @@ -171,12 +170,13 @@ * { color:$softwhite; } .splash { - height:105vh; - min-height:500px; + top:0; + height:100%; + min-height:600px; width:100%; position:fixed; z-index:1; - @media all and(max-height:500px){ + @media (pointer:coarse){ position:absolute; } .splash-text { @@ -192,7 +192,7 @@ } } .splashspacer{ - height:105vh; + height:90%; min-height:500px; width:100%; } @@ -407,7 +407,7 @@ @include backgrounder("services-integration-splash", "jpg", "top/cover no-repeat"); } .ff {min-height:450px;} - .ff1 {background:url(/img/ff1.jpg) no-repeat center/cover;} + .ff1 {background:url(/img/ff1.jpg) no-repeat right/cover;} .ff2 { background:$softwhite; padding:5%; @@ -448,7 +448,7 @@ } .security { .splash { - @include backgrounder("services-security-splash", "jpg", "top/cover no-repeat"); + @include backgrounder("services-security-splash", "jpg", "top left/cover no-repeat"); } .hover-p{ .hover-for-p { diff --git a/src/sass/_layout.scss b/src/sass/_layout.scss index fb8ba3b..a182c02 100644 --- a/src/sass/_layout.scss +++ b/src/sass/_layout.scss @@ -94,11 +94,11 @@ html { &.snap-top-static.hidden { opacity:0; } + display:none; } //Header header { - position:absolute; top:0; @media all and(min-height:900px){ position:fixed; @@ -108,7 +108,6 @@ header { background:$softblack; width:100%; height:60px; - display:inline-block; padding-right:3%; padding-left:3%; z-index:10; @@ -235,9 +234,8 @@ header { //Default body styles -html,body{position:absolute; min-height:110vh;width:100%;} +html,body{height:100%;width:100%;position:relative;} body { - overflow-x: hidden; overflow-y: scroll; > main { overflow-x: hidden; @@ -245,13 +243,8 @@ body { width: 100%; min-height: 100%; min-height: calc(100% - 60px); - min-height:110vh; - margin: -7px auto; > .page { position:absolute; - &:not(.servicepage) { - margin-top:60px; - } @media all and(min-height:900px){ margin-top:60px; }