Recompile static assets

Fix tabnav styles on #create and #edit views
The Primer CSS-provided `tabnav` styles were not being used on the Edit and Preview tabs on the create and edit pages. After following Primer's documentation [1], it looks like we were using the `aria-current` attribute incorrectly. Dynamically adding/removing this attribute on the selected tab fixes the issue. [1]: https://primer-css-git-next-inputs.primer.now.sh/css/components/navigation#tabnav
2021-03-23 08:40:33 -07:00 · 2021-03-23 08:40:11 -07:00 · 2021-03-23 07:49:52 -07:00 · 2021-03-23 13:43:26 +05:00 · 2021-03-23 13:39:44 +05:00 · 2021-03-22 10:21:29 -07:00
16 changed files with 115 additions and 111 deletions
@@ -1,6 +1,7 @@
 rvm:
  - 2.4.0
  - 2.6.0
+  - 3.0.0
  - jruby-9.2.9.0
 jdk:
  - oraclejdk9
@@ -62,6 +62,8 @@ Pull Requests fixing bugs, implementing new features, or updating documentation
 	```
 	bundle exec rake test
 	```
+	
+To profile slow tests, you can use `bundle exec rake test TESTOPTS="--verbose"`.

 ### Working with test repositories

@@ -6,5 +6,4 @@ end

 gemspec

-gem "rake", '~> 13.0'
-
+gem 'rake', '~> 13.0'
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
  s.add_dependency 'sprockets-helpers', '~> 1.2'
  s.add_dependency 'rss', '~> 0.2.9'
  s.add_dependency 'therubyrhino', '~> 2.1.0'
+  s.add_dependency 'webrick', '~> 1.7'

  s.add_development_dependency 'rack-test', '~> 0.6.3'
  s.add_development_dependency 'shoulda', '~> 3.6.0'
@@ -45,7 +46,6 @@ Gem::Specification.new do |s|
  s.add_development_dependency 'twitter_cldr', '~> 3.2.0'
  s.add_development_dependency 'mocha', '~> 1.8.0'
  s.add_development_dependency 'test-unit', '~> 3.3.0'
-  s.add_development_dependency 'webrick', '~> 1.4.2'

  # = MANIFEST =
  s.files = %w[
@@ -117,7 +117,7 @@ module Precious
      @js  = settings.wiki_options[:js]
      @mathjax_config = settings.wiki_options[:mathjax_config]

-      @use_static_assets = settings.wiki_options.fetch(:static, settings.environment == :production || settings.environment == :staging)
+      @use_static_assets = settings.wiki_options.fetch(:static, settings.environment != :development)
      @static_assets_path = settings.wiki_options.fetch(:static_assets_path, ::File.join(File.dirname(__FILE__), 'public/assets'))
      @mathjax_path = ::File.join(File.dirname(__FILE__), 'public/gollum/javascript/MathJax')
      
@@ -1 +1 @@
-{"files":{"app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js":{"logical_path":"app.js","mtime":"2021-02-24T23:16:14-08:00","size":135925,"digest":"7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2","integrity":"sha256-ekvRFfS8fs45vIBzyg/618XlXMWDexRkoS3q1JBc77I="},"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js":{"logical_path":"editor.js","mtime":"2021-02-24T23:16:14-08:00","size":744866,"digest":"db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf","integrity":"sha256-2xDINRMG6S8ZJroiXQzZyOiGSCs7mCCoWCXsOrq18c8="},"app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css":{"logical_path":"app.css","mtime":"2021-02-24T23:16:14-08:00","size":396661,"digest":"7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6","integrity":"sha256-egu/8ui60wM+fBfg4PiG8zap0j07kS3NKuOJxItLY+Y="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-02-24T23:16:14-08:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-02-24T23:16:14-08:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="}},"assets":{"app.js":"app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js","editor.js":"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js","app.css":"app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}
+{"files":{"app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js":{"logical_path":"app.js","mtime":"2021-03-23T08:40:11-07:00","size":136020,"digest":"0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838","integrity":"sha256-D9Io4mv75v4xotomjrDpjngMEZHBqRit84M3eUbpyDg="},"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js":{"logical_path":"editor.js","mtime":"2021-02-24T23:16:14-08:00","size":744866,"digest":"db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf","integrity":"sha256-2xDINRMG6S8ZJroiXQzZyOiGSCs7mCCoWCXsOrq18c8="},"app-ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2.css":{"logical_path":"app.css","mtime":"2021-03-23T08:40:11-07:00","size":396615,"digest":"ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2","integrity":"sha256-rUPKZLKV2ERLEPIu6GjxhCkmivSY8bxRVDSHi2kON6I="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-02-24T23:16:14-08:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-02-24T23:16:14-08:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="}},"assets":{"app.js":"app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js","editor.js":"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js","app.css":"app-ad43ca64b295d8444b10f22ee868f18429268af498f1bc515434878b690e37a2.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}
@@ -380,8 +380,12 @@ $(document).ready(function() {
      active_tab = '#edit.tabnav-tab';
    }

+    $('.tabnav-tab.selected').removeAttr('aria-current');
    $('.tabnav-tab.selected').removeClass('selected');
+
+    $(active_tab).attr('aria-current', 'page');
    $(active_tab).addClass('selected');
+
    $('.tabnav-div').hide();
    $(active_div).show();
  }
@@ -147,7 +147,3 @@
    }
  }
 }
-
-#gollum-dialog-dialog-buttons {
-  overflow: hidden;
-}
@@ -4,13 +4,15 @@
  <h1 class="py-4">Create New Page</h1>
 </div>
 <div id="wiki-content" class="create edit">
-	<div class="tabnav">
-	  <nav class="tabnav-tabs" aria-label="Foo bar">
-	    <a href="#" id="edit" class="tabnav-tab selected" aria-current="edit">Edit</a>
-	    <a href="#" id="preview" class="tabnav-tab" aria-current="preview">Preview</a>
-	  </nav>
-	</div>
-	
+  <div class="tabnav">
+    <nav class="tabnav-tabs" aria-label="Toggle edit or preview mode">
+      <a href="#" id="edit" class="tabnav-tab selected" aria-current="page">
+        Edit
+      </a>
+      <a href="#" id="preview" class="tabnav-tab">Preview</a>
+    </nav>
+  </div>
+
  <div class="has-sidebar tabnav-div" id="edit-content">
    {{>editor}}
  </div>
@@ -5,8 +5,10 @@
 </div>
 <div class="tabnav">
  <nav class="tabnav-tabs">
-    <a href="#" id="edit" class="tabnav-tab selected" aria-current="edit">Edit</a>
-    <a href="#" id="preview" class="tabnav-tab" aria-current="preview">Preview</a>
+    <a href="#" id="edit" class="tabnav-tab selected" aria-current="page">
+      Edit
+    </a>
+    <a href="#" id="preview" class="tabnav-tab">Preview</a>
  </nav>
 </div>
  <div class="tabnav-div" id="edit-content">{{>editor}}</div>
@@ -37,7 +37,7 @@
 			<button class="btn btn-sm function-button" id="function-h3" title="Heading 3">h3</button>
 			<span class="pr-2"></span>
 			<button class="btn btn-sm function-button" id="function-link" title="Link">{{#octicon}}link{{/octicon}}</button>
-			<button class="btn btn-sm function-button" id="function-image" title="Image">{{#octicon}}file-media{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-image" title="Image">{{#octicon}}image{{/octicon}}</button>
 			<span class="pr-2"></span>
 			{{#critic_markup}}
 			<button class="btn btn-sm function-button" id="function-critic-accept" title="Accept Selected CriticMarkup">{{#octicon}}plus{{/octicon}}</button>
@@ -1,105 +1,103 @@
-<nav class="actions pt-4 px-2 px-lg-0 overflow-x-scroll">
-  <div class="TableObject">
-    <div class="TableObject-item hide-lg hide-xl">
-      {{>mobilenav}}
-    </div>
+<nav class="TableObject actions pt-4 px-2 px-lg-0 overflow-x-scroll">
+  <div class="TableObject-item hide-lg hide-xl">
+    {{>mobilenav}}
+  </div>

-    <div class="TableObject-item hide-sm hide-md">
-      <a class="btn btn-sm" id="minibutton-home" href="{{page_route}}">
-        Home
-      </a>
-    </div>
+  <div class="TableObject-item hide-sm hide-md">
+    <a class="btn btn-sm" id="minibutton-home" href="{{page_route}}">
+      Home
+    </a>
+  </div>

-    <div
-      class="TableObject-item TableObject-item--primary px-2"
-      {{^search}}style="visibility:hidden"{{/search}}
-    >
-      {{>searchbar}}
-    </div>
+  <div
+    class="TableObject-item TableObject-item--primary px-2"
+    {{^search}}style="visibility:hidden"{{/search}}
+  >
+    {{>searchbar}}
+  </div>

-    <div class="TableObject-item hide-sm hide-md">
-      <div class="BtnGroup" style="display: flex;">
-        {{#overview}}
-          <a
-            class="btn BtnGroup-item btn-sm"
-            href="{{overview_path}}"
-            id="minibutton-overview"
-          >
-            Overview
-          </a>
-        {{/overview}}
-
-        {{#latest_changes}}
-          <a
-            class="btn BtnGroup-item btn-sm"
-            href="{{latest_changes_path}}"
-            id="minibutton-latest-changes"
-          >
-            Latest Changes
-          </a>
-        {{/latest_changes}}
-      </div>
-    </div>
-
-    {{#history}}
-      <div class="TableObject-item pl-2 hide-sm hide-md">
+  <div class="TableObject-item hide-sm hide-md">
+    <div class="BtnGroup d-flex">
+      {{#overview}}
        <a
-          class="btn btn-sm"
+          class="btn BtnGroup-item btn-sm"
+          href="{{overview_path}}"
+          id="minibutton-overview"
+        >
+          Overview
+        </a>
+      {{/overview}}
+
+      {{#latest_changes}}
+        <a
+          class="btn BtnGroup-item btn-sm"
+          href="{{latest_changes_path}}"
+          id="minibutton-latest-changes"
+        >
+          Latest Changes
+        </a>
+      {{/latest_changes}}
+    </div>
+  </div>
+
+  <div class="TableObject-item px-2">
+    <div class="BtnGroup d-flex">
+      {{#history}}
+        <a
+          class="btn BtnGroup-item btn-sm hide-sm hide-md"
          href="{{history_path}}/{{escaped_url_path}}"
          id="minibutton-history"
        >
-          Page History
+          History
+        </a>
+      {{/history}}
+
+      {{#allow_editing}}
+        {{#allow_uploads}}
+          <button
+            class="btn BtnGroup-item btn-sm hide-sm hide-md
+              minibutton-upload-page"
+          >
+            Upload
+          </button>
+        {{/allow_uploads}}
+
+        {{#editable}}
+          <button
+            class="btn BtnGroup-item btn-sm hide-sm hide-md
+              minibutton-rename-page"
+          >
+            Rename
+          </button>
+          <a
+            class="btn BtnGroup-item btn-sm hide-sm hide-md"
+            href="{{edit_path}}/{{escaped_url_path}}"
+            id="minibutton-edit-page"
+          >
+            Edit
+          </a>
+        {{/editable}}
+      {{/allow_editing}}
+    </div>
+  </div>
+
+  {{#allow_editing}}
+    {{#editable}}
+      <div class="TableObject-item">
+        <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
+          New
        </a>
      </div>
-    {{/history}}
+    {{/editable}}

-    {{#allow_editing}}
-      <div class="TableObject-item px-2">
-        <div class="BtnGroup" style="display: flex;">
-          {{#allow_uploads}}
-            <a
-              class="btn BtnGroup-item btn-sm hide-sm hide-md
-                minibutton-upload-page"
-            >
-              Upload
-            </a>
-          {{/allow_uploads}}
-
-          {{#editable}}
-            <a
-              class="btn BtnGroup-item btn-sm hide-sm hide-md
-                minibutton-rename-page"
-            >
-              Rename
-            </a>
-            <a
-              class="btn BtnGroup-item btn-sm hide-sm hide-md"
-              href="{{edit_path}}/{{escaped_url_path}}"
-              id="minibutton-edit-page"
-            >
-              Edit
-            </a>
-          {{/editable}}
-        </div>
-      </div>
-
-      {{#editable}}
+    {{^editable}}
+      {{#newable}}
        <div class="TableObject-item">
          <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
            New
          </a>
        </div>
-      {{/editable}}
-
-      {{^editable}}
-        {{#newable}}
-          <div class="TableObject-item">
-            <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
-              New
-            </a>
-          </div>
-        {{/newable}}
-      {{/editable}}
-    {{/allow_editing}}
-  </div>
+      {{/newable}}
+    {{/editable}}
+  {{/allow_editing}}
 </nav>
Author	SHA1	Message	Date
benjamin wil	2a2d296a6e	Recompile static assets	2021-03-23 08:40:33 -07:00
benjamin wil	8198b4d563	Fix tabnav styles on #create and #edit views The Primer CSS-provided `tabnav` styles were not being used on the Edit and Preview tabs on the create and edit pages. After following Primer's documentation [1], it looks like we were using the `aria-current` attribute incorrectly. Dynamically adding/removing this attribute on the selected tab fixes the issue. [1]: https://primer-css-git-next-inputs.primer.now.sh/css/components/navigation#tabnav	2021-03-23 08:40:11 -07:00
benjamin wil	9a79b0a800	Merge pull request #1701 from ViChyavIn/fix-focused-button Fix focused button border shown wrong in dialogs	2021-03-23 07:49:52 -07:00
ViChyavIn	ca13298d00	Update static assets	2021-03-23 13:43:26 +05:00
ViChyavIn	eaf82e6367	Overflow is set to visible by default so declaration is removed	2021-03-23 13:39:44 +05:00
benjamin wil	cae290ded7	Merge pull request #1697 from gollum/benjaminwil/fix-nav-outline Fix nav outline styles	2021-03-22 10:21:29 -07:00
Benjamin Willems	a22208a0be	Use <button> instead of <a> without `href` It is more semantic to use a `<button>` tag in the place of an `<a>` when there is no other page being linked to. In this circumstance, we're using JavaScript to present a modal to the user on click. This change makes the "Upload" and "Rename" buttons appear in the browser's tab index.	2021-03-21 14:21:07 -07:00
Benjamin Willems	bc877dc9dc	Fix indentation due to DOM simplification We removed one of the parent elements of the `<nav>`, so we must re-indent the entire file.	2021-03-21 14:19:32 -07:00
Benjamin Willems	40b1775d42	Make the main `<nav>` element a TableObject There was a display issue, where navbar items's outline styles were being cut off due to the parent `<nav>` element's margin and padding. Fortunately, we can do away with the navbar wrapper div entirely. It was not doing anything important except defining its children as `TableObject` items. But we can just do this on the `<nav>` itself.	2021-03-21 14:18:45 -07:00
ViChyavIn	c2dc605adb	Fix focused button border shown wrong	2021-03-20 21:43:53 +05:00
benjamin wil	a1e1af07a4	Merge pull request #1676 from gollum/benjaminwil/button-labels Move "Page History" into button group	2021-03-15 08:24:04 -07:00
benjamin wil	76948130f6	Display button groups using Primer flex utilities This small improvement just uses Primer `d-flex` utilities to `display: flex;` instead of using style tags. It's preferable.	2021-03-06 16:19:01 -08:00
Benjamin Willems	f71ba31bfe	Move "Page History" into button group If the user has edit permissions, the "History" button is shown in a button group with "Edit" and "Rename". If the user does not have edit permissions, it's shown by itself. This commit also renames the label from "Page History" to "History".	2021-03-06 16:19:01 -08:00
Dawa Ometto	b7caa228e6	Add webrick dependency (#1695 ) * Remove webrick as dev dependency	2021-03-06 15:39:21 +01:00
Dawa Ometto	0101dd2f65	Update .travis.yml (#1690 )	2021-03-06 10:06:11 +01:00
Dawa Ometto	c8baa61fe3	Update image icon in editor (#1687 )	2021-02-26 15:30:02 +01:00
Dawa Ometto	104335706a	Faster tests (#1686 )	2021-02-26 11:34:41 +01:00