tonyair/silverstripe-webpack
1
1
Fork 0
mirror of https://github.com/a2nt/silverstripe-webpack.git synced 2024-10-22 17:05:31 +02:00
Code Issues Projects Releases Wiki Activity

Minor improvements

Browse Source
This commit is contained in:
Tony Air 2018-07-02 09:34:36 +07:00
parent ce7490bc90
commit 33d64b648e
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/client/src/js/_layout.js Normal file
View File

@ -0,0 +1 @@
// your custom JS

0
app/client/src/js/main.js → app/client/src/js/_main.js
View File

6
app/client/src/js/app.js
View File

@ -23,12 +23,12 @@ Vue.use(Carousel);*/
import 'offcanvas-bootstrap/dist/js/bootstrap.offcanvas'; import 'offcanvas-bootstrap/dist/js/bootstrap.offcanvas';
// import your custom UI components import './_main';
import './main'; import './_layout';
function importAll(r) { function importAll(r) {
return r.keys().map(r); return r.keys().map(r);
} }
const images = importAll(require.context('../img/', false, /\.(png|jpe?g|svg)$/)); const images = importAll(require.context('../img/', false, /\.(png|jpe?g|svg)$/));
const fontAwesome = importAll(require.context('font-awesome', false, /\.(otf|eot|svg|ttf|woff|woff2)$/)); const fontAwesome = importAll(require.context('font-awesome', false, /\.(otf|eot|svg|ttf|woff|woff2)$/));

9
app/client/src/scss/app.scss
View File

@ -66,11 +66,20 @@ img {
a:hover, a:hover,
a:focus { a:focus {
opacity: .8; opacity: .8;
.fas,
.fab,
&.fas,
&.fab {
transform: rotate(-180deg);
}
} }
// transactions // transactions
.transition, .transition,
a, a img, a, a img,
a .fas, a .fab,
a.fas, a.fab,
button, input, optgroup, select, textarea, button, input, optgroup, select, textarea,
.btn, .btn,
.alert, .alert,

4
app/templates/Objects/SocialLinks.ss
View File

@ -13,7 +13,7 @@
<% end_if %> <% end_if %>
<% if $GooglePlus %> <% if $GooglePlus %>
<a href="$GooglePlus.URL" title="Google+" target="_blank"> <a href="$GooglePlus.URL" title="Google+" target="_blank">
<i class="fab fa-google-plus-official"></i> <i class="fab fa-google-plus-g"></i>
<i class="d-none">Google+</i> <i class="d-none">Google+</i>
</a> </a>
<% end_if %> <% end_if %>
@ -29,4 +29,4 @@
<i class="d-none">Twitter</i> <i class="d-none">Twitter</i>
</a> </a>
<% end_if %> <% end_if %>
</div> </div>