Commit 44472609 authored by Korko's avatar Korko
Browse files

Force regroup of assets images into the same directory

parent b2d8f8f1
......@@ -43,8 +43,8 @@ elixir(function(mix) {
'dearSanta.scss'
], 'public/assets/dearSanta.css', sassOptions);
mix.copy('resources/assets/img', 'public/assets/img');
mix.copy('resources/assets/vendor/bootstrap-languages/languages.png', 'public/assets/img');
mix.copy('resources/assets/img', 'public/assets/images');
mix.copy('resources/assets/vendor/bootstrap-languages/languages.png', 'public/assets/images');
mix.copy('node_modules/bootstrap-sass/assets/fonts', 'public/assets/fonts');
mix.copy('node_modules/font-awesome/fonts', 'public/assets/fonts');
mix.copy('node_modules/multiple-select/multiple-select.png', 'public/assets');
......
This source diff could not be displayed because it is too large. You can view the blob instead.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -8,6 +8,10 @@ $fa-font-path: "/assets/fonts";
@import "languages";
.lang-xs { background-image: url('/assets/images/languages.png') !important; }
.lang-sm { background-image: url('/assets/images/languages.png') !important; }
.lang-lg { background-image: url('/assets/images/languages.png') !important; }
/*
Sticky Footer Solution
by Steve Hatcher
......@@ -147,7 +151,7 @@ img {
02. Header
========================================================================== */
#header {
background-image: url(/assets/img/gifts-1.jpg);
background-image: url(/assets/images/gifts-1.jpg);
-moz-background-size: cover;
background-size: cover;
background-position: center center;
......
......@@ -12,7 +12,7 @@ $footer-height: 120px;
04. Parallax
========================================================================== */
.parallax {
background: url(/assets/img/gifts-2.jpg) fixed no-repeat center center;
background: url(/assets/images/gifts-2.jpg) fixed no-repeat center center;
-moz-background-size: cover;
background-size: cover;
position: relative;
......@@ -23,7 +23,7 @@ $footer-height: 120px;
padding-bottom: 130px;
}
.parallax.parallax2 {
background-image: url(/assets/img/gifts-3.jpg);
background-image: url(/assets/images/gifts-3.jpg);
}
......@@ -101,7 +101,7 @@ fieldset > div.form-group {
}
.input-group-addon.lang:before {
background-repeat: no-repeat;
background-image: url(../img/languages.png);
background-image: url(/assets/images/languages.png);
height: 11px;
width: 14px;
content: '';
......
......@@ -51,7 +51,7 @@
<ul class="media-list">
<li class="media">
<div class="media-left media-middle">
<img class="media-object" src="assets/img/calendar-icon.png" />
<img class="media-object" src="assets/images/calendar-icon.png" />
</div>
<div class="media-body">
<h4 class="media-heading">@lang('form.section.what.heading1')</h4>
......@@ -81,7 +81,7 @@
<ul class="media-list">
<li class="media">
<div class="media-left media-middle">
<img class="media-object" src="assets/img/user-icon.png" />
<img class="media-object" src="assets/images/user-icon.png" />
</div>
<div class="media-body">
<h4 class="media-heading">@lang('form.section.how.heading1')</h4>
......@@ -94,12 +94,12 @@
<p>{!! nl2br(trans('form.section.how.content2')) !!}</p>
</div>
<div class="media-right media-middle">
<img class="media-object" src="assets/img/paper-icon.png" />
<img class="media-object" src="assets/images/paper-icon.png" />
</div>
</li>
<li class="media">
<div class="media-left media-middle">
<img class="media-object" src="assets/img/mail-icon.png" />
<img class="media-object" src="assets/images/mail-icon.png" />
</div>
<div class="media-body">
<h4 class="media-heading">@lang('form.section.how.heading3')</h4>
......
......@@ -22,7 +22,7 @@
<meta property="og:title" content="SecretSanta">
<meta property="og:site_name" content="SecretSanta">
<meta property="og:url" content="{{ URL::to('/') }}">
<meta property="og:image" content="{{ URL::asset('/assets/img/logo_black.png') }}">
<meta property="og:image" content="{{ URL::asset('/assets/images/logo_black.png') }}">
<meta property="og:description" content="@lang('headers.description')">
<meta property="og:type" content="website">
<meta property="og:locale" content="{{ App::getLocale() }}">
......@@ -33,10 +33,10 @@
<meta name="twitter:creator" content="Korko">
<meta name="twitter:title" content="SecretSanta">
<meta name="twitter:description" content="@lang('headers.description')">
<meta name="twitter:image" content="{{ URL::asset('/assets/img/logo_black.png') }}">
<meta name="twitter:image" content="{{ URL::asset('/assets/images/logo_black.png') }}">
<!-- facebook image -->
<link rel="image_src" href="{{ URL::asset('/assets/img/logo_black.png') }}" />
<link rel="image_src" href="{{ URL::asset('/assets/images/logo_black.png') }}" />
<!-- css -->
@php
......@@ -55,7 +55,7 @@
<nav id="navbar">
<div id="logo">
<a href="#header">
<img src="{{ URL::asset('/assets/img/logo.png') }}" alt="" />
<img src="{{ URL::asset('/assets/images/logo.png') }}" alt="" />
</a>
</div>
<ul class="nav navbar-nav hidden-xs">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment