Skip to content

Commit

Permalink
Merge pull request #63 from johnliss/fix-css-lien-figwheel
Browse files Browse the repository at this point in the history
Fix css lien figwheel -DatDamZotz
  • Loading branch information
codeGlaze authored Feb 5, 2019
2 parents d874b7a + dab23b5 commit e1fd643
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 56 deletions.
8 changes: 8 additions & 0 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@
;; Compress the output?
:pretty-print? false}}]}

:prep-tasks [["garden" "once"]]

:cljsbuild {:builds
[{:id "dev"
:source-paths ["web/cljs" "src/cljc" "src/cljs"]
Expand Down Expand Up @@ -161,6 +163,12 @@
;; :server-logfile "tmp/logs/figwheel-logfile.log"
}

:repl-options {
;; If nREPL takes too long to load it may timeout,
;; increase this to wait longer before timing out.
;; Defaults to 30000 (30 seconds)
:timeout 300000 ; 5 mins to wait
}

;; setting up nREPL for Figwheel and ClojureScript dev
;; Please see:
Expand Down
Empty file.
40 changes: 21 additions & 19 deletions resources/public/blank.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,29 @@
<html>
<head lang="en">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>OrcPub</title>
<link rel="stylesheet" href="/css/style.css" type="text/css">
<link rel="stylesheet" href="/css/compiled/styles.css" type="text/css">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="The most advanced Dungeons & Dragons 5th Edition (D&D 5e) character builder/generator in the multiverse.">
<title>The New OrcPub: D&D 5e Character Builder/Generator</title>
<link rel="stylesheet" href="/css/style.css" type="text/css">
<link rel="stylesheet" href="/css/compiled/styles.css" type="text/css">
<script>
(function(d, s, id){
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>
</head>
<body style="margin:0">
<div id="app"/>

<div id="app">
<div style="display:flex;justify-content:space-around">
<img src="/image/spiral.gif" style="height:200px;width:200px;margin-top:200px">
</div>
</div>
<script src="/js/compiled/orcpub.js"></script>
<link rel="stylesheet" href="/font-awesome-4.7.0/css/font-awesome.min.css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-69209720-3', 'auto');
ga('send', 'pageview');

</script>
<link rel="stylesheet" href="/font-awesome-4.7.0/css/font-awesome.min.css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
</body>
</html>
69 changes: 64 additions & 5 deletions resources/public/css/style.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,68 @@
.splash-page-content {}
.splash-button .splash-button-content {height: 120px; width: 120px}
.splash-button .svg-icon {height: 64px; width: 64px}

@media (max-width: 767px)
{.splash-button .svg-icon {height: 32px; width: 32px}
.splash-button-title-prefix {display: none}
.splash-button .splash-button-content {height: 60px; width: 60px; font-size: 10px}
.legal-footer-parent {display: none}}

/* remember to define visible focus styles!
:focus {
outline: ?????;
} */
#app {height:100%;background-image: linear-gradient(182deg, #313A4D, #080A0D)}

/* remember to highlight inserts somehow! */
.app {background-image: linear-gradient(182deg, #313A4D, #080A0D);height:100%;overflow-y:scroll;-webkit-overflow-scrolling :touch;font-family:Open Sans, sans-serif}

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, figcaption, figure,
footer, header, hgroup, menu, nav, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
outline: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
ins {
text-decoration: none;
}
del {
text-decoration: line-through;
}

table {
border-collapse: collapse;
border-spacing: 0;
}

html, body, #app {
height: 100%;
}
1 change: 0 additions & 1 deletion resources/public/google18035ff9b05e149d.html

This file was deleted.

41 changes: 10 additions & 31 deletions resources/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,12 @@
<html>
<head lang="en">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="The most advanced Dungeons & Dragons 5th Edition (D&D 5e) character builder/generator in the multiverse.">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="The most advanced Dungeons & Dragons 5th Edition (D&D 5e) character builder/generator in the multiverse.">
<title>The New OrcPub: D&D 5e Character Builder/Generator</title>
<link rel="stylesheet" href="/css/style.css" type="text/css">
<link rel="stylesheet" href="/css/compiled/styles.css" type="text/css">
<link rel="stylesheet" href="/css/style.css" type="text/css">
<link rel="stylesheet" href="/css/compiled/styles.css" type="text/css">
<script>
window.fbAsyncInit = function() {
FB.init({
appId : '948998158489252',
xfbml : true,
version : 'v2.9'
});
FB.AppEvents.logPageView();
};

(function(d, s, id){
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
Expand All @@ -28,24 +19,12 @@
</head>
<body style="margin:0">
<div id="app">
<div style="display:flex;justify-content:space-around">
<img src="/image/spiral.gif" style="height:200px;width:200px;margin-top:200px">
</div>
</div>

<div style="display:flex;justify-content:space-around">
<img src="/image/spiral.gif" style="height:200px;width:200px;margin-top:200px">
</div>
</div>
<script src="/js/compiled/orcpub.js"></script>
<link rel="stylesheet" href="/font-awesome-4.7.0/css/font-awesome.min.css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-69209720-3', 'auto');
ga('send', 'pageview');

</script>
<link rel="stylesheet" href="/font-awesome-4.7.0/css/font-awesome.min.css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
</body>
</html>

0 comments on commit e1fd643

Please sign in to comment.