Skip to content

Commit b6da42c

Browse files
jakemaskjakemask
committed
Rework site style and update bootstrap
1 parent c0df911 commit b6da42c

File tree

95 files changed

+9348
-1240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+9348
-1240
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ Thumbs.db
99
.rbenv-version
1010
.rvmrc
1111
*.swp
12+
13+
.sass-cache/*

‎index.md renamed to ‎00-index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
layout: page
33
title: SIGINT
44
tagline: "UCSD CTF"
5+
permalink: /
6+
group: navigation
57
---
68
{% include JB/setup %}
79

810
<div class="posts">
911
{% for post in site.posts %}
12+
<div class="post">
1013
<h2 style="border-bottom: 1px solid #eee;">
1114
<a style="color:#444;" href="{{ BASE_PATH}}{{ post.url }}">
1215
{{post.title}}
@@ -16,5 +19,6 @@ tagline: "UCSD CTF"
1619
<p style="margin-top: -10px;"><em>{{ post.date | date_to_string }}</em></p>
1720
<div>{{ post.excerpt }}</div>
1821
<p><strong><a href="{{ post.url }}">Read more...</a></strong></p>
22+
</div>
1923
{% endfor %}
2024
</div>

‎404.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎404.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: page
3+
title: 404
4+
tagline: Not Found
5+
---
6+
7+
Sorry this page does not exist =(

‎_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# For more see: http://jekyllrb.com/docs/permalinks/
33
permalink: /:categories/:year/:month/:day/:title
44

5-
exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md"]
6-
pygments: true
5+
exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md", ".gitignore", "CNAME"]
6+
highlighter: pygments
77

88
excerpt_separator: <!--more-->
99
# Themes are encouraged to use these universal variables

‎_includes/themes/twitter/default.html

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
<!-- Enable responsive viewport -->
1010
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1111

12-
<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
12+
<!-- HTML5 shim, for IE6-8 support of HTML elements -->
1313
<!--[if lt IE 9]>
1414
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
1515
<![endif]-->
1616

17-
<!-- Le styles -->
18-
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.2.2.2.min.css" rel="stylesheet">
17+
<!-- styles -->
18+
<link href="{{ ASSET_PATH }}/css/theme.css" rel="stylesheet" type="text/css">
1919
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
20+
<link href="{{ ASSET_PATH }}/css/syntax.css" rel="stylesheet" type="text/css">
2021

21-
<!-- Le fav and touch icons -->
22+
<!-- fav and touch icons -->
2223
<!-- Update these with your own images
2324
<link rel="shortcut icon" href="images/favicon.ico">
2425
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
@@ -33,18 +34,20 @@
3334
</head>
3435

3536
<body>
36-
<div class="navbar">
37-
<div class="navbar-inner">
38-
<div class="container-narrow">
39-
<a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
40-
<ul class="nav">
37+
<nav class="navbar navbar-fixed-top">
38+
<div class="container-fluid">
39+
<div class ="navbar-header">
40+
<a class="navbar-brand" href="{{ HOME_PATH }}">
41+
<img src="{{ ASSET_PATH }}/sigint-logo.png" alt="{{ site.title }}">
42+
</a>
43+
</div>
44+
<ul class="nav navbar-nav">
4145
{% assign pages_list = site.pages %}
4246
{% assign group = 'navigation' %}
4347
{% include JB/pages_list %}
4448
</ul>
4549
</div>
46-
</div>
47-
</div>
50+
</nav>
4851

4952
<div class="container-narrow">
5053

‎_sass/_bootstrap.scss

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// Core variables and mixins
2+
@import "bootstrap/variables";
3+
@import "bootstrap/mixins";
4+
5+
// Reset and dependencies
6+
@import "bootstrap/normalize";
7+
@import "bootstrap/print";
8+
@import "bootstrap/glyphicons";
9+
10+
// Core CSS
11+
@import "bootstrap/scaffolding";
12+
@import "bootstrap/type";
13+
@import "bootstrap/code";
14+
@import "bootstrap/grid";
15+
@import "bootstrap/tables";
16+
@import "bootstrap/forms";
17+
@import "bootstrap/buttons";
18+
19+
// Components
20+
@import "bootstrap/component-animations";
21+
@import "bootstrap/dropdowns";
22+
@import "bootstrap/button-groups";
23+
@import "bootstrap/input-groups";
24+
@import "bootstrap/navs";
25+
@import "bootstrap/navbar";
26+
@import "bootstrap/breadcrumbs";
27+
@import "bootstrap/pagination";
28+
@import "bootstrap/pager";
29+
@import "bootstrap/labels";
30+
@import "bootstrap/badges";
31+
@import "bootstrap/jumbotron";
32+
@import "bootstrap/thumbnails";
33+
@import "bootstrap/alerts";
34+
@import "bootstrap/progress-bars";
35+
@import "bootstrap/media";
36+
@import "bootstrap/list-group";
37+
@import "bootstrap/panels";
38+
@import "bootstrap/responsive-embed";
39+
@import "bootstrap/wells";
40+
@import "bootstrap/close";
41+
42+
// Components w/ JavaScript
43+
@import "bootstrap/modals";
44+
@import "bootstrap/tooltip";
45+
@import "bootstrap/popovers";
46+
@import "bootstrap/carousel";
47+
48+
// Utility classes
49+
@import "bootstrap/utilities";
50+
@import "bootstrap/responsive-utilities";

‎_sass/_bootswatch.scss

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
// Readable 3.3.5
2+
// Bootswatch
3+
// -----------------------------------------------------
4+
5+
$web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700" !default;
6+
@import url($web-font-path);
7+
8+
// Navbar =====================================================================
9+
10+
.navbar {
11+
font-family: $headings-font-family;
12+
13+
&-nav,
14+
&-form {
15+
margin-left: 0;
16+
margin-right: 0;
17+
}
18+
19+
&-nav > li > a {
20+
$margin-vertical: (($navbar-height - 2*$padding-base-vertical - $line-height-computed - 2px) / 2);
21+
margin: $margin-vertical 6px;
22+
padding: $padding-base-vertical $padding-base-horizontal;
23+
border: 1px solid transparent;
24+
border-radius: $border-radius-base;
25+
26+
&:hover {
27+
border: 1px solid #ddd;
28+
}
29+
}
30+
31+
&-nav > .active > a,
32+
&-nav > .active > a:hover {
33+
border: 1px solid #ddd;
34+
}
35+
36+
&-default .navbar-nav > .active > a:hover {
37+
color: $navbar-default-link-hover-color;
38+
}
39+
40+
&-inverse .navbar-nav > .active > a:hover {
41+
color: $navbar-inverse-link-hover-color;
42+
}
43+
44+
&-brand {
45+
padding-top: (($navbar-height - 2*$font-size-large) / 2);
46+
padding-bottom: (($navbar-height - 2*$font-size-large) / 2);
47+
line-height: 1.9;
48+
}
49+
}
50+
51+
@media (min-width: $grid-float-breakpoint) {
52+
.navbar {
53+
.navbar-nav > li > a {
54+
padding: $padding-base-vertical $padding-base-horizontal;
55+
}
56+
}
57+
}
58+
59+
@media (max-width: ($grid-float-breakpoint - 1)) {
60+
.navbar {
61+
.navbar-nav > li > a {
62+
margin: 0;
63+
}
64+
}
65+
}
66+
67+
// Buttons ====================================================================
68+
69+
.btn {
70+
font-family: $headings-font-family;
71+
}
72+
73+
// Typography =================================================================
74+
75+
// Tables =====================================================================
76+
77+
// Forms ======================================================================
78+
79+
legend {
80+
font-family: $headings-font-family;
81+
}
82+
83+
.input-group-addon {
84+
font-family: $font-family-sans-serif;
85+
}
86+
87+
// Navs =======================================================================
88+
89+
.nav {
90+
.open > a,
91+
.open > a:hover,
92+
.open > a:focus {
93+
border: 1px solid #ddd;
94+
}
95+
}
96+
97+
.pagination {
98+
99+
font-family: $headings-font-family;
100+
101+
&-lg > li > a,
102+
&-lg > li > span {
103+
padding: 14px 24px;
104+
}
105+
}
106+
107+
.pager {
108+
109+
font-family: $headings-font-family;
110+
111+
a {
112+
color: $text-color;
113+
}
114+
115+
a:hover {
116+
border-color: transparent;
117+
color: #fff;
118+
}
119+
120+
.disabled a {
121+
border-color: $pager-border;
122+
}
123+
}
124+
125+
// Indicators =================================================================
126+
127+
.close {
128+
color: #fff;
129+
text-decoration: none;
130+
text-shadow: none;
131+
opacity: 0.4;
132+
133+
&:hover,
134+
&:focus {
135+
color: #fff;
136+
opacity: 1;
137+
}
138+
}
139+
140+
.alert {
141+
.alert-link {
142+
color: $alert-success-text;
143+
text-decoration: underline;
144+
}
145+
}
146+
147+
.label {
148+
font-family: $headings-font-family;
149+
font-weight: normal;
150+
151+
&-default {
152+
border: 1px solid #ddd;
153+
color: $text-color;
154+
}
155+
156+
}
157+
158+
.badge {
159+
padding: 1px 7px 5px;
160+
vertical-align: 2px;
161+
font-family: $headings-font-family;
162+
font-weight: normal;
163+
}
164+
165+
// Progress bars ==============================================================
166+
167+
// Containers =================================================================
168+
169+
.panel {
170+
@include box-shadow(none);
171+
172+
&-default {
173+
.close {
174+
color: $text-color;
175+
}
176+
}
177+
}
178+
179+
.modal {
180+
.close {
181+
color: $text-color;
182+
}
183+
}

0 commit comments

Comments
 (0)