Merge branch 'master' into new_image

Add the logo to GitHub pages.
Merge pull request #7 from DanilaFe/tree-operators
2026-01-26 16:45:21 +00:00 · 2017-08-30 15:35:35 -07:00 · 2017-08-30 15:31:25 -07:00 · 2017-08-30 15:14:41 -07:00 · 2017-08-30 15:14:08 -07:00
2 changed files with 10 additions and 3 deletions
--- a/docs/_layouts/home.html
+++ b/docs/_layouts/home.html
@@ -3,7 +3,7 @@
  {% include head.html %}
  <style>
  body {
-    margin-top: 100px;
+    margin-top: 50px;
    color: white;
    text-align: center;
  }
@@ -11,7 +11,13 @@
    font-family: "Source Code Pro"
  }
-  img {
+  img#logo {
    margin: auto;
    width: 100%;
    max-width: 100px;
  }
  img#image_preview {
    margin: auto;
    width: 100%;
    max-width: 432px;
@@ -33,6 +39,7 @@
  }
  </style>
  <body>
  <img src="https://raw.githubusercontent.com/DanilaFe/abacus/master/image/logo.png" id="logo">
  <h1>Abacus</h1>
  <h2>The programmer's calculator</h2>
  <div id="buttons">
@@ -41,6 +48,6 @@
    <a class="button inverted" href="https://github.com/DanilaFe/abacus">Contribute</a>
    <a class="button inverted" href="https://github.com/DanilaFe/abacus/wiki">Wiki</a>
  </div>
-  <img src="http://i.imgur.com/Min70QY.png" title="source: imgur.com" />
+  <img src="http://i.imgur.com/Min70QY.png" title="source: imgur.com" id="image_preview"/>
  </body>
 </html>
--- a/image/logo.png
+++ b/image/logo.png
Author	SHA1	Message	Date
Danila	672252ef41	Merge branch 'master' into new_image	2017-08-30 15:35:35 -07:00
Danila Fedorin	824f391fc7	Add the logo to GitHub pages.	2017-08-30 15:31:25 -07:00
Danila	63a160659a	Merge pull request #7 from DanilaFe/tree-operators Implement tree operators and functions.	2017-08-30 15:14:41 -07:00
Danila Fedorin	879d09e5b8	Add a logo.	2017-08-30 15:14:08 -07:00