diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 04ddb09..215de9a 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,17 +1,11 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -
-
-
- {{ .Content }} -
+
+
+ {{ .Content }} - {{ if .Site.DisqusShortname }} -
- {{ partial "disqus.html" . }} -
- {{ end }} + {{ partial "disqus.html" . }}
diff --git a/layouts/doc/single.html b/layouts/doc/single.html index 4eb0060..d1c839e 100644 --- a/layouts/doc/single.html +++ b/layouts/doc/single.html @@ -1,19 +1,15 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -
-
-
+
+
+
{{ partial "menu" . }}
-
- {{ .Content }} - - {{ if .Site.DisqusShortname }} -
- {{ partial "disqus.html" . }} -
- {{ end }} +
+
+ {{ .Content }} +
diff --git a/layouts/home/index.html b/layouts/home/index.html new file mode 100644 index 0000000..550ab24 --- /dev/null +++ b/layouts/home/index.html @@ -0,0 +1,36 @@ +{{ partial "header.html" . }} + +
+ +
+ {{ partial "navbar.html" . }} +
+ +
+
+ {{ .Content }} +
+
+ +
+ +
+
+ +
+
+
+
+ {{ range $index, $element := .Data.Pages }} + {{ if eq .Section "features" }} +
+ {{ .Content }} +
+ {{ end }} + {{ end }} +
+
+
+
+ +{{ partial "footer.html" . }} diff --git a/static/scripts/main.js b/layouts/home/list.html similarity index 100% rename from static/scripts/main.js rename to layouts/home/list.html diff --git a/layouts/index.html b/layouts/index.html deleted file mode 100644 index fa60ef7..0000000 --- a/layouts/index.html +++ /dev/null @@ -1,14 +0,0 @@ -{{ partial "header" . }} -{{ partial "navbar" . }} - -
-
-
- {{ range .Site.Pages }} - {{ .Content }} - {{ end }} -
-
-
- -{{ partial "footer" . }} diff --git a/layouts/page/single.html b/layouts/page/single.html index 4eb0060..29bf52c 100644 --- a/layouts/page/single.html +++ b/layouts/page/single.html @@ -1,19 +1,17 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -
-
-
+
+
+
{{ partial "menu" . }}
-
- {{ .Content }} +
+
+ {{ .Content }} - {{ if .Site.DisqusShortname }} -
- {{ partial "disqus.html" . }} -
- {{ end }} + {{ partial "disqus.html" . }} +
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index b3b60d6..27ea690 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,24 +1,49 @@ - - - - - + + + diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index d58f276..e020046 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -1,13 +1,20 @@ - \ No newline at end of file diff --git a/layouts/partials/pages.html b/layouts/partials/pages.html index ae6ca04..ce399e6 100644 --- a/layouts/partials/pages.html +++ b/layouts/partials/pages.html @@ -1,29 +1,28 @@ - diff --git a/layouts/partials/toplinks.html b/layouts/partials/toplinks.html index bb7b45b..c4875db 100644 --- a/layouts/partials/toplinks.html +++ b/layouts/partials/toplinks.html @@ -1,8 +1,7 @@ + {{ $currentNode := . }}{{ range .Site.Menus.page }} -
  • - - - {{ .Name }} - -
    • + +   + {{ .Name }} + {{ end }} diff --git a/layouts/post/list.html b/layouts/post/list.html index 5ca1739..6aea8d3 100644 --- a/layouts/post/list.html +++ b/layouts/post/list.html @@ -1,61 +1,40 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -
    -
    -
    - {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}{{ range $paginator.Pages }} - - {{ end }} - - {{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }} -
    - {{ if and (.Paginator.HasPrev) (.Paginator.HasNext) }} - {{ i18n "page_prev" }} - {{ i18n "page_next" }} - {{ end }} - {{ if and (.Paginator.HasPrev) (not .Paginator.HasNext) }} - {{ i18n "page_prev" }} - {{ i18n "page_next" }} - {{ end }} - {{ if and (not .Paginator.HasPrev) (.Paginator.HasNext) }} - {{ i18n "page_prev" }} - {{ i18n "page_next" }} - {{ end }} +
    - {{ end }} -
    - {{ if .Site.DisqusShortname }} -
    - {{ partial "disqus.html" . }} +
    + {{ .Summary }} +
    + + + {{ i18n "read_more" }} +
    +
    + {{ end }} + +
    + {{ if .Paginator.HasNext }} + {{ i18n "page_next" }} + {{ end }} +
    -{{ partial "footer.html" . }} - +{{ partial "footer.html" . }} \ No newline at end of file diff --git a/layouts/post/single.html b/layouts/post/single.html index 4172c88..690dcd4 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -1,38 +1,26 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -
    -
    -
    - -
    + {{ partial "disqus.html" . }}
    diff --git a/package.json b/package.json index 351442d..9b95ee6 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ "watch": "gulp watch" }, "dependencies": { - "bootstrap": "4.0.0-alpha.5" + "bulma": "^0.7.1", + "bulmaswatch": "^0.6.2" }, "devDependencies": { "gulp": "^3.9.1", diff --git a/src/colors.scss b/src/colors.scss deleted file mode 100644 index ed755ac..0000000 --- a/src/colors.scss +++ /dev/null @@ -1,15 +0,0 @@ -//Palette generated by Material Palette -//materialpalette.com/light-green/orange -$primary-color-dark: #689F38; -$primary-color: #8BC34A; -$primary-color-light: #DCEDC8; -$primary-color-text: #212121; -$accent-color: #FF9800; -$primary-text-color: #212121; -$secondary-text-color: #757575; -$divider-color: #BDBDBD; - -//Set bootstrap colors -$brand-primary: $primary-color; -$body-color: $primary-text-color; -$code-color: darken($accent-color, 10); diff --git a/src/landingpage.scss b/src/landingpage.scss deleted file mode 100644 index d8e825c..0000000 --- a/src/landingpage.scss +++ /dev/null @@ -1,19 +0,0 @@ -.landingpage { - @extend .content; - text-align: center; - - .jumbotron { - background: none; - } - - .logo { - width: 220px; - max-width:100%; - } - - svg.octicon { - height: 24px; - margin-right: 8px; - fill: $brand-primary; - } -} diff --git a/src/main.scss b/src/main.scss index 331af25..ead0dbc 100644 --- a/src/main.scss +++ b/src/main.scss @@ -1,75 +1,125 @@ -@import "colors"; -@import "../node_modules/bootstrap/scss/bootstrap"; - -@import "landingpage"; - -.navbar { - padding: 21px 32px; - border-bottom: 1px solid $accent-color; +*, *:hover, *:active, *:focus{ + outline: none; } -.navbar-brand { - padding: 0; +@import '../node_modules/bulmaswatch/flatly/variables'; +@import "../node_modules/bulma/bulma"; +@import '../node_modules/bulmaswatch/flatly/overrides'; - img { - height: 38px; +.homepage-hero{ + height: 100vh; + min-height: 700px; + overflow: hidden; + + .hero-body .container{ + padding: 3em 0 1em; + + .button:first-child{ + margin-right: 1em; + } + } + + .hero-foot img { + max-width: 100vw; + width: 1000px; + display: block; + margin: 0 auto; } } -#navbar-responsive { - clear: right; -} +.feature-shoutout { + font-size: 1.2em; -.footer { - width: 100%; - padding: 32px 0; - background-color: #f7f7f9; + svg{ + height: 36px; + vertical-align: middle; + padding-right: 5px; + fill: #fff; + } - p { - margin: 0; - padding: 16px 0; + a{ + color: darken($turquoise, 20%) !important; } } -.content { - margin: 64px auto; +.page{ + margin: 2em auto; - pre { - padding: 16px; - background-color: $code-bg; - } + .card{ + margin-bottom: 2em; - blockquote{ - @extend .blockquote; - } -} + background-color: #fff; + box-shadow: 0 2px 3px rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.1); + color: #4a4a4a; + max-width: 100%; + position: relative; + border: none; + border-radius: 0.2em; -aside ul.nav { - @include media-breakpoint-up(sm) { - border-right: 1px solid lighten($accent-color, 30); - } - - ul { - margin: 0; - padding: 8px; - margin-left: -8px; - margin-bottom: 16px; - margin-right: 16px; - border-top: 1px dashed lighten($accent-color, 30); - } - - li { - list-style: none; - margin:0; - padding: 0; - - li a { - font-size: 0.9rem; + .media-content a{ + display: block; } } } -// see https://github.com/go-gitea/theme/issues/48 -article img { - max-width: 100%; +// Mobile Styles + +.navbar-background{ + -webkit-transition: opacity ease 300ms; + transition: opacity ease 300ms; + + opacity: 0; } + +.navbar-menu{ + -webkit-transition: all ease 300ms; + transition: all ease 300ms; +} + +@media screen and (max-width:1087px){ + .navbar-menu{ + position: fixed; + bottom: 0; + top: 0; + left: -160px; + z-index: 2; + opacity: 1; + display: block; + } +} + +.navbar-menu .logo{ + display: none; +} + +.navbar-menu.is-active{ + -webkit-transition: all ease 300ms; + transition: all ease 300ms; + left: 0; + + .navbar-item{ + padding: 0.5em 2em 0.5em 1.5em; + } + + .logo{ + display: block; + } +} + +.navbar-burger.burger{ + position: fixed; + top: 0; + right: 0; + z-index: 3; +} + +.navbar-background.is-active{ + background: rgba(0,0,0,0.5); + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 1; + opacity: 1; +} \ No newline at end of file diff --git a/static/images/screenshot.jpg b/static/images/screenshot.jpg new file mode 100644 index 0000000..e4188bf Binary files /dev/null and b/static/images/screenshot.jpg differ