Skip to content

Commit

Permalink
moved the styling on the front_ui/index to stylesheets
Browse files Browse the repository at this point in the history
  • Loading branch information
katungi committed Jan 27, 2020
1 parent 506868a commit 7179e47
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 48 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem 'paper_trail'

# dependencies
group :dependencies do
gem 'mysql2', '< 0.6'
gem 'mysql2'
gem 'geokit-rails', '1.1.4'
gem 'image_science', '1.3.0'
gem 'recaptcha', '~> 5.0.0', require: 'recaptcha/rails'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ DEPENDENCIES
mini_racer
minitest
minitest-reporters
mysql2 (< 0.6)
mysql2
oa-openid (= 0.3.2)
open_id_authentication
paper_trail
Expand Down
41 changes: 41 additions & 0 deletions app/assets/stylesheets/front_ui.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

#hero {
margin-bottom: 0;
}
.activities p {
color: #aaa;
width: 80%;
padding-top: 20px;
padding-bottom: 20px;
padding-left: 20%;
}
.lead-text {
padding: 30px 10px 10px;
border-radius: 4px;
box-shadow: 0 6px 12px rgba(0,0,0,0.175);
}
.featured-places a {
padding: 8px 12px;
}
.featured-places {
text-align: center;
padding-bottom: 20px;
width: 100%;
overflow: hidden;
position: absolute;
}
#anonymous-map button{
width: 70px;
background-color: #ffffff;
border: none;
margin-right: 0.25rem;
}
#anonymous-map i{
font-size:20px;
color:white;
}
@media(max-width: 780px) {
.before-featured-map {
margin-bottom: 50px;
}
}
43 changes: 0 additions & 43 deletions app/views/front_ui/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,6 @@
<%= javascript_include_tag('/assets/leaflet-spin/example/leaflet.spin.min.js') %>
<%= javascript_include_tag('leaflet-fullHash.js') %>

<style>
#hero {
margin-bottom: 0;
}
.activities p {
color: #aaa;
width: 80%;
padding-top: 20px;
padding-bottom: 20px;
padding-left: 20%;
}
.lead-text {
padding: 30px 10px 10px;
border-radius: 4px;
box-shadow: 0 6px 12px rgba(0,0,0,0.175);
}
.featured-places a {
padding: 8px 12px;
}
.featured-places {
text-align: center;
padding-bottom: 20px;
width: 100%;
overflow: hidden;
position: absolute;
}
#anonymous-map button{
width: 70px;
background-color: #ffffff;
border: none;
margin-right: 0.25rem;
}
#anonymous-map i{
font-size:20px;
color:white;
}
@media(max-width: 780px) {
.before-featured-map {
margin-bottom: 50px;
}
}
</style>

<!-- jumbotron with background-image -->
<div class="container-fluid jumbotron text-center" id="hero">
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20190913045600_add_display_welcome_to_maps.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddDisplayWelcomeToMaps < ActiveRecord::Migration[5.2]
class AddDisplayWelcomeToMaps < ActiveRecord::Migration[5.2.4]
def change
add_column :maps, :display_welcome, :boolean, default: true
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20191214062147_add_index_for_warpable_map_id.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddIndexForWarpableMapId < ActiveRecord::Migration
class AddIndexForWarpableMapId < ActiveRecord::Migration[5.2]
def up
add_index "warpables", ["map_id"], :name => "index_warpables_on_map_id"
end
Expand Down
6 changes: 5 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2019_12_14_062147) do
ActiveRecord::Schema.define(version: 2019_12_19_051509) do

create_table "annotations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
t.integer "map_id"
Expand All @@ -29,6 +29,7 @@
t.integer "map_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["map_id"], name: "index_comments_on_map_id"
end

create_table "exports", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
Expand All @@ -48,6 +49,7 @@
t.string "export_type", default: "normal", null: false
t.integer "user_id", default: 0
t.string "export_url"
t.index ["map_id"], name: "index_exports_on_map_id"
end

create_table "maps", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
Expand Down Expand Up @@ -75,7 +77,9 @@
t.boolean "anon_annotatable", default: false
t.string "slug"
t.boolean "display_welcome", default: true
t.index ["author"], name: "index_maps_on_author"
t.index ["slug"], name: "index_maps_on_slug", unique: true
t.index ["user_id"], name: "index_maps_on_user_id"
end

create_table "nodes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
Expand Down

0 comments on commit 7179e47

Please sign in to comment.