cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add bootstrap 4

Browse source
This commit is contained in:
Andy Allan 2019-12-04 14:21:14 +01:00
parent cffff1635d
commit 7f9dacbada
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -42,6 +42,7 @@ gem "image_optim_rails"
# Load rails plugins
gem "active_record_union"
gem "activerecord-import"
gem "bootstrap", "~> 4.3.1"
gem "cancancan"
gem "composite_primary_keys", "~> 12.0.0"
gem "config"

6
Gemfile.lock
View file

@ -104,6 +104,10 @@ GEM
debug_inspector (>= 0.0.1)
bootsnap (1.4.5)
msgpack (~> 1.0)
bootstrap (4.3.1)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
browser (2.7.1)
builder (3.2.3)
bzip2-ffi (1.0.0)
@ -319,6 +323,7 @@ GEM
capybara (>= 2.1, < 4)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
popper_js (1.14.5)
progress (3.5.2)
psych (3.1.0)
public_suffix (4.0.1)
@ -465,6 +470,7 @@ DEPENDENCIES
bigdecimal (~> 1.1.0)
binding_of_caller
bootsnap (>= 1.4.2)
bootstrap (~> 4.3.1)
browser
bzip2-ffi
cancancan

3
app/assets/stylesheets/common.scss
View file

@ -1,4 +1,5 @@
@import "parameters";
@import "bootstrap";
/* Styles common to large and small screens */
@ -1236,7 +1237,7 @@ tr.turn:hover {
width: 12px;
height: 12px;
margin: 4px 0px;
border: 1px solid rgba(0, 0, 0, .1);
border: 1px solid rgba(0, 0, 0, .1);
// add color via inline css on element: background-color: <tag value>;
}
}