summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasey Robinson <casey@rampantmonkey.com>2019-08-26 10:31:57 -0400
committerCasey Robinson <casey@rampantmonkey.com>2019-08-26 10:31:57 -0400
commitfff9d0cee3348e0f61cf4a359ae0e62c92493adb (patch)
treeb5e96e1e1d6523e04d1305ec1a6d0b67b86549ab
parent8787ba0c3900dc9f43e6f289b436ce0ba7ca31b9 (diff)
downloadrampantmonkey-fff9d0cee3348e0f61cf4a359ae0e62c92493adb.tar.gz
rampantmonkey-fff9d0cee3348e0f61cf4a359ae0e62c92493adb.tar.bz2
rampantmonkey-fff9d0cee3348e0f61cf4a359ae0e62c92493adb.zip
merge css files
-rw-r--r--website/static/css/flexgrid.css77
-rw-r--r--website/static/css/reset.css26
-rw-r--r--website/static/css/screen.css5
-rw-r--r--website/static/css/style.css (renamed from website/static/css/master.css)108
-rw-r--r--website/themes/rampantmonkey/layouts/index.html2
-rw-r--r--website/themes/rampantmonkey/layouts/partials/header.html2
6 files changed, 110 insertions, 110 deletions
diff --git a/website/static/css/flexgrid.css b/website/static/css/flexgrid.css
deleted file mode 100644
index eaeea21..0000000
--- a/website/static/css/flexgrid.css
+++ /dev/null
@@ -1,77 +0,0 @@
-.scaffold {
- font: normal 100%;
- width: 97.5%;
- max-width: 1248px;
- margin: 0 auto;
- clear: both;
-}
-
-.grid1, .grid2, .grid3, .grid4, .grid5, .grid6, .grid7, .grid8, .grid9, .grid10, .grid11, .grid12, .grid13, .grid14, .grid15, .grid16 {
- float: left;
- margin: 0 1.20192308%;
- margin-bottom: 1.875em;
-}
-
-.grid1 {
- width: 3.846153846153%;
-}
-
-.grid2 {
- width: 10.096153846153%;
-}
-
-.grid3 {
- width: 16.346153846153%;
-}
-
-.grid4 {
- width: 22.596153846153%;
-}
-
-.grid5 {
- width: 28.846153846153%;
-}
-
-.grid6 {
- width: 35.096153846153%;
-}
-
-.grid7 {
- width: 41.346153846153%;
-}
-
-.grid8 {
- width: 47.596153846153%;
-}
-
-.grid9 {
- width: 53.846153846153%;
-}
-
-.grid10 {
- width: 60.096153846153%;
-}
-
-.grid11 {
- width: 66.346153846153%;
-}
-
-.grid12 {
- width: 72.596153846153%;
-}
-
-.grid13 {
- width: 78.846153846153%;
-}
-
-.grid14 {
- width: 85.096153846153%;
-}
-
-.grid15 {
- width: 91.346153846153%;
-}
-
-.grid16 {
- width: 97.596153846153%;
-}
diff --git a/website/static/css/reset.css b/website/static/css/reset.css
deleted file mode 100644
index c80d5c3..0000000
--- a/website/static/css/reset.css
+++ /dev/null
@@ -1,26 +0,0 @@
-html, body, div, span, h1, h2, h3, h4, h5, h6, p, q, a, code, blockquote, img, ol, ou, li, form, table, td, th, tr, article, section{
- padding: 0;
- margin: 0;
- font-size: 100%;
- vertical-align: baseline;
- border: 0;
- outline: 0;
- background: transparent;
-}
-
-ol, ul{
- list-style: none;
-}
-
-blockquote, q{
- quotes: none;
-}
-
-:focus{
- outline: 0;
-}
-
-table{
- border-collapse: collapse;
- border-spacing: 0;
-}
diff --git a/website/static/css/screen.css b/website/static/css/screen.css
deleted file mode 100644
index eebf949..0000000
--- a/website/static/css/screen.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* import stylesheets and hide from IE/Mac \*/
-@import url("reset.css");
-@import url("flexgrid.css");
-@import url("master.css");
-/* end import/hide */
diff --git a/website/static/css/master.css b/website/static/css/style.css
index 4989d5a..0c29be9 100644
--- a/website/static/css/master.css
+++ b/website/static/css/style.css
@@ -1,3 +1,111 @@
+/* Reset CSS */
+html, body, div, span, h1, h2, h3, h4, h5, h6, p, q, a, code, blockquote, img, ol, ou, li, form, table, td, th, tr, article, section{
+ padding: 0;
+ margin: 0;
+ font-size: 100%;
+ vertical-align: baseline;
+ border: 0;
+ outline: 0;
+ background: transparent;
+}
+
+ol, ul{
+ list-style: none;
+}
+
+blockquote, q{
+ quotes: none;
+}
+
+:focus{
+ outline: 0;
+}
+
+table{
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+/* Flexgrid */
+.scaffold {
+ font: normal 100%;
+ width: 97.5%;
+ max-width: 1248px;
+ margin: 0 auto;
+ clear: both;
+}
+
+.grid1, .grid2, .grid3, .grid4, .grid5, .grid6, .grid7, .grid8, .grid9, .grid10, .grid11, .grid12, .grid13, .grid14, .grid15, .grid16 {
+ float: left;
+ margin: 0 1.20192308%;
+ margin-bottom: 1.875em;
+}
+
+.grid1 {
+ width: 3.846153846153%;
+}
+
+.grid2 {
+ width: 10.096153846153%;
+}
+
+.grid3 {
+ width: 16.346153846153%;
+}
+
+.grid4 {
+ width: 22.596153846153%;
+}
+
+.grid5 {
+ width: 28.846153846153%;
+}
+
+.grid6 {
+ width: 35.096153846153%;
+}
+
+.grid7 {
+ width: 41.346153846153%;
+}
+
+.grid8 {
+ width: 47.596153846153%;
+}
+
+.grid9 {
+ width: 53.846153846153%;
+}
+
+.grid10 {
+ width: 60.096153846153%;
+}
+
+.grid11 {
+ width: 66.346153846153%;
+}
+
+.grid12 {
+ width: 72.596153846153%;
+}
+
+.grid13 {
+ width: 78.846153846153%;
+}
+
+.grid14 {
+ width: 85.096153846153%;
+}
+
+.grid15 {
+ width: 91.346153846153%;
+}
+
+.grid16 {
+ width: 97.596153846153%;
+}
+
+/* Styles */
@font-face {
font-family: junction;
src: url('Junction-webfont.ttf');
diff --git a/website/themes/rampantmonkey/layouts/index.html b/website/themes/rampantmonkey/layouts/index.html
index 4bacf5f..40fc545 100644
--- a/website/themes/rampantmonkey/layouts/index.html
+++ b/website/themes/rampantmonkey/layouts/index.html
@@ -2,7 +2,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="initial-scale=1.0, width=device-width" />
-<link rel="stylesheet" type="text/css" media="screen, projection" href="css/screen.css" />
+<link rel="stylesheet" type="text/css" media="screen, projection" href="css/style.css" />
<link rel="shortcut icon" type="image/png" href="media/rmLogoSmall.png">
<title>Rampant Monkey | Home</title>
<base href="/" />
diff --git a/website/themes/rampantmonkey/layouts/partials/header.html b/website/themes/rampantmonkey/layouts/partials/header.html
index 30cc3c0..0ac4713 100644
--- a/website/themes/rampantmonkey/layouts/partials/header.html
+++ b/website/themes/rampantmonkey/layouts/partials/header.html
@@ -2,7 +2,7 @@
<title>Rampant Monkey</title>
<!--[if gte IE 7]><!-->
- <link rel="stylesheet" type="text/css" media="screen, projection" href="/css/screen.css" />
+ <link rel="stylesheet" type="text/css" media="screen, projection" href="/css/style.css" />
<link rel="shortcut icon" type="image/png" href="/media/rmLogoSmall.png">
<meta name="viewport" content="initial-scale=1.0, width=device-width" />
<meta charset="UTF-8">