Skip to content

Commit

Permalink
Merge pull request #2636 from projecthydra/new_layout
Browse files Browse the repository at this point in the history
Use a homepage layout with a smaller header
  • Loading branch information
mjgiarlo committed Sep 7, 2016
2 parents f26ecfd + fea93cf commit e05cd72
Show file tree
Hide file tree
Showing 15 changed files with 399 additions and 91 deletions.
3 changes: 3 additions & 0 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
ruby:
enabled: false

scss:
config_file: .scss-lint.yml
253 changes: 253 additions & 0 deletions .scss-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
# Default application configuration that all configurations inherit from.

scss_files: "**/*.scss"
plugin_directories: ['.scss-linters']

# List of gem names to load custom linters from (make sure they are already
# installed)
plugin_gems: []

# Default severity of all linters.
severity: warning

linters:
BangFormat:
enabled: true
space_before_bang: true
space_after_bang: false

BemDepth:
enabled: false
max_elements: 1

BorderZero:
enabled: true
convention: zero # or `none`

ChainedClasses:
enabled: false

ColorKeyword:
enabled: true

ColorVariable:
enabled: false

Comment:
enabled: true
style: silent

DebugStatement:
enabled: true

DeclarationOrder:
enabled: true

DisableLinterReason:
enabled: false

DuplicateProperty:
enabled: true

ElsePlacement:
enabled: true
style: same_line # or 'new_line'

EmptyLineBetweenBlocks:
enabled: true
ignore_single_line_blocks: true

EmptyRule:
enabled: true

ExtendDirective:
enabled: false

FinalNewline:
enabled: true
present: true

HexLength:
enabled: false
style: short # or 'long'

HexNotation:
enabled: true
style: lowercase # or 'uppercase'

HexValidation:
enabled: true

IdSelector:
enabled: true

ImportantRule:
enabled: true

ImportPath:
enabled: true
leading_underscore: false
filename_extension: false

Indentation:
enabled: true
allow_non_nested_indentation: false
character: space # or 'tab'
width: 2

LeadingZero:
enabled: true
style: include_zero # or 'exclude_zero'

MergeableSelector:
enabled: true
force_nesting: true

NameFormat:
enabled: false
allow_leading_underscore: true
convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern

NestingDepth:
enabled: true
max_depth: 4
ignore_parent_selectors: false

PlaceholderInExtend:
enabled: false

PrivateNamingConvention:
enabled: false
prefix: _

PropertyCount:
enabled: true
include_nested: false
max_properties: 10

PropertySortOrder:
enabled: true
ignore_unspecified: false
min_properties: 2
separate_groups: false

PropertySpelling:
enabled: true
extra_properties: []
disabled_properties: []

PropertyUnits:
enabled: true
global: [
'ch', 'em', 'ex', 'rem', # Font-relative lengths
'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
'vh', 'vw', 'vmin', 'vmax', # Viewport-percentage lengths
'deg', 'grad', 'rad', 'turn', # Angle
'ms', 's', # Duration
'Hz', 'kHz', # Frequency
'dpi', 'dpcm', 'dppx', # Resolution
'%'] # Other
properties: {}

PseudoElement:
enabled: true

QualifyingElement:
enabled: true
allow_element_with_attribute: false
allow_element_with_class: false
allow_element_with_id: false

SelectorDepth:
enabled: true
max_depth: 4

SelectorFormat:
enabled: true
convention: hyphenated_lowercase # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern

Shorthand:
enabled: true
allowed_shorthands: [1, 2, 3]

SingleLinePerProperty:
enabled: true
allow_single_line_rule_sets: true

SingleLinePerSelector:
enabled: true

SpaceAfterComma:
enabled: true
style: one_space # or 'no_space', or 'at_least_one_space'

SpaceAfterPropertyColon:
enabled: true
style: at_least_one_space # or 'no_space', or 'one_space', or 'aligned'

SpaceAfterPropertyName:
enabled: true

SpaceAfterVariableColon:
enabled: false
style: one_space # or 'no_space', 'at_least_one_space' or 'one_space_or_newline'

SpaceAfterVariableName:
enabled: true

SpaceAroundOperator:
enabled: true
style: one_space # or 'at_least_one_space', or 'no_space'

SpaceBeforeBrace:
enabled: true
style: space # or 'new_line'
allow_single_line_padding: false

SpaceBetweenParens:
enabled: true
spaces: 0

StringQuotes:
enabled: false
style: double_quotes # or single_quotes

TrailingSemicolon:
enabled: true

TrailingWhitespace:
enabled: true

TrailingZero:
enabled: false

TransitionAll:
enabled: false

UnnecessaryMantissa:
enabled: true

UnnecessaryParentReference:
enabled: true

UrlFormat:
enabled: true

UrlQuotes:
enabled: true

VariableForProperty:
enabled: false
properties: []

VendorPrefix:
enabled: false
identifier_list: base
additional_identifiers: []
excluded_identifiers: []

ZeroUnit:
enabled: true

Compass::*:
enabled: false
Binary file removed app/assets/images/old_main_tulips.jpg
Binary file not shown.
Binary file added app/assets/images/pasture.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
103 changes: 68 additions & 35 deletions app/assets/stylesheets/sufia/_home-page.scss
Original file line number Diff line number Diff line change
@@ -1,48 +1,81 @@
#home_header {
margin: 0 -15px;
@mixin masthead-background-containers() {
position: absolute;
left: 0;
right: 0;
display: block;
width: auto;
height: 100%;
}

#home_header {
background-image: image-url('old_main_tulips.jpg');
background-position: 50% 100%;
background-repeat: no-repeat;
background-size: cover;
border-top: 8px solid #E1E1E1;
border-bottom: 8px solid #E1E1E1;
}
.image-masthead {
border-bottom: 1px solid $navbar-default-border;
margin-bottom: $padding-large-vertical * 2.5;
position: relative;

.home_share_work {
background: rgb(255,255,255) transparent;
background: rgba(255,255,255,0.8);
margin: 1em 0;
padding: 1em;
}
.background-container {
@include masthead-background-containers();
background-repeat: no-repeat;
background-size: cover;

.home_share_work p {
background-color: #FFF;
width: 40%;
margin: .25em auto;
}
// Add small amount of blur to help text stand out
-webkit-filter: blur($masthead-image-blur);
filter: blur($masthead-image-blur);
}

.home_marketing_text {
background: rgb(0,0,0) transparent;
background: rgba(0,0,0,0.65);
color: #FFF;
margin: 1em 0;
padding-bottom: 1em;
text-shadow: black 2px 2px ;
}
.background-container-gradient {
@include masthead-background-containers();
background:
linear-gradient(
rgba(0, 0, 0, 0.0),
rgba(0, 0, 0, 0.4),
rgba(0, 0, 0, 0.5)
);
}

.site-title {
min-height: $title-height;
padding-bottom: 6px;
position: relative;
}

.home_marketing_text h2 {
letter-spacing: .1em;
.navbar {
background-color: $navbar-transparent-bg;
margin-bottom: 0;

li > a {
color: $navbar-transparent-link-color;
text-transform: uppercase;

&:hover,
&:focus {
background-color: $navbar-transparent-link-hover-bg;
color: $navbar-transparent-link-hover-color;
}
}

.active > a {
&,
&:hover,
&:focus {
background-color: $navbar-transparent-link-active-bg;
color: $navbar-transparent-link-active-color;
}
}
}
}

.home_marketing_text p {
letter-spacing: .1em;
.home_share_work {
margin-bottom: $padding-large-vertical * 2.5;

p {
margin: 0.25em auto;
width: 40%;
}
}

#home_content {
padding: 2em 0;
.home_marketing_text {
color: $marketing-text-color;
text-shadow: $marketing-text-shadow;
}

// When we put a hidden label before the main search field, bootstrap stops
Expand Down

0 comments on commit e05cd72

Please sign in to comment.