bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Layout changes

Browse Source
This commit is contained in:
Godwin 2014-07-11 23:15:12 -06:00
parent 0d1cc032aa
commit 8088159c48
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/assets/stylesheets/sass/_layout.scss
View File

@ -10,6 +10,7 @@ html {
body { body {
background-color: $primary-color; background-color: $primary-color;
height: auto;
} }
#main-nav { #main-nav {
@ -41,7 +42,7 @@ body {
float: left; float: left;
&:hover { &:hover {
background-color: rgba($white, 0.75); background-color: rgba($white, 0.85);
} }
&.active { &.active {
@ -84,7 +85,7 @@ body {
.logo-text { .logo-text {
display: none; display: none;
fill: $black; fill: $white;
} }
&:hover { &:hover {
@ -101,7 +102,7 @@ body {
//background-color: $white; //background-color: $white;
//background-color: rgba($white, 0.33); //background-color: rgba($white, 0.33);
background-color: transparent; background-color: transparent;
@include background-image(linear-gradient(left, $white 0%, rgba($white, 0) 50%)); @include background-image(linear-gradient(top, #000 0%, rgba(#000, 0) 100%));
.buttons { .buttons {
display: block; display: block;
@ -170,6 +171,7 @@ body {
padding: 2.5%; padding: 2.5%;
font-size: 1em; font-size: 1em;
min-height: 100vh; min-height: 100vh;
background-image: none;
.button, p { .button, p {
display: block; display: block;
@ -185,6 +187,10 @@ body {
width: 100%; width: 100%;
height: auto; height: auto;
float: none; float: none;
.logo-text {
fill: $black;
}
} }
} }
@ -202,20 +208,26 @@ main {
min-height: 100%; min-height: 100%;
//overflow: auto; //overflow: auto;
background-color: $white; background-color: $white;
@include breakpoint(medium) {
//background-color: $black;
}
} }
#content { #content {
padding: 1em; padding: 1em;
overflow: auto; overflow: auto;
background-color: lighten($color-5, 20); //background-color: lighten($color-5, 20);
background-color: $white;
.organizations & { .organizations & {
background-color: lighten(desaturate($organization-color, 25), 50); //background-color: lighten(desaturate($organization-color, 25), 50);
min-height: 100vh; min-height: 100vh;
} }
.conferences & { .conferences & {
background-color: lighten(desaturate($conference-color, 25), 42.5); //background-color: #FFF;
//background-color: lighten(desaturate($conference-color, 25), 42.5);
min-height: 100vh; min-height: 100vh;
} }
@ -387,7 +399,7 @@ main {
} }
figure img { figure img {
width: 100%; //width: 100%;
} }
} }
@ -410,6 +422,11 @@ main {
@include breakpoint(large) { @include breakpoint(large) {
padding-top: 0; padding-top: 0;
border-bottom-left-radius: 2.5em;
&:after {
border-bottom-left-radius: inherit;
}
.organizations-index &, .organizations-index &,
.conferences-index & { .conferences-index & {

7
app/views/conferences/show.html.haml
View File

@ -3,6 +3,7 @@
= tabs! = tabs!
%h2=('About '+@conference.title) %article.row
%div{data: {editable: true}} .columns.large-10
%p=@conference.info.html_safe %h2=('About '+@conference.title)
%p=@conference.info.html_safe

4
app/views/organizations/show.html.haml
View File

@ -14,7 +14,7 @@
= tabs! = tabs!
.row %article.row
.columns .columns.large-10
%h2=('About '+@organization.name) %h2=('About '+@organization.name)
=p @organization, :info =p @organization, :info

2
config/environments/production.rb
View File

@ -24,7 +24,7 @@ BikeBike::Application.configure do
# Compress JavaScripts and CSS. # Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier config.assets.js_compressor = :uglifier
config.assets.css_compressor = :sass # config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed. # Do not fallback to assets pipeline if a precompiled asset is missed.
#config.assets.compile = true #config.assets.compile = true