diff --git a/Gemfile b/Gemfile index 5d4cd57a1..74bcf65e4 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 76e087040..244847d0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -364,7 +364,7 @@ DEPENDENCIES mini_racer minitest minitest-reporters - mysql2 (< 0.6) + mysql2 oa-openid (= 0.3.2) open_id_authentication paper_trail diff --git a/app/assets/stylesheets/front_ui.scss b/app/assets/stylesheets/front_ui.scss new file mode 100644 index 000000000..3e40d611b --- /dev/null +++ b/app/assets/stylesheets/front_ui.scss @@ -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; + } + } \ No newline at end of file diff --git a/app/views/front_ui/index.html.erb b/app/views/front_ui/index.html.erb index 551c92633..47f6d0771 100644 --- a/app/views/front_ui/index.html.erb +++ b/app/views/front_ui/index.html.erb @@ -4,49 +4,6 @@ <%= javascript_include_tag('/assets/leaflet-spin/example/leaflet.spin.min.js') %> <%= javascript_include_tag('leaflet-fullHash.js') %> - -
diff --git a/db/migrate/20190913045600_add_display_welcome_to_maps.rb b/db/migrate/20190913045600_add_display_welcome_to_maps.rb index 16c8504f2..e0ad78011 100644 --- a/db/migrate/20190913045600_add_display_welcome_to_maps.rb +++ b/db/migrate/20190913045600_add_display_welcome_to_maps.rb @@ -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 diff --git a/db/migrate/20191214062147_add_index_for_warpable_map_id.rb b/db/migrate/20191214062147_add_index_for_warpable_map_id.rb index 2e0c62688..4eb1d67a4 100644 --- a/db/migrate/20191214062147_add_index_for_warpable_map_id.rb +++ b/db/migrate/20191214062147_add_index_for_warpable_map_id.rb @@ -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 diff --git a/db/schema.rb b/db/schema.rb index 49b07d25b..308467920 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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" @@ -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| @@ -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| @@ -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|