Starting to set globals

openjournals · Mar 10, 2019 · 4f54355c582875366d7c50f56ee7dba59d275e67 · 4f54355
1 parent 5a0e85a
commit 4f54355c582875366d7c50f56ee7dba59d275e67
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@
 # Ignore readthedocs build
 docs/_build
+  
+latest.dump
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,6 @@ gem 'groupdate'
 gem 'honeybadger', '~> 3.2.0'
 gem 'html-pipeline', '~> 2.7.1'
 gem 'commonmarker', '~> 0.17.7'
-  
-gem 'octicons_helper', '~> 4.0'
 gem 'omniauth-orcid', '~> 2.0.2'
 gem 'octokit', '~> 4.3.0'
 gem 'pg', '~> 0.21.0'
@@ -23,6 +22,9 @@ gem 'sass-rails', '~> 5.0.7'
 gem 'uglifier', '4.0.1'
 gem 'coffee-rails', '~> 4.2.2'
+  
+# Use Bootstrap for the front-end
+  
+gem 'bootstrap', '~> 4.3.1'
+  
+
 # Use jquery as the JavaScript library
 gem 'jquery-rails', '~> 4.3.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,9 +45,15 @@ GEM
      tzinfo (~> 1.1)
    addressable (2.4.0)
    arel (9.0.0)
+  
+    autoprefixer-rails (9.4.10.2)
+  
+      execjs
    bindex (0.5.0)
    bootsnap (1.3.0)
      msgpack (~> 1.0)
+  
+    bootstrap (4.3.1)
+  
+      autoprefixer-rails (>= 9.1.0)
+  
+      popper_js (>= 1.14.3, < 2)
+  
+      sassc-rails (>= 2.0.0)
    builder (3.2.3)
    byebug (10.0.2)
    capybara (2.16.1)
@@ -182,6 +188,7 @@ GEM
      omniauth-oauth2 (~> 1.3)
    os (0.9.6)
    pg (0.21.0)
+  
+    popper_js (1.14.5)
    pry (0.11.3)
      coderay (~> 1.1.0)
      method_source (~> 0.9.0)
@@ -267,6 +274,15 @@ GEM
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
+  
+    sassc (2.0.1)
+  
+      ffi (~> 1.9)
+  
+      rake
+  
+    sassc-rails (2.1.0)
+  
+      railties (>= 4.0.0)
+  
+      sassc (>= 2.0)
+  
+      sprockets (> 3.0)
+  
+      sprockets-rails
+  
+      tilt
    sawyer (0.7.0)
      addressable (>= 2.3.5, < 2.5)
      faraday (~> 0.8, < 0.10)
@@ -319,6 +335,7 @@ PLATFORMS
 DEPENDENCIES
  aasm (~> 4.1.0)
  bootsnap
+  
+  bootstrap (~> 4.3.1)
  capybara (~> 2.16.1)
  chartkick
  coffee-rails (~> 4.2.2)
@@ -353,4 +370,4 @@ DEPENDENCIES
  will_paginate (~> 3.1.6)
 BUNDLED WITH
-  
-   1.16.0
+  
+   2.0.1
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,4 +14,6 @@
 //= require chartkick
 //= require jquery
 //= require jquery_ujs
+  
+//= require popper
+  
+//= require bootstrap-sprockets
 //= require_tree .
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -14,5 +14,5 @@
 *= require_self
 */
-  
-@import "primer-css/scss/primer";
-  
-@import "octicons/octicons/octicons.scss";
+  
+// Custom bootstrap variables must be set or imported *before* bootstrap
+  
+@import "bootstrap";
diff --git a/app/assets/stylesheets/fonts..scss b/app/assets/stylesheets/fonts..scss
@@ -0,0 +1,13 @@
+  
+
+  
+/* to do - import below and update bootstrap typography
+  
+
+  
+@import url('https://rsms.me/inter/inter.css');
+  
+html { font-family: 'Inter', sans-serif; }
+  
+
+  
+/* be fun to play with at some point
+  
+
+  
+@supports (font-variation-settings: normal) {
+  
+  html { font-family: 'Inter var', sans-serif; }
+  
+} 
+  
+
+  
+*/
diff --git a/app/assets/stylesheets/primer-css/scss/_primer.scss b/app/assets/stylesheets/primer-css/scss/_primer.scss
diff --git a/app/views/papers/_list.html.erb b/app/views/papers/_list.html.erb
@@ -1,15 +1,16 @@
 <% papers.each do |paper| %>
-  
-<div class="list-paper columns">
-  
-  <div class="details three-fourths column">
-  
-    <span class="octicon octicon-repo"></span><h2 class="paper-title"><%= link_to paper.pretty_repository_name, paper_path(paper) %><a href="<%= badge_link(paper) %>"><img src="<%= setting(:url) %>/papers/<%= paper.sha %>/status.svg"></a></h2>
+  
+<div class="row">
+  
+  <div class="col-sm-8">
+  
+  <span class="badge badge-pill badge-primary">Accepted</span>
+  
+    <h2 class="paper-title"><%= link_to paper.pretty_repository_name, paper_path(paper) %></h2>
    <%= formatted_body(paper, 200) %>
  </div>
-  
-  <div class="meta one-fourth column">
+  
+  <div class="col-sm-4">
    <% if paper.pretty_doi == "DOI pending" %>
      DOI pending
    <% else %>
-  
-      <%= link_to paper.pretty_doi, paper.clean_archive_doi, :target => "_blank", :class => "doi" %><span class="octicon octicon-link-external"></span>
+  
+      <%= link_to paper.pretty_doi, paper.clean_archive_doi, :target => "_blank", :class => "doi" %>
    <% end %>
  </div>
 </div>