diff --git a/_includes/head.html b/_includes/head.html
index b900620..361cc0c 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,24 +6,24 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/_layouts/default.html b/_layouts/default.html
index cb28743..aab7615 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,7 +8,7 @@
-
+
diff --git a/css/style.css b/_sass/_chaospott.scss
similarity index 51%
rename from css/style.css
rename to _sass/_chaospott.scss
index e911c5a..9ed78c0 100644
--- a/css/style.css
+++ b/_sass/_chaospott.scss
@@ -7,52 +7,70 @@
* {
background-color:transparent;
- font-family: 'Share Tech', sans-serif;
+ font-family: $base-font-family;
}
body, .jumbotron {
- background-color:#d2d4bc;
-}
-
-.jumbotron h1 {
- font-size:26px;
- font-weight:bold;
- margin-top:50px;
-}
-
-.navbar {
-/* background-color:#350505; */
-background-color:#d2d4bc;
-border:none;
-}
-
-ul.navbar-nav li a {
- color:#800032 !important;
-}
-
-.btn-default {
- border:0;
- background-color:transparent;
- color:#800032;
-}
-
-a {
- color:#800032;
-}
-
-a:visited {
- color:#800032;
-}
-
-.row {
- padding:50px 0;
+ background-color:$background-color;
}
.jumbotron {
margin:0;
padding:0;
+
+ h1 {
+ font-size:26px;
+ font-weight:bold;
+ margin-top:50px;
+ }
+
+ &>hr {
+ background-color:#333;
+ height:1px;
+ border: 3px #333 solid;
+ width:300px;
+ }
}
+.navbar {
+ background-color:$background-color;
+ border:none;
+
+ .divider-vertical {
+ height: 20px;
+ margin: 14px 9px;
+ border-right: 1px solid $nav-link-color;
+ border-left: 1px solid $nav-link-color;
+ }
+}
+
+ul.navbar-nav li a {
+ color:$nav-link-color !important;
+}
+
+.btn-default {
+ border:0;
+ background-color:transparent;
+ color: $nav-link-color;
+}
+
+a {
+ color:$nav-link-color;
+
+ &:visited {
+ color:$nav-link-color;
+ }
+}
+
+
+.row {
+ padding:50px 0;
+
+ &-centered {
+ text-align: center;
+ margin: 0;
+ }
+}
#large-header {
background-color:#222;
@@ -60,17 +78,14 @@ a:visited {
margin:0;
padding:0;
margin-bottom:30px;
+
+ img {
+ position:relative;
+ top:30px;
+ width: 300px;
+ }
}
-#large-header img {
- position:relative;
- top:30px;
-}
-
-.row-centered {
- text-align:center;
- margin:0;
-}
.col-centered {
display:inline-block;
float:none;
@@ -79,14 +94,7 @@ a:visited {
}
ul.nav>li>a {
- color:#800032;
-}
-
-.jumbotron>hr {
- background-color:#333;
- height:1px;
- border: 3px #333 solid;
- width:300px;
+ color:$nav-link-color;
}
.post-content img {
@@ -95,7 +103,7 @@ ul.nav>li>a {
}
#status_open, #status_closed {
- display:none;
+ display:none;
border:0;
}
@@ -108,36 +116,34 @@ ul.nav>li>a {
}
#status_bar {
- margin:0;
+ margin:0;
border-width:2px 0;
border-color:transparent;
}
-.navbar .divider-vertical {
-height: 20px;
-margin: 14px 9px;
-border-right: 1px solid #800032;
-border-left: 1px solid #800032;
-}
.navbar-inverse .divider-vertical {
-border-right-color: #222222;
-border-left-color: #111111;
+ border-right-color: #222222;
+ border-left-color: #111111;
}
@media (max-width: 767px) {
-.navbar-collapse .nav > .divider-vertical {
+ #large-header {
+ display: none;
+ }
+
+ .navbar-collapse .nav > .divider-vertical {
display: none;
}
}
rect.bordered {
- stroke: #D2D4BC;
- stroke-width:1px;
+ stroke: $background-color;
+ stroke-width:1px;
}
#posts div div p img {
- max-width: 123px;
- float:left;
- margin-right: 5px;
+ max-width: 123px;
+ float:left;
+ margin-right: 5px;
}
\ No newline at end of file
diff --git a/css/main.scss b/css/main.scss
index f03d1c3..b5d6767 100755
--- a/css/main.scss
+++ b/css/main.scss
@@ -6,7 +6,7 @@
// Our variables
-$base-font-family: Helvetica, Arial, sans-serif;
+$base-font-family: 'Share Tech', sans-serif;
$base-font-size: 16px;
$small-font-size: $base-font-size * 0.875;
$base-line-height: 1.5;
@@ -14,7 +14,7 @@ $base-line-height: 1.5;
$spacing-unit: 30px;
$text-color: #111;
-$background-color: #fdfdfd;
+$background-color: #d2d4bc;
$brand-color: #2a7ae2;
$grey-color: #828282;
@@ -24,6 +24,8 @@ $grey-color-dark: darken($grey-color, 25%);
$on-palm: 600px;
$on-laptop: 800px;
+$nav-link-color: #800032;
+
// Using media queries with like this:
@@ -45,5 +47,8 @@ $on-laptop: 800px;
@import
"base",
"layout",
- "syntax-highlighting"
+ "syntax-highlighting",
+ "chaospott"
;
+
+
diff --git a/android-chrome-144x144.png b/favicon/android-chrome-144x144.png
similarity index 100%
rename from android-chrome-144x144.png
rename to favicon/android-chrome-144x144.png
diff --git a/android-chrome-192x192.png b/favicon/android-chrome-192x192.png
similarity index 100%
rename from android-chrome-192x192.png
rename to favicon/android-chrome-192x192.png
diff --git a/android-chrome-36x36.png b/favicon/android-chrome-36x36.png
similarity index 100%
rename from android-chrome-36x36.png
rename to favicon/android-chrome-36x36.png
diff --git a/android-chrome-48x48.png b/favicon/android-chrome-48x48.png
similarity index 100%
rename from android-chrome-48x48.png
rename to favicon/android-chrome-48x48.png
diff --git a/android-chrome-72x72.png b/favicon/android-chrome-72x72.png
similarity index 100%
rename from android-chrome-72x72.png
rename to favicon/android-chrome-72x72.png
diff --git a/android-chrome-96x96.png b/favicon/android-chrome-96x96.png
similarity index 100%
rename from android-chrome-96x96.png
rename to favicon/android-chrome-96x96.png
diff --git a/android-chrome-manifest.json b/favicon/android-chrome-manifest.json
similarity index 62%
rename from android-chrome-manifest.json
rename to favicon/android-chrome-manifest.json
index 9ce639f..1b7a8c9 100644
--- a/android-chrome-manifest.json
+++ b/favicon/android-chrome-manifest.json
@@ -2,37 +2,37 @@
"name": "Chsospott",
"icons": [
{
- "src": "\/android-chrome-36x36.png",
+ "src": "\/favicon\/android-chrome-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
- "src": "\/android-chrome-48x48.png",
+ "src": "\/favicon\/android-chrome-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
- "src": "\/android-chrome-72x72.png",
+ "src": "\/favicon\/android-chrome-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
- "src": "\/android-chrome-96x96.png",
+ "src": "\/favicon\/android-chrome-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
- "src": "\/android-chrome-144x144.png",
+ "src": "\/favicon\/android-chrome-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
- "src": "\/android-chrome-192x192.png",
+ "src": "\/favicon\/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
diff --git a/apple-touch-icon-114x114.png b/favicon/apple-touch-icon-114x114.png
similarity index 100%
rename from apple-touch-icon-114x114.png
rename to favicon/apple-touch-icon-114x114.png
diff --git a/apple-touch-icon-120x120.png b/favicon/apple-touch-icon-120x120.png
similarity index 100%
rename from apple-touch-icon-120x120.png
rename to favicon/apple-touch-icon-120x120.png
diff --git a/apple-touch-icon-144x144.png b/favicon/apple-touch-icon-144x144.png
similarity index 100%
rename from apple-touch-icon-144x144.png
rename to favicon/apple-touch-icon-144x144.png
diff --git a/apple-touch-icon-152x152.png b/favicon/apple-touch-icon-152x152.png
similarity index 100%
rename from apple-touch-icon-152x152.png
rename to favicon/apple-touch-icon-152x152.png
diff --git a/apple-touch-icon-180x180.png b/favicon/apple-touch-icon-180x180.png
similarity index 100%
rename from apple-touch-icon-180x180.png
rename to favicon/apple-touch-icon-180x180.png
diff --git a/apple-touch-icon-57x57.png b/favicon/apple-touch-icon-57x57.png
similarity index 100%
rename from apple-touch-icon-57x57.png
rename to favicon/apple-touch-icon-57x57.png
diff --git a/apple-touch-icon-60x60.png b/favicon/apple-touch-icon-60x60.png
similarity index 100%
rename from apple-touch-icon-60x60.png
rename to favicon/apple-touch-icon-60x60.png
diff --git a/apple-touch-icon-72x72.png b/favicon/apple-touch-icon-72x72.png
similarity index 100%
rename from apple-touch-icon-72x72.png
rename to favicon/apple-touch-icon-72x72.png
diff --git a/apple-touch-icon-76x76.png b/favicon/apple-touch-icon-76x76.png
similarity index 100%
rename from apple-touch-icon-76x76.png
rename to favicon/apple-touch-icon-76x76.png
diff --git a/apple-touch-icon-precomposed.png b/favicon/apple-touch-icon-precomposed.png
similarity index 100%
rename from apple-touch-icon-precomposed.png
rename to favicon/apple-touch-icon-precomposed.png
diff --git a/mstile-144x144.png b/favicon/mstile-144x144.png
similarity index 100%
rename from mstile-144x144.png
rename to favicon/mstile-144x144.png
diff --git a/mstile-150x150.png b/favicon/mstile-150x150.png
similarity index 100%
rename from mstile-150x150.png
rename to favicon/mstile-150x150.png
diff --git a/mstile-310x150.png b/favicon/mstile-310x150.png
similarity index 100%
rename from mstile-310x150.png
rename to favicon/mstile-310x150.png
diff --git a/mstile-310x310.png b/favicon/mstile-310x310.png
similarity index 100%
rename from mstile-310x310.png
rename to favicon/mstile-310x310.png
diff --git a/mstile-70x70.png b/favicon/mstile-70x70.png
similarity index 100%
rename from mstile-70x70.png
rename to favicon/mstile-70x70.png