Various website updates (apache#1076)

* update ruby gems and fix sass issues * remove unnecssary console log in main.js
XiaoMaoGuai · Jan 17, 2018 · fdf7fa3 · fdf7fa3
1 parent 3212fa8
commit fdf7fa3
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 66 deletions.
diff --git a/site/Gemfile b/site/Gemfile
@@ -20,8 +20,4 @@
 source 'https://rubygems.org'
 ruby '2.4.1'
 
-gem 'jekyll', '3.4.3'
-
-group :jekyll_plugins do
-  gem 'jekyll-livereload'
-end
+gem 'jekyll', '3.7.0'
diff --git a/site/Gemfile.lock b/site/Gemfile.lock
@@ -1,59 +1,66 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
+    concurrent-ruby (1.0.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.3)
+    eventmachine (1.2.5)
     ffi (1.9.18)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    jekyll (3.4.3)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.7.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 3.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-livereload (0.2.2)
-      em-websocket (~> 0.5)
-      jekyll (~> 3.0)
-    jekyll-sass-converter (1.5.0)
+    jekyll-sass-converter (1.5.1)
       sass (~> 3.4)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    kramdown (1.13.2)
-    liquid (3.0.6)
-    listen (3.0.8)
+    jekyll-watch (2.0.0)
+      listen (~> 3.0)
+    kramdown (1.16.2)
+    liquid (4.0.0)
+    listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    pathutil (0.14.0)
+    pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rouge (1.11.1)
+    public_suffix (3.0.1)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rouge (3.1.0)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.4.24)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (= 3.4.3)
-  jekyll-livereload
+  jekyll (= 3.7.0)
 
 RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.15.1
+   1.16.0
diff --git a/site/Makefile b/site/Makefile
@@ -1,6 +1,6 @@
-BUNDLER_VERSION = 1.15.1
-BUNDLE = bundle _${BUNDLER_VERSION}_
-JEKYLL = ${BUNDLE} exec jekyll
+BUNDLER_VERSION = 1.16
+BUNDLE = bundle _$(BUNDLER_VERSION)_
+JEKYLL = $(BUNDLE) exec jekyll
 
 deep_clean:
 	rm -rf \
@@ -24,10 +24,10 @@ clean_local:
 
 ruby_setup:
 	gem install bundler \
-		-v ${BUNDLER_VERSION} \
+		-v $(BUNDLER_VERSION) \
 		--no-rdoc \
 		--no-ri
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true ${BUNDLE} install \
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true $(BUNDLE) install \
 		--path vendor/bundle
 
 python_setup:
@@ -50,8 +50,9 @@ build: api_docs
 	scripts/build-all-versions.sh
 
 serve: clean_local
-	${JEKYLL} serve \
+	$(JEKYLL) serve \
 		--incremental \
+		--livereload \
 		--config _config.yml,_config.local.yml
 
 javadoc:

diff --git a/site/_config.local.yml b/site/_config.local.yml
@@ -18,7 +18,6 @@
 #
 
 destination: generated
-livereload: true
 baseurl: ""
 include:
 - docs/example.md
diff --git a/site/_sass/_docs.scss b/site/_sass/_docs.scss
@@ -19,9 +19,8 @@
 @media screen and (min-width: 769px) {
   .rest-api-container, .docs-container {
     article {
-      @include shadow($shadow-size);
-      padding: 2% 3%;
-      margin-bottom: 50px;
+      padding: 0 2%;
+      margin-bottom: 2rem;
     }
   }
 }
@@ -34,8 +33,6 @@
     padding: 0.75rem;
   }
 
-  margin-top: $top-margin;
-
   h4 + ul {
     margin-top: 1rem;
   }
@@ -128,23 +125,27 @@
 
       .highlighter-rouge {
         font-family: $font-family-monospace;
-
-        & + h2 {
-          margin-top: 40px;
-        }
 
         .highlight {
-          padding: 15px;
+          margin: 0;
+          padding: 1rem;
+
+          pre.highlight {
+            margin: 0;
+            padding: 0;
 
-          code {
-            font-size: $code-font-size;
+            code {
+              margin: 0;
+              padding: 0;
+              font-size: $code-font-size;
+            }
           }
         }
       }
 
       code.highlighter-rouge {
         color: $pulsar-blue;
-        padding: .2rem .3rem;
+        //padding: .2rem .3rem;
         background-color: lighten($sx-light-gray, 22%);
         border-radius: 0;
       }
@@ -172,10 +173,6 @@
 
       p {
         font-size: $docs-font-size;
-
-        & + .highlighter-rouge {
-          margin-top: 15px;
-        }
       }
 
       h2, h3 {
@@ -265,14 +262,6 @@
           }
         }
       }
-
-      p + table, table + p, table + h4, h4 + .highlighter-rouge {
-        margin-top: 15px;
-      }
-
-      .highlighter-rouge + table, .highlighter-rouge + h4 {
-        margin-top: 20px;
-      }
     }
   }
 }
diff --git a/site/js/main.js b/site/js/main.js
@@ -76,8 +76,6 @@ function sidebarExpand() {
   var LS = window.localStorage;
   var selected = LS['pulsar-sidebar-selected'] || null;
 
-  console.log("Initial selected: " + selected);
-
   if (selected != null) {
     openAccordionElement(selected);
   }