diff --git a/.cascade-code/Chapman.edu/_cascade/formats/modular/widgets/one_column/campus_map.vtl b/.cascade-code/Chapman.edu/_cascade/formats/modular/widgets/one_column/campus_map.vtl
index 291b0356b..5247e3a6e 100644
--- a/.cascade-code/Chapman.edu/_cascade/formats/modular/widgets/one_column/campus_map.vtl
+++ b/.cascade-code/Chapman.edu/_cascade/formats/modular/widgets/one_column/campus_map.vtl
@@ -20,14 +20,14 @@
-
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 00a23d161..d4d46c40e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,8 @@
{
- "autoprefixer.formatOnSave": false
+ "autoprefixer.formatOnSave": false,
+ "workbench.colorCustomizations": {
+ "activityBar.background": "#1C3316",
+ "titleBar.activeBackground": "#27481F",
+ "titleBar.activeForeground": "#F8FBF7"
+ }
}
\ No newline at end of file
diff --git a/app/assets/javascripts/master.js b/app/assets/javascripts/master.js
index 29f9b0082..8e630f9f2 100644
--- a/app/assets/javascripts/master.js
+++ b/app/assets/javascripts/master.js
@@ -67,4 +67,4 @@
//= require cascade/level/rotator
//= require cascade/level/scroll-bar
//= require cascade/level/social
-//= require cascade/level/sponsor
+//= require cascade/level/sponsor
\ No newline at end of file
diff --git a/app/assets/stylesheets/layouts/two_column.css b/app/assets/stylesheets/layouts/two_column.css
new file mode 100644
index 000000000..0264e962b
--- /dev/null
+++ b/app/assets/stylesheets/layouts/two_column.css
@@ -0,0 +1 @@
+#a-z-anchors :target:before{content:"";display:block;height:80px;margin:-80px 0 0;position:relative;z-index:-1}
diff --git a/app/assets/stylesheets/widgets/single_column/campus-map.scss b/app/assets/stylesheets/widgets/single_column/campus-map.scss
index 6d9f51557..e8c78af2e 100644
--- a/app/assets/stylesheets/widgets/single_column/campus-map.scss
+++ b/app/assets/stylesheets/widgets/single_column/campus-map.scss
@@ -1,3 +1,7 @@
+#campusMapWidget {
+ position: relative;
+}
+
.campus-map {
.reveal {
float: right;
@@ -53,7 +57,11 @@
}
.map-container {
- iframe#map_frame {}
+
+ // hides Campus Bird's branding
+ iframe#map_frame {
+ height: 105%;
+ }
.map-inner {
height: 500px;
@@ -68,7 +76,7 @@
transform: translate(-50%, -50%);
}
- i.fas.marker-icon {
+ span.fas.marker-icon {
display: inline-block;
border-radius: 60px;
box-shadow: 0px 0px 2px #888;
@@ -78,7 +86,7 @@
font-size: 1.5em;
}
- .theme-button i.fas {
+ .theme-button span.fas {
font-size: 1.2em;
margin-left: 6px;
}
diff --git a/app/views/_cascade/blocks/html/_facebook_javascript_sdk.html b/app/views/_cascade/blocks/html/_facebook_javascript_sdk.html
index e709b21ed..e69de29bb 100644
--- a/app/views/_cascade/blocks/html/_facebook_javascript_sdk.html
+++ b/app/views/_cascade/blocks/html/_facebook_javascript_sdk.html
@@ -1,17 +0,0 @@
-
diff --git a/app/views/widgets/shared/_head.html b/app/views/widgets/shared/_head.html
index 8fdd7b7d8..00f1b51c8 100644
--- a/app/views/widgets/shared/_head.html
+++ b/app/views/widgets/shared/_head.html
@@ -1,28 +1,29 @@
-
-
-
<%= params[:page].to_s.titleize %>
+
+
+
<%= params[:page].to_s.titleize %>
-
-
-
-
+
+
+
+
-
+
-
-
-
-
- <%= javascript_include_tag 'master' %>
+
+
+
+
+ <%= javascript_include_tag 'master' %>
-
- <%= stylesheet_link_tag 'master', media: 'all' %>
-
+ <%= stylesheet_link_tag 'master', media: 'all' %>
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/app/views/widgets/single_column/_campus_map.html b/app/views/widgets/single_column/_campus_map.html
index 9cc38f290..1b71b8220 100644
--- a/app/views/widgets/single_column/_campus_map.html
+++ b/app/views/widgets/single_column/_campus_map.html
@@ -44,12 +44,12 @@
Entertainment Law Program
title="Minimize contact info">
-
+
1 University Drive,
Orange, Ca
92886
-
1-800-panTher
-
Mixed case email us
+
1-800-panTher
+
Mixed case email us
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e9bd630cc..276cdc613 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -43,4 +43,9 @@
# no cache money
config.assets.cache_store = :null_store # Disables the Asset cache
config.sass.cache = false # Disable the SASS compiler cache
+# Do not compress assets
+config.assets.compress = false
+
+# Expands the lines which load the assets
+config.assets.debug = true
end