Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.

Commit

Permalink
Revert "Various changes"
Browse files Browse the repository at this point in the history
  • Loading branch information
Celia Collins authored Mar 28, 2019
1 parent f98f20e commit 56030a3
Show file tree
Hide file tree
Showing 488 changed files with 1,588 additions and 1,509 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ Active reloading is configured, so the server will listen for changes and refres

Using [BrowserStack](https://www.browserstack.com) for compatibility testing

## Adding to the 'team' page
## Adding to the 'people' page

Upload caricatures at a size at or near to (212px * 425px), with a transparent background. This can be done with e.g. the Mac Preview app.

## Removing an employee from the site

Use `ruby 'lib/remove_person.rb'` to start a script to remove an employee from the team page and their links across the site.
Use `ruby 'lib/remove_person.rb'` to start a script to remove an employee from the people page and their links across the site.

## Blog CSS Features

Expand All @@ -71,7 +71,7 @@ appended onto the filename (E.g macbook.jpg and [email protected]). The
retina version should be twice the size of the non-retina version. See
[style guide](https://unboxed.co/style-guide) for image resolutions.

Whenever possible, you should use Photoshop or GIMP to resize images.
Whenever possible, you should use Photoshop or GIMP to resize images.
Alternatively, Apple Preview can be used with decent results
(go to `Tools > Adjust size` and select desired size in pixels).

Expand Down
2 changes: 1 addition & 1 deletion data/_redirects
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/blog/author /blog
/team/* /team#:splat
/people/* /people#:splat
/case-studies/* /product-stories
/project-stories/* /product-stories/:splat
/about-us /contact
Expand Down
16 changes: 8 additions & 8 deletions data/whitepapers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
- Innovation can be a tough nut to crack, if your organisation has a largely traditional mindset. Ideas for new market-changing products very rarely gather enough momentum to be anything more than just great ideas. Explore the steps that your digital or product team can take to kickstart this journey to innovation through digital transformation.
authors:
- name: "Boris Divjak"
image: "/assets/images/team/boris-divjak.png"
profile: "/team/#boris-divjak"
image: "/assets/images/people/boris-divjak.png"
profile: "/people/#boris-divjak"
- name: "Graeme McCubbin"
image: "/assets/images/team/graeme-mccubbin.png"
profile: "/team/#graeme-mccubbin"
image: "/assets/images/people/graeme-mccubbin.png"
profile: "/people/#graeme-mccubbin"
thumbnail_image: "/thoughts/whitepapers/kickstarting-innovation.jpg"

- title: "Roundtable: Digital technology within healthcare"
Expand All @@ -19,9 +19,9 @@
- From bionic eyes to lab-grown bones, healthcare innovation is advancing exponentially. Digital technology is too – but not so much in healthcare. This report summarises our digital healthcare roundtable session, used to explore how digital technology can benefit healthcare in the modern world, featuring talks and discussions from industry leaders.
authors:
- name: "Carrie Bedingfield"
image: "/assets/images/team/carrie-bedingfield.png"
profile: "/team/#carrie-bedingfield"
image: "/assets/images/people/carrie-bedingfield.png"
profile: "/people/#carrie-bedingfield"
- name: "Graeme McCubbin"
image: "/assets/images/team/graeme-mccubbin.png"
profile: "/team/#graeme-mccubbin"
image: "/assets/images/people/graeme-mccubbin.png"
profile: "/people/#graeme-mccubbin"
thumbnail_image: "/thoughts/whitepapers/digital-healthcare.jpg"
10 changes: 0 additions & 10 deletions lib/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,6 @@ def site_nav_link(link_text, href, options = {})
link_to(link_text, href, options)
end

def page_content_css_class(current_url)
case current_url
when '/news/'
'--news-article'
when '/the-unboxed-way/unboxed-principles/'
'--unboxed-principles'
end
# puts current_url
end

def is_matching_link?(href, current_url)
href == current_url.match(/^(\/[^\/]*).*$/)[1]
end
Expand Down
4 changes: 0 additions & 4 deletions source/_showcase_tiles_section.erb
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,4 @@
<% end %>
</div>
<% end %>

<div class="product-stories">
<%= link_to 'See Product stories', '/product-stories', class: 'service__button' %>
</div>
</section>
3 changes: 0 additions & 3 deletions source/_site_footer.erb
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@
<a class="social-icon__icon-container--github-reversed" href="https://github.com/unboxed" target="_blank">
<%= image_tag 'social-icon__github-reversed.png', class: 'social-icon__icon', alt: 'GitHub' %>
</a>
<a class="social-icon__icon-container--vimeo" href="https://vimeo.com/ubxd" target="_blank">
<%= image_tag 'social-icon__vimeo.png', class: 'social-icon__icon', alt: 'Vimeo' %>
</a>
</div>
</div>
<script>
Expand Down
Binary file removed source/assets/images/homepage/unboxed_web_cta.jpg
Binary file not shown.
File renamed without changes
File renamed without changes
Binary file removed source/assets/images/prose/unboxed_principles.jpg
Diff not rendered.
Binary file removed source/assets/images/prose/unboxed_principles.png
Diff not rendered.
Binary file removed source/assets/images/social-icon__vimeo.png
Diff not rendered.
Binary file modified source/assets/images/unboxed-logo.png
Binary file added source/assets/images/[email protected]
22 changes: 0 additions & 22 deletions source/assets/stylesheets/styles/_call_to_action_section.scss

This file was deleted.

155 changes: 155 additions & 0 deletions source/assets/stylesheets/styles/_homepage_contact_form.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
.homepage-contact-form {
margin-top: 16px;

@include breakpoint($tablet-breakpoint) {
@include flexbox;
@include flex-direction(column);
@include flex-grow(1);
position: relative;
margin-top: 2vw;
}

@include breakpoint($desktop-breakpoint) {
margin-top: 20px;
}
}

.homepage-contact-form__to-disabled-input {
@include responsive-text;
border-bottom: 1px solid darken($light-gray, 10%);
border-top: 1px solid darken($light-gray, 10%);
display: block;
font-weight: 300;
line-height: 1.3;
padding: 10px 0;

&:before {
color: darken($light-gray, 10%);
content: "To: ";
}

&:after {
color: #C0C0C0;
content: attr(data-to);
}
}

.homepage-contact-form__send-button {
@include responsive-text;
@extend .button;
background-color: $white;
background: none;
border: 1px solid $purple;
color: $purple;
width: 100%;
padding: 10px 20px;
margin-top: 10px;
display: block;

&:focus,
&:hover {
background-color: $purple;
color: $white;
outline: 0;
}

&::-moz-focus-inner {
padding: 0;
border: 0;
}

@include breakpoint($tablet-breakpoint) {
position: absolute;
right: 0;
top: 0;
width: auto;
margin: 0;
}
}

.homepage-contact-form__email-input {
@include responsive-text;
-webkit-appearance: none;
appearance: none;
border-bottom: 1px solid darken($light-gray, 10%);
border-left: 0;
border-radius: 0;
border-right: 0;
border-top: 0;
color: $black;
display: block;
font-family: inherit;
font-weight: 300;
line-height: 1.3;
padding: 10px 0;
width: 100%;

&:focus {
background-color: mix($white, $light-gray);
outline: 0;
}

&.placeholder {
color: #C0C0C0;
}

&.error {
background-color: mix($white, $purple, 90%);
}
}

.homepage-contact-form__body {
text-align: right;
}

.homepage-contact-form__message-input {
@include responsive-text;
border-radius: 0;
border: 0;
color: $black;
display: block;
font-family: inherit;
font-weight: 300;
height: 5em;
line-height: 1.3;
min-height: 48px;
padding: 10px 0 0;
resize: none;
vertical-align: top;
width: 100%;

&:focus {
background-color: mix($white, $light-gray);
outline: 0;
}

&.placeholder {
color: #C0C0C0;
}

&.error {
background-color: mix($white, $purple, 90%);
}

@include breakpoint($tablet-breakpoint) {
@include flex-grow(1);
height: auto;
}
}

.homepage-contact-form__acknowledgement {
color: $purple;
display: none;
font-size: 1em;
font-weight: 300;
padding-top: 16px;

@include breakpoint($tablet-breakpoint) {
font-size: 0.9em;
padding-top: 6px;
}
}

#contact-form:target ~ .homepage-contact-form__acknowledgement {
display: block;
}
99 changes: 99 additions & 0 deletions source/assets/stylesheets/styles/_homepage_newsletter.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
.homepage-newsletter {
background-color: $dark-gray;
padding: 30px 20px;

@include breakpoint($tablet-breakpoint) {
padding: 60px 20px;
}
}

.homepage-newsletter__title {
@include responsive-title;
font-weight: 300;
margin-bottom: 30px;
color: $white;

@include breakpoint($tablet-breakpoint) {
margin-bottom: 50px;
}
}

.homepage-newsletter__paragraph {
@include responsive-text;
color: $white;
font-weight: 300;
line-height: 1.3em;
}

.homepage-newsletter__form {
margin-top: 20px;

@include breakpoint($tablet-breakpoint) {
margin-top: 30px;
}
}

.homepage-newsletter__email {
@include responsive-text;
-webkit-appearance: none;
-webkit-box-sizing: border-box;
appearance: none;
border-radius: 0;
border: none;
box-sizing: border-box;
display: block;
font-family: inherit;
font-weight: 300;
height: 49px;
line-height: 1.3;
margin-bottom: 8px;
padding: 10px;
width: 100%;

&:focus {
background-color: darken($white, 5%);
outline: 0;
}

&.placeholder {
color: #C0C0C0;
}

@include breakpoint($tablet-breakpoint) {
display: inline-block;
margin-bottom: 0;
width: 74%;
}
}

.homepage-newsletter__button {
@extend .button;
@include responsive-text;
-webkit-box-sizing: border-box;
background-color: $dark-gray;
border: 1px solid darken($white, 5%);
box-sizing: border-box;
color: darken($white, 5%);
height: 49px;
padding: 10px 20px;
vertical-align: top;
width: 100%;

&:focus,
&:hover {
background-color: darken($white, 5%);
color: $dark-gray;
outline: 0;
}

&::-moz-focus-inner {
padding: 0;
border: 0;
}

@include breakpoint($tablet-breakpoint) {
display: inline-block;
width: 20%;
margin-left: 20px;
}
}
Loading

0 comments on commit 56030a3

Please sign in to comment.