Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: judy/makespace
base: 34f7bcad37
...
head fork: judy/makespace
compare: a9158bc693
  • 2 commits
  • 15 files changed
  • 0 commit comments
  • 1 contributor
1  .gitignore
View
@@ -9,6 +9,7 @@ solr/data/
solr/pids/
logfile
public/system
+public/assets
config/initializers/secret_token.rb
# Doc generated stuff
6 config/environments/production.rb
View
@@ -35,9 +35,13 @@
# Version of your assets, change this if you want to expire all your assets.
config.assets.version = '1.0'
+ config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
+ config.assets.paths << Rails.root.join('vendor', 'assets', 'images')
+ config.assets.precompile << /\.(?:svg|eot|woff|ttf|png|jpg)$/
+
# Specifies the header that your server uses for sending files.
# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
- # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+ config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true
0  vendor/assets/stylesheets/img/bg-overlay.png → vendor/assets/images/bg-overlay.png
View
File renamed without changes
0  vendor/assets/stylesheets/img/browser-header.png → vendor/assets/images/browser-header.png
View
File renamed without changes
0  vendor/assets/stylesheets/img/controls.png → vendor/assets/images/controls.png
View
File renamed without changes
0  vendor/assets/stylesheets/img/featured.png → vendor/assets/images/featured.png
View
File renamed without changes
0  ...ts/stylesheets/img/glyphicons-halflings-white.png → vendor/assets/images/glyphicons-halflings-white.png
View
File renamed without changes
0  ...r/assets/stylesheets/img/glyphicons-halflings.png → vendor/assets/images/glyphicons-halflings.png
View
File renamed without changes
0  vendor/assets/stylesheets/img/ie-black-bg.png → vendor/assets/images/ie-black-bg.png
View
File renamed without changes
0  vendor/assets/stylesheets/img/loading.gif → vendor/assets/images/loading.gif
View
File renamed without changes
16 vendor/assets/stylesheets/bootstrap.min.sass
View
@@ -1615,36 +1615,36 @@ table
*margin-right: .3em
line-height: 14px
vertical-align: text-top
- background-image: url("../img/glyphicons-halflings.png")
+ background-image: image-url("glyphicons-halflings.png")
background-position: 14px 14px
background-repeat: no-repeat
.icon-white
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.nav-pills > .active > a >
[class^="icon-"], [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.nav-list > .active > a >
[class^="icon-"], [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.navbar-inverse .nav > .active > a >
[class^="icon-"], [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.dropdown-menu >
li > a
&:hover > [class^="icon-"], &:focus > [class^="icon-"], &:hover > [class*=" icon-"], &:focus > [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.active > a >
[class^="icon-"], [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.dropdown-submenu
&:hover > a > [class^="icon-"], &:focus > a > [class^="icon-"], &:hover > a > [class*=" icon-"], &:focus > a > [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.icon-glass
background-position: 0 0
16 vendor/assets/stylesheets/bootstrap.sass
View
@@ -1623,38 +1623,38 @@ table
*margin-right: .3em
line-height: 14px
vertical-align: text-top
- background-image: url("../img/glyphicons-halflings.png")
+ background-image: image-url("glyphicons-halflings.png")
background-position: 14px 14px
background-repeat: no-repeat
/* White icons with optional class, or on hover/focus/active states of certain elements
.icon-white
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.nav-pills > .active > a >
[class^="icon-"], [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.nav-list > .active > a >
[class^="icon-"], [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.navbar-inverse .nav > .active > a >
[class^="icon-"], [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.dropdown-menu >
li > a
&:hover > [class^="icon-"], &:focus > [class^="icon-"], &:hover > [class*=" icon-"], &:focus > [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.active > a >
[class^="icon-"], [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.dropdown-submenu
&:hover > a > [class^="icon-"], &:focus > a > [class^="icon-"], &:hover > a > [class*=" icon-"], &:focus > a > [class*=" icon-"]
- background-image: url("../img/glyphicons-halflings-white.png")
+ background-image: image-url("glyphicons-halflings-white.png")
.icon-glass
background-position: 0 0
10 vendor/assets/stylesheets/colorbox.sass
View
@@ -66,7 +66,7 @@
-moz-box-sizing: content-box
-webkit-box-sizing: content-box
-/*
+/*
* User Style:
* Change the following styles to modify the appearance of Colorbox. They are
* ordered & tabbed in a way that represents the nesting of the generated HTML.
@@ -105,7 +105,7 @@
color: #ccc
#cboxLoadingGraphic
- background: url(img/loading.gif) no-repeat center center
+ background: url(loading.gif) no-repeat center center
/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles
@@ -133,7 +133,7 @@
top: 50%
left: 5px
margin-top: -32px
- background: url(img/controls.png) no-repeat top left
+ background: url(controls.png) no-repeat top left
width: 28px
height: 65px
text-indent: -9999px
@@ -145,7 +145,7 @@
top: 50%
right: 5px
margin-top: -32px
- background: url(img/controls.png) no-repeat top right
+ background: url(controls.png) no-repeat top right
width: 28px
height: 65px
text-indent: -9999px
@@ -157,7 +157,7 @@
top: 5px
right: 5px
display: block
- background: url(img/controls.png) no-repeat top center
+ background: url(controls.png) no-repeat top center
width: 38px
height: 19px
text-indent: -9999px
4 vendor/assets/stylesheets/font-awesome.min.sass
View
@@ -1,7 +1,7 @@
@font-face
font-family: 'FontAwesome'
- src: url('fontawesome-webfont.eot?v=3.2.1')
- src: url('fontawesome-webfont.eot?#iefix&v=3.2.1') format("embedded-opentype"), url('fontawesome-webfont.woff?v=3.2.1') format("woff"), url('fontawesome-webfont.ttf?v=3.2.1') format("truetype"), url('fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format("svg")
+ src: asset-url("fontawesome-webfont.eot", font)
+ src: asset-url("fontawesome-webfont.eot?#iefix", font) format("embedded-opentype"), asset-url("fontawesome-webfont.woff", font) format("woff"), asset-url("fontawesome-webfont.ttf", font) format("truetype"), asset-url("fontawesome-webfont.svg", font) format("svg")
font-weight: normal
font-style: normal
6 vendor/assets/stylesheets/main.sass
View
@@ -906,7 +906,7 @@ blockquote
box-sizing: border-box
.lt-ie9 .parallax .text
- background: url('img/ie-black-bg.png')
+ background: image-url('ie-black-bg.png')
.parallax .logotext
width: 24em
@@ -939,7 +939,7 @@ blockquote
border-color: #87989E
color: $white
height: auto
- background: url('img/bg-overlay.png')
+ background: image-url("bg-overlay.png")
font-size: 18px
&:focus
border: 1px solid $primary_color
@@ -1011,7 +1011,7 @@ blockquote
.black-bg
width: 100%
height: 100%
- background: url('img/bg-overlay.png')
+ background: image-url("bg-overlay.png")
position: absolute
top: 0
left: 0

No commit comments for this range

Something went wrong with that request. Please try again.