diff options
| -rw-r--r-- | config/settings.py | 2 | ||||
| -rw-r--r-- | design/sass/_photos.scss | 21 | ||||
| -rw-r--r-- | design/sass/iev8.scss | 3 | ||||
| -rw-r--r-- | design/sass/screenv8.scss | 1 | ||||
| -rw-r--r-- | design/templates/base.html | 2 | ||||
| -rw-r--r-- | design/templates/details/photo_galleries.html | 4 |
6 files changed, 28 insertions, 5 deletions
diff --git a/config/settings.py b/config/settings.py index 9a18f89..49be9f7 100644 --- a/config/settings.py +++ b/config/settings.py @@ -74,7 +74,7 @@ IMAGES_URL = 'https://images.luxagraf.net/' # Absolute filesystem path to the directory that will hold user-uploaded files. # Example: "/home/media/media.lawrence.com/media/" -MEDIA_ROOT = os.path.join(PROJ_ROOT, 'site/media') +MEDIA_ROOT = os.path.join(PROJ_ROOT, 'v8/media') # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash. diff --git a/design/sass/_photos.scss b/design/sass/_photos.scss index 664b892..da0480e 100644 --- a/design/sass/_photos.scss +++ b/design/sass/_photos.scss @@ -178,7 +178,28 @@ display: block; } } +.fig { position: relative;} +.map-container { + left: -3%; + background: url("/media/img/mapbg-black.png") no-repeat top left !important; + @include breakpoint(beta) { + left: 4%; + } + @include breakpoint(gamma) { + left: 22%; + } + @include breakpoint(delta) { + left: 34%; + } +} +.map-wrapper { + width: 400px; + height: 328px; + position: absolute; + bottom: 27px; + margin: 0px 0 0 44px; +} //.figcaption { // clear: both; diff --git a/design/sass/iev8.scss b/design/sass/iev8.scss new file mode 100644 index 0000000..1f191e9 --- /dev/null +++ b/design/sass/iev8.scss @@ -0,0 +1,3 @@ +body { + background: #f3f; +} diff --git a/design/sass/screenv8.scss b/design/sass/screenv8.scss index 4c3657d..58bd5af 100644 --- a/design/sass/screenv8.scss +++ b/design/sass/screenv8.scss @@ -1,4 +1,3 @@ -@import 'flexbox'; //Flexbox relies on https://github.com/timhettler/compass-flexbox @import "_normalize.scss"; @import "_fonts.scss"; @import "_mixins.scss"; diff --git a/design/templates/base.html b/design/templates/base.html index 5c9ca21..6f3dc0a 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -19,7 +19,7 @@ media="screen">{%endblock%} <!--[if IE]> <link rel="stylesheet" - href="/media/css/ie.css" + href="/media/iev8.css" media="screen"> <![endif]--> {%block extrahead%}{%endblock%} diff --git a/design/templates/details/photo_galleries.html b/design/templates/details/photo_galleries.html index 5275f2d..546d767 100644 --- a/design/templates/details/photo_galleries.html +++ b/design/templates/details/photo_galleries.html @@ -48,8 +48,8 @@ {%endblock%} {% block js %} - <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.js"></script> - <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.scrollTo-1.4.2-min.js"></script> + <script type="text/javascript" src="/media/js/jquery.js"></script> + <script type="text/javascript" src="/media/js/jquery.scrollTo-1.4.2-min.js"></script> <script type="text/javascript" src="/media/js/photos.min.js" ></script> {% endblock%} |