wes
/
KettleBlog
1
0
Fork 0
Code Issues Pull Requests 15 Projects Releases Wiki Activity
Browse Source

fix css, uglifycss

pull/1/head
wes 8 years ago
parent
88c52a06c1
commit
36c0b5bb44
7 changed files with 32 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      fabfile.py
  2. 29
      src/scripts/app.tag
  3. 2
      src/scripts/loading.tag
  4. 2
      src/scripts/postcontrols.tag
  5. 4
      src/styles/font-awesome.min.css
  6. 16
      src/styles/riotblog.scss
  7. 7
      src/templates/index.html

1
fabfile.py
View File

@ -36,6 +36,7 @@ def copyFiles():
local("cp ./{blog.ini,blog.service,requirements.txt} ./build/") local("cp ./{blog.ini,blog.service,requirements.txt} ./build/")
local("cp ./src/*py ./build/") local("cp ./src/*py ./build/")
local("cp ./src/styles/*.css ./build/styles/") local("cp ./src/styles/*.css ./build/styles/")
local("uglifycss ./build/styles/*css > ./build/styles/primop.me.min.css")
local("cp -r ./src/templates ./build/templates") local("cp -r ./src/templates ./build/templates")
@task @task

29
src/scripts/app.tag
View File

@ -1,11 +1,11 @@
<app> <app>
<ul class="navigate tab tab-block"> <ul class="navigate tab tab-block">
<li class={"tab-item animated fadeIn " + (this.active.projects ? "active" : "")}>
<a onclick={to("projects")} href="#">Projects</a>
</li>
<li class={"tab-item " + (this.active.posts ? "active" : "")}> <li class={"tab-item " + (this.active.posts ? "active" : "")}>
<a onclick={to("posts")} href="#">Posts</a> <a onclick={to("posts")} href="#">Posts</a>
</li> </li>
<li class={"tab-item animated fadeIn " + (this.active.projects ? "active" : "")}>
<a onclick={to("projects")} href="#">Projects</a>
</li>
</ul> </ul>
<div class="content"> <div class="content">
<loading if={!this.state.loaded}></loading> <loading if={!this.state.loaded}></loading>
@ -46,19 +46,21 @@ this.active = {
var self = this; var self = this;
this.route("posts", function projects() {
function() { self.active.projects = true;
self.active.posts = false;
self.update();
}
function posts() {
self.active.posts = true; self.active.posts = true;
self.active.projects = false; self.active.projects = false;
self.update(); self.update();
}); }
this.route("projects", this.route("posts", posts);
function() { this.route("/", posts);
self.active.projects = true; this.route("projects", projects);
self.active.posts = false;
self.update();
});
to(name) { to(name) {
return (function(e) { return (function(e) {
@ -78,9 +80,6 @@ function loaduser() {
.then(function(resp) { .then(function(resp) {
self.state.projects = Z.fromList(resp.data); self.state.projects = Z.fromList(resp.data);
self.state.loaded = true; self.state.loaded = true;
if (!self.active.posts) {
self.active.projects = true;
}
self.update(); self.update();
}); });
} }

2
src/scripts/loading.tag
View File

@ -1,3 +1,3 @@
<loading> <loading>
<div class="loading"></div> <div class="loading animated fadeIn"></div>
</loading> </loading>

2
src/scripts/postcontrols.tag
View File

@ -1,5 +1,5 @@
<postcontrols> <postcontrols>
<div class="container"> <div class="controls container">
<div class="columns"> <div class="columns">
<div class="column col-6"> <div class="column col-6">
<button class={"btn btn-lg nav-button float-right " + (this.opts.state.pid <= 1 ? "disabled" : " ") + this.opts.prevloading} <button class={"btn btn-lg nav-button float-right " + (this.opts.state.pid <= 1 ? "disabled" : " ") + this.opts.prevloading}

4
src/styles/font-awesome.min.css
View File

File diff suppressed because one or more lines are too long

16
src/styles/riotblog.scss
View File

@ -2,16 +2,20 @@
text-align: center; text-align: center;
} }
.loading {
}
.navigate { .navigate {
width: 70%; width: 20% !important;
margin: auto; margin-bottom: 25px !important;
margin: auto !important;
} }
.content-box { .content-box {
display: flex; /* defines flexbox */ display: flex !important; /* defines flexbox */
flex-direction: column; /* top to bottom */ flex-direction: column !important; /* top to bottom */
justify-content: space-between; /* first item at start, last at end */ justify-content: space-between !important; /* first item at start, last at end */
position: relative; position: relative !important;
} }
.projects-box { .projects-box {

7
src/templates/index.html
View File

@ -1,10 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<head> <head>
<link rel="stylesheet" href="/styles/spectre.min.css"> <link rel="stylesheet" href="/styles/primop.me.min.css">
<link rel="stylesheet" href="/styles/riotblog.min.css">
<link rel="stylesheet" href="/styles/projects.min.css">
<link rel="stylesheet" href="/styles/animate.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
</head> </head>
@ -18,6 +15,6 @@
</footer> </footer>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script> <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script type="text/javascript" src="/blog/scripts/riotblog.min.js"></script> <script type="text/javascript" src="/scripts/riotblog.min.js"></script>
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save