Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix merge conflicts

Merge branch 'master' of github.com:dtourio/dtourio

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/views/home/index.html.erb
  • Loading branch information...
commit e0f656193e975aaaa0ae3f635401f6f8797ab88e 2 parents 9d926c0 + a257d8b
@mirage88 mirage88 authored
View
17 app/assets/stylesheets/home.css.scss
@@ -1,4 +1,4 @@
-#heading{
+#heading {
margin: 0px auto;
padding: 120px 45%;
font-size: 44px;
@@ -15,6 +15,20 @@
}
/*#container-wrap{
+=======
+
+ a {
+ display: block;
+ font-size: 20px;
+ font-weight: bold;
+ color: #fff;
+ text-decoration: none;
+ padding-top: 20px;
+ }
+}
+
+#container-wrap{
+>>>>>>> a257d8bed12d53a3e9507480c0fc72cfc7d0ba53
width: 100%;
height: 100%;
}
@@ -99,4 +113,5 @@
@media only screen and (device-width: 320px) and (orientation: portrait){
}
+<<<<<<< HEAD
*/
View
113 app/assets/stylesheets/trips.css.scss.BACKUP.22660.scss
@@ -0,0 +1,113 @@
+// Place all the styles related to the trips controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+
+.container{
+ width: 100%;
+ height: 25em;
+ position: relative;
+ overflow: hidden;
+ background-image: image_url("dtourio-BG.png");
+ background-size: cover;
+ select{
+ font-size: 4em;
+ line-height: 1em;
+ width: 1.5em;
+ height: auto;
+ overflow: hidden;
+ display: inline;
+
+ text-align: center;
+ option{
+ font-size: 16px;
+ }
+ }
+ #spacer{
+ font-size: 6em;
+ color: #e1e1e1;
+ text-align: justify;
+ margin: 0 0.025em;
+ }
+}
+
+
+#header-wrap{
+ width: 100%;
+ height: 4em;
+ /*background: rgba(153,202,58,1);*/
+ position: relative;
+ box-shadow: 0 1px 3px #000;
+ background: image_url("dtourio1.png");
+ background-size: cover;
+ #header{
+ display: block;
+ width: inherit;
+ font-size: 2em;
+ font-weight: bold;
+ line-height: auto;
+ text-shadow: none;
+ text-align: center;
+ padding: 0.125em 0px;
+ padding-top: 0.625em;
+ margin: 0.5em auto;
+ margin-top: 0px;
+ background: transparent;
+ }
+}
+
+.time-data, .interest-data, .route-data, .transport-data{
+ width: inherit;
+ display: block;
+ text-align: center;
+ padding: auto;
+ margin: 0 auto;
+}
+.interest-data{
+ span{
+ font-size: 1.5em;
+ font-weight: lighter;
+ color: #FFF;
+ margin: 10px 0px;
+ }
+}
+.hlist{
+ width: 100%;
+ height: 4em;
+ margin: 1em 0px;
+ box-shadow: 0 0 3px 0px #000 inset;
+ text-align: center;
+ margin: 0px !important;
+ -webkit-margin-before: 0em;
+ -webkit-margin-after: 0em;
+ -webkit-padding-start: 0px;
+ li{
+ width: 4em;
+ height: inherit;
+ display: inline-block;
+ background: rgba(69,91,167,1);
+ margin: 0px !important;
+ padding: 0px;
+ overflow: hidden;
+ -webkit-margin-before: 0em;
+ -webkit-margin-after: 0em;
+ }
+}
+#scroll_down{
+ position: absolute;
+ bottom: 0px;
+ left: 0px;
+ width: 100%;
+ height: 5em;
+ background: rgba(153,202,58,1);
+}
+
+.sel{
+ box-shadow: 0 0 3px #000 inset;
+ background: red;
+}
+@media only screen and (min-device-width: 960px){
+ #header-wrap{
+ height: 4em;
+ }
+
+}
View
6 app/controllers/authorizations_controller.rb
@@ -16,8 +16,8 @@ def callback
end
@user = user || User.find(@auth[:user_id])
session[:current_user] = @user.id
- if session[:return_to].nil?
- session[:return_to] = '/'
+ if session[:return_to].nil?
+ session[:return_to] = '/trips/new'
end
redirect_to session[:return_to]
end
@@ -41,4 +41,4 @@ def new
def edit
end
-end
+end
View
4 app/controllers/trips_controller.rb
@@ -4,7 +4,7 @@ class TripsController < ApplicationController
def create
@trip = Trip.new params[:trip]
- params[:interest].each do | interest_id |
+ [Interest.first, Interest.last].each do | interest_id |
@trip.interests << Interest.find(interest_id)
end
@trip.save
@@ -70,7 +70,7 @@ def request_location
all_locations = Array.new
foursquare_locations.each do |item|
- interests = Interest.find params[:interest]
+ interests = [Interest.last, Interest.first]
interests_names = Array.new
interests.each do | interest |
View
9 app/views/home/index.html.erb
@@ -1,10 +1,3 @@
<h2 id="heading">Dtourio
- <a href="trips/new">
- Click me
- </a>
+ <a href="/login">Plan a Trip</a>
</h2>
-<!-- <a href="trips/new">
-<div>
-New Trip
-</div>
-</a> -->
View
3  app/views/trips/show.html.erb
@@ -1,4 +1 @@
-<h2>Awesome Trip</h2>
-<p>Owned by an awesome dude.</p>
<%= gmaps("markers" => {"data" => @places.to_json, "options" => {"custom_infowindow_class" => "yellow" } }) %>
-h
Please sign in to comment.
Something went wrong with that request. Please try again.