Skip to content

Commit

Permalink
Merge branch 'master' of github.com:bearfountain/offcampus
Browse files Browse the repository at this point in the history
  • Loading branch information
@herbps10
herbps10 committed Jun 6, 2012
2 parents b4cece1 + 72c8c05 commit 866fc77
Show file tree
Hide file tree
Showing 8 changed files with 104 additions and 63 deletions.
Binary file added app/assets/images/.DS_Store
View file
Binary file not shown.
72 changes: 35 additions & 37 deletions app/assets/stylesheets/styles.css
View file
Expand Up @@ -459,15 +459,18 @@ section {
margin: 10px;
padding: 4px;
padding-bottom: 6px;
border: 1px solid #8f9ca2;

border: 2px solid #dbe1e4;
height: 140px;
width: 432px;
border-radius: 3px;
line-height: 1.9em;
box-shadow: 0px 0px 3px #ccc;

background: -moz-linear-gradient(90deg, #E8E8E8 0%, white 100%) #fbfcfc;
background: -webkit-gradient(linear, left bottom, left top, from(#E8E8E8), to(white)) #fbfcfc;
text-align: center;
-webkit-transition: all 1s ease;
-moz-transition: all 1s ease;
-ms-transition: all 1s ease;
-o-transition: all 1s ease;
transition: all 1s ease;
background: -webkit-gradient(linear, left bottom, left top, from(#f7f7f7), to(#ffffff)), #f7f8f8;
}

.post:hover {
Expand All @@ -491,24 +494,19 @@ section {
}

.post img {
border: 1px solid rgba(51, 51, 51, 0.32);
padding: 1px;
border: 1px solid rgba(51, 51, 51, 0.23);
float: left;
margin-right: 8px;
margin-right: 14px;
height: 100%;
}

.post a {
color: blue;
text-decoration: underline;
}

.post .btn {
margin-top: 20px;
}

.post h4 {
font-size: 1.3em;
text-align: left;
margin-top: 0;
}

.view_by {
Expand Down Expand Up @@ -562,6 +560,10 @@ section {

/* @group Listings */

#sort_categories {
margin-bottom: 60px;
}

nav#size_categories ul {
text-align: center;
}
Expand All @@ -586,11 +588,26 @@ nav#size_categories {
border: 1px solid #dfdfdf;
background: -moz-linear-gradient(90deg, #f6f6f6 0%, white 100%) #f6f6f6;
background: -webkit-gradient(linear, left bottom, left top, from(#f6f6f6), to(white)) #f6f6f6;
margin-bottom: 18px;
margin: 18px 0;
}

nav#size_categories li.active {
border-right: 1px solid #d4d4d4;
border-left: 1px solid #d4d4d4;
padding: 8px 8px;
background-color: #ffffff;
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.19);
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.19);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.19);
}

nav#size_categories li.active a {
color: red;
color: #ec643f;
}

.title, .sliderbar {
display: inline-block;
color: #6a6a6a;
}

/* @end */
Expand Down Expand Up @@ -676,23 +693,6 @@ dt, dd {

/* @end */

.noUi_sliderKnob {
cursor: pointer;
}

.noUi_readout {
position: relative;
top: 20px;
width: 55px;
height: 30px;
background: yellow;
border: 1px solid #ccc;
box-shadow: 0px 0px 3px black;
text-align: center;
line-height: 30px;
}


#slides {
width: 300px;
margin: 10px 0;
Expand Down Expand Up @@ -735,10 +735,8 @@ dt, dd {
background: #EC643F;
}



.sliderbar {
margin-bottom: 50px;
margin-left: 20px;
}


Expand Down
2 changes: 1 addition & 1 deletion app/views/pages/home.haml
View file
Expand Up @@ -43,4 +43,4 @@

%p

= link_to 'view all rentals', { :action => 'list' }, { :class => 'view_by view_all' }
= link_to 'Landlords, get your properties featured right here on the homepage!', { :action => 'list' }, { :class => 'view_by view_all' }
4 changes: 1 addition & 3 deletions app/views/pages/list.haml
View file
Expand Up @@ -6,8 +6,6 @@
- if @ajax == true
= render :partial => 'list', :locals => { :properties => @properties }
- else

%h3 Bedrooms
%nav#size_categories
%ul
%li.active
Expand All @@ -34,7 +32,7 @@
%a{:href => "#", :rel => "6"}
6+ Bedrooms (#{@counts[6] || 0})
#sort_categories
%h3 Rent
.title Rent Range:
.sliderbar
%section.listing
- if @properties.length == 0
Expand Down
Binary file added public/css/.DS_Store
View file
Binary file not shown.
Binary file added public/css/grab.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
89 changes: 67 additions & 22 deletions public/css/nouislider.css
View file
@@ -1,44 +1,89 @@
.sliderbar {
width: 400px;
border: 1px solid #CCC;
height: 8px;
border: 1px solid #bdbdbd;
height: 12px;
border-radius: 4px;
background: #EEE;
background: -moz-linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.1) 100%), #EEE;
background: -webkit-gradient(linear, left bottom, left top, from(rgba(0, 0, 0, 0)), to(rgba(0, 0, 0, 0.1))), #EEE;
}

.noUi_handle {
height: 8px;
height: 12px;
width: 8px;
}

.noUi_midBar {
height: 8px;
height: 12px;
}

.noUi_midBar {
background: #2673AB;
background-image: linear-gradient(bottom, rgb(94,153,196) 30%, rgb(38,116,171) 81%);
background-image: -o-linear-gradient(bottom, rgb(94,153,196) 30%, rgb(38,116,171) 81%);
background-image: -moz-linear-gradient(bottom, rgb(94,153,196) 30%, rgb(38,116,171) 81%);
background-image: -webkit-linear-gradient(bottom, rgb(94,153,196) 30%, rgb(38,116,171) 81%);
background-image: -ms-linear-gradient(bottom, rgb(94,153,196) 30%, rgb(38,116,171) 81%);
background-image: -webkit-gradient( linear, left bottom, left top, color-stop(0.3, rgb(94,153,196)), color-stop(0.81, rgb(38,116,171)) );
top: -1px;
background: url(stripe.png) center, -webkit-gradient(linear, left bottom, left top, from(rgba(255, 255, 255, 0.39)), color-stop(0.612, rgba(254, 254, 254, 0.1)), color-stop(0.689, rgba(254, 254, 254, 0.18)), to(rgba(255, 255, 255, 0.23))) #7a96c5;
border: 1px solid rgb(49, 82, 108);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
}

.noUi_sliderKnob {
z-index: 5;
width: 16px;
height: 16px;
width: 30px;
height: 20px;
position: absolute;
top: -5px;
left: -5px;
border: 1px solid #CCC;
border-radius: 5px;
background: #EEE;
border: 1px solid #707070;
border-radius: 3px;
cursor: -webkit-grab;
cursor: -moz-grab;
-webkit-transition: all .5s ease;
-moz-transition: all .5s ease;
-ms-transition: all .5s ease;
-o-transition: all .5s ease;
transition: all .5s ease;
-moz-box-shadow: inset 0 1px 0 rgb(255, 255, 255), inset 0 -1px 10px rgba(0, 0, 0, 0.17);
-webkit-box-shadow: inset 0 1px 0 rgb(255, 255, 255), inset 0 -1px 10px rgba(0, 0, 0, 0.17);
box-shadow: inset 0 1px 0 rgb(255, 255, 255), inset 0 -1px 10px rgba(0, 0, 0, 0.17);
background: -moz-linear-gradient(90deg, white 0%, #ededed 100%) #ffffff;
background: -webkit-gradient(linear, left bottom, left top, from(white), to(#ededed)) #ffffff;
}

.noUi_sliderKnob:active,
.noUi_activeHandle, .noUi_sliderKnob:active .noUi_readout, .noUi_activeHandle .noUi_readout {
cursor: -webkit-grabbing;
cursor: -moz-grabbing;
/*-moz-box-shadow: 0 3px 8px rgba(0, 0, 0, 0.33);
-webkit-box-shadow: 0 3px 8px rgba(0, 0, 0, 0.33);
box-shadow: 0 3px 8px rgba(0, 0, 0, 0.33);
-moz-transform: scale(1.05) rotate(0deg) translate(0px, 0px) skew(0deg, 0deg);
-webkit-transform: scale(1.05) rotate(0deg) translate(0px, 0px) skew(0deg, 0deg);
-o-transform: scale(1.05) rotate(0deg) translate(0px, 0px) skew(0deg, 0deg);
-ms-transform: scale(1.05) rotate(0deg) translate(0px, 0px) skew(0deg, 0deg);
transform: scale(1.05) rotate(0deg) translate(0px, 0px) skew(0deg, 0deg);
border-color: #888888;*/
}

.noUi_readout {
background-color: #f9f9f9;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
color: #434343;
position: relative;
left: -6px;
top: 26px;
width: 40px;
height: 20px;
text-align: center;
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-webkit-transition: all .5s ease;
-moz-transition: all .5s ease;
-ms-transition: all .5s ease;
-o-transition: all .5s ease;
transition: all .5s ease;
border: 1px solid #cccccc;
line-height: 20px;
}

.noUi_sliderKnob:hover,
.noUi_activeHandle {
background: #adcbe1;
border-color: #2673AB;
}
Binary file added public/css/stripe.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 866fc77

Please sign in to comment.