Skip to content

Commit 0eedcc6

Browse files
kgodeykgodey
authored
Revert "Ported from CSS to SASS using webpack + some documentation updates to adjust changes"
1 parent 9167c04 commit 0eedcc6

File tree

10 files changed

+127
-6398
lines changed

10 files changed

+127
-6398
lines changed

‎.lektorproject

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ target = ghpages+https://creativecommons/creativecommons.github.io
77
[packages]
88
lektor-markdown-header-anchors = 0.3.1
99
lektor-google-analytics = 0.1.3
10-
lektor-webpack-support = 0.5

‎README.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ else fails, try removing the virtual environment and reinstalling:
4343
## Development
4444

4545
1. Run `pipenv shell` to spawn a shell with the virtualenv activated
46-
1. Run `lektor server -f webpack` to start the Lektor development server. You will be able
46+
1. Run `lektor server` to start the Lektor development server. You will be able
4747
to see the website at [`http://localhost:5000/`][lektorlocal]. The Lektor
4848
server will rebuild the site every time you change any content.
4949

@@ -68,7 +68,8 @@ on production!
6868

6969
Here's how the code is structured in the top level of the repository:
7070
- **`assets`**: This directory contains the JavaScript and CSS files for the
71-
project built via webpack. Most of the JavaScript and CSS is third-party code and loaded via CDN so this is pretty empty.
71+
project. Most of the JavaScript and CSS is third-party code and loaded via
72+
CDN so this is pretty empty.
7273
- **`content`**: The content of the site lives here. [Here's an explanation of
7374
how content works in Lektor][lektorcontent]. This is probably what you'll be
7475
modifying most often.
@@ -78,8 +79,6 @@ Here's how the code is structured in the top level of the repository:
7879
- **`templates`**: This is where the [Jinja2][jinja2] templates that render
7980
content are stored. See the [Lektor template documentation][lektortemplate]
8081
for more information.
81-
- **`webpack`**: This is where all the webpack config files as well as Sass and
82-
JavaScript files for the project resides. The JavaScript and Sass files are compiled and saved in assets folder during lektor build process.
8382

8483
[lektorcontent]:https://www.getlektor.com/docs/content/
8584
[lektormodels]:(https://www.getlektor.com/docs/models/

‎webpack/js/main.js renamed to ‎assets/static/script.js

File renamed without changes.

‎assets/static/style.css

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
body {
2+
font-family: 'Source Sans Pro', sans-serif;
3+
color: #333333;
4+
}
5+
h2 {
6+
font-weight: 600;
7+
padding-bottom: 0.5rem;
8+
}
9+
.page-content {
10+
position: relative;
11+
min-height: calc(100vh - 21vh);
12+
padding-bottom: 3rem;
13+
}
14+
.main-header .navbar-brand {
15+
margin-right: 2rem;
16+
}
17+
.main-header .navbar-brand img {
18+
width: 250px;
19+
}
20+
.main-header .navbar-brand .legend {
21+
display: block;
22+
font-size: .9rem;
23+
letter-spacing: .15rem;
24+
}
25+
.footer {
26+
bottom: 0;
27+
}
28+
.card-columns {
29+
column-count: 2;
30+
}
31+
.main-header {
32+
background-color: #EE5B32;
33+
}
34+
.navbar {
35+
background-image:linear-gradient(90deg,#EE5B32,#FB7928,#EE5B32);
36+
background-size: 100% 130px;
37+
background-position-y: bottom
38+
}
39+
.page-title {
40+
background-color: #fff;
41+
border-bottom-style: solid;
42+
border-color: #EE5B32;
43+
border-width: 10px;
44+
padding-left: 0px;
45+
font-weight: 600;
46+
color: #333333;
47+
}
48+
.featured-project-card {
49+
background-color: #fff;
50+
border-left-color: #00b5da !important;
51+
border-left-width: 10px;
52+
padding-left: 0px;
53+
min-width: 20rem;
54+
max-width: 20rem;
55+
}
56+
.badge-featured-project {
57+
background-color: #00b5da;
58+
color: white;
59+
font-size: 0.8rem;
60+
}
61+
.project-idea-header {
62+
background-color: #fff;
63+
border-color: #00b5da;
64+
border-width: 10px;
65+
padding-left: 0px;
66+
font-size: 1.5em;
67+
}
68+
#back-to-top {
69+
cursor: pointer;
70+
position: fixed;
71+
bottom: 20px;
72+
right: 20px;
73+
display: none;
74+
background-color: #00b5da;
75+
border: none;
76+
}
77+
.nav-item, .dropdown-item {
78+
font-size: 1.2em;
79+
text-align: center;
80+
}
81+
.dropdown:hover .dropdown-menu {
82+
display: block;
83+
}
84+
.dropdown-menu {
85+
margin-top: 0px;
86+
}
87+
.nav-item:hover{
88+
background: #e15803!important;
89+
}
90+
.navbar-dark .navbar-nav .nav-item .nav-link {
91+
color: white;
92+
line-height: 1rem;
93+
border-left: 1px solid rgba(255, 255, 255, 0.6)
94+
}
95+
.navbar-dark .navbar-toggler {
96+
border-color: rgba(255,255,255);
97+
}
98+
.navbar-dark .navbar-nav .nav-item.active .nav-link {
99+
background: #e15803!important;
100+
}
101+
@media only screen and (max-width : 1200px) {
102+
.navbar-dark .navbar-nav .nav-item .nav-link {
103+
border: None;
104+
text-align: center;
105+
}
106+
}
107+
.toc-card {
108+
width: 18rem;
109+
margin-bottom: 1rem;
110+
float: right;
111+
margin: 1rem;
112+
}
113+
.toc {
114+
margin-bottom: 0;
115+
}
116+
.main-footer .footer small {
117+
display: flex;
118+
align-items: center;
119+
}
120+
.main-footer .footer small .text-muted {
121+
margin-left: 2rem;
122+
}

‎templates/layout.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<link rel="shortcut icon" type="image/x-icon" href="{{ '/static/favicon.ico'|url }}">
55
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
66
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet">
7-
<link rel="stylesheet" href="{{ '/static/gen/style.css'|url }}">
7+
<link rel="stylesheet" href="{{ '/static/style.css'|url }}">
88
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
99
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
1010
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
11-
<script type="text/javascript" src="{{ '/static/gen/script.js'|url }}"></script>
11+
<script type="text/javascript" src="{{ '/static/script.js'|url }}"></script>
1212
<title>{% block title %}Welcome{% endblock %} — Creative Commons on GitHub</title>
1313
<body>
1414
<div class="ga-script">{{ generate_google_analytics() }}</div>

0 commit comments

Comments
 (0)