gollum 5.3.3 → 6.0.0

data/lib/gollum/public/gollum/stylesheets/_spinners.scss

@@ -24,7 +24,7 @@ Custom:
 
 All arguments are optional.
 
-Acceppts any valid CSS dimensional declaration, e.g px, em, rem as an argument for size.
+Accepts any valid CSS dimensional declaration, e.g px, em, rem as an argument for size.
 
 Use either shorthand border declarations or individual 'border-[property] [value]' (no colon!) pairs for the style.
 

data/lib/gollum/public/gollum/stylesheets/app.scss

@@ -1,8 +1,16 @@
-//= require primer
+//= require template
 //= require editor
-//= require dialog
 //= require criticmarkup
 //= require tables
 //= require emoji
-//= require template
-//= require spinner
+//= require dialog
+//= require highlights
+//= require spinner
+
+//  Simply importing @primer/css/index.scss also imports the unneeded marketing styles, so import the following components manually:
+//= require @primer/css/color-modes
+//= require @primer/css/core
+//= require @primer/css/product
+
+// Our own styling that needs to be defined after Primer is imported
+//= require wiki_content

data/lib/gollum/public/gollum/stylesheets/dialog.scss

@@ -1,6 +1,6 @@
 /* @control dialog */
 
-@import "_base", "_features", "_breakpoint", "_component";
+@import "_base", "_features", "_breakpoint";
 
 #gollum-dialog-dialog {
   display: block;
@@ -71,15 +71,6 @@
     @include four-edge-position(auto);
   }
 
-  h4 {
-    border-bottom: $border-standard;
-    color: #000;
-    font-size: 1.8em;
-    line-height: normal;
-    font-weight: bold;
-    margin: 0 0 0.75em 0;
-    padding: 0 0 0.3em 0;
-  }
 }
 
 #gollum-dialog-dialog-bg {

data/lib/gollum/public/gollum/stylesheets/editor.scss

@@ -1,6 +1,6 @@
 // Wiki editor formatting
 
-@import "_base", "_features", "_breakpoint", "_component";
+@import "_base", "_features", "_breakpoint";
 
 a {
   -moz-outline: none !important;
@@ -21,59 +21,15 @@ a {
   color: lightgray;
 }
 
-a.tabnav-tab:focus {
-  outline: none;
-}
-
 #gollum-editor-body-ace {
   overflow: hidden;
-  font-family: Consolas, "Liberation Mono", Courier, monospace;
-  font-size: 1em;
   padding: 0;
 }
 
 #gollum-editor {
 
-  .singleline {
-    display: block;
-    margin: 0 0 0.7em 0;
-/*    @include clearfix;
-*/
-    input {
-      font-size: 1.1em;
-      font-family: $font-default;
-      line-height: 1.5em;
-      margin: 1em 0 0.4em;
-      padding: 0.5em;
-      width: 100%;
-
-      &.ph {
-        color: #999;
-      }
-
-      .ie & {
-        padding-top: 0.25em;
-        padding-bottom: 0.75em;
-      }
-    }
-  }
-
-  .path_note {
-    text-align: right;
-    font-size: small;
-    padding-top: 5px;
-    padding-right: 5px;
-  }
-
-  /* @control editor-view-tab */
-  #gollum-editor-type-switcher {
-    display: none;
-  }
-
   /* @control function-bar */
   #gollum-editor-function-bar  {
-    border-bottom: $border-standard;
-    padding: 0;
 
     @include desktop-breakpoint {
       overflow: hidden;
@@ -86,8 +42,6 @@ a.tabnav-tab:focus {
     &.active {
       #gollum-editor-function-buttons {
         display: block;
-        margin: 0;
-        padding: 0;
 
         @include desktop-breakpoint {
           overflow: hidden;
@@ -101,23 +55,13 @@ a.tabnav-tab:focus {
     a {
       &.function-button {
         float: left;
-        
         overflow: hidden;
-        margin: 1px 1px 0 0;
-        
-        @include editor-button-size;
-        @include button-base;
-
-        @include desktop-breakpoint {
-          margin: 0.2em 0.5em 0 0;
-        }
 
         span {
           display: block;
           
-          @include button-sprites;
           @include text-conceal-simple;
-          @include editor-button-size;
+
         }
       }
 
@@ -126,63 +70,13 @@ a.tabnav-tab:focus {
       }
     }
 
-    span.function-divider {
-      display: none;
-
-      @include desktop-breakpoint {
-        display: block;
-        width: 0.5em;
-        float: left;
-      }
-    }
-
-    #gollum-editor-format-selector {
-      padding: 0.2em 0 0.5em 0;
-      clear: both;
-
-      @include clearfix;
-
-      @include desktop-breakpoint {
-        clear: none;
-        text-align: right;
-      }
-    }
   }
 
 
-
   /* @section form-fields */
 
   textarea {
     height: 30em;
-    overflow: hidden;
-  }
-
-  .collapsed, .expanded {
-    border-bottom: $border-standard;
-    display: block;
-    overflow: hidden;
-    padding: 0.5em 0 0;
-
-    button {
-      margin-bottom: 6px;
-    }
-    
-
-    h4 {
-      font-size: 1.6em;
-      margin: 0;
-      display: inline-block;
-
-      padding: 0.25em 0 0 0.3em;
-
-      text-shadow: 0 -1px 0 #fff;
-      line-height: $editor-button-size;
-
-      @include desktop-breakpoint {
-        line-height: $editor-button-desktop-size;
-      }
-    }
   }
 
   .collapsed {
@@ -190,80 +84,25 @@ a.tabnav-tab:focus {
       color: #bbb;
     }
 
-    a.button {
-      @include editor-button(13);
-    }
-
     textarea {
       display: none;
     }
   }
 
   .expanded {
-    a.button {
-      @include editor-button(14);
-    }
 
     textarea {
-      @include component-textarea;
       height: 7em;
     }
   }
 
-  #gollum-editor-body {
-    & + .collapsed, & + .expanded {
-      border-top: $border-standard;
-      margin-top: 0.7em;
-    }
-
-  }
-
 }
 
-/* @control title */
 
-#gollum-editor-title-field {
-  &.active {
-    border-bottom: $border-standard;
-    display: block;
-    margin: 0 0 0.3em 0;
-    padding: 0 0 0.5em 0;
-  }
-
-  input#gollum-editor-page-title {
-    font-weight: bold;
-    margin-top: 0;
-
-    &.ph {
-      color: #000;
-    }
-  }
-
-  & + #gollum-editor-function-bar {
-    margin-top: 0.6em;
-  }
+.BasicSelect .SelectMenu-modal {
+    width: 210px;
 }
 
-/* @control editor-buttons */
-
-a#function-bold { @include editor-button(0); }
-a#function-italic { @include editor-button(1); }
-a#function-underline { @include editor-button(2); }
-a#function-code { @include editor-button(3); }
-a#function-ul { @include editor-button(4); }
-a#function-ol { @include editor-button(5); }
-a#function-blockquote { @include editor-button(6); }
-a#function-hr { @include editor-button(7); }
-a#function-h1 { @include editor-button(8); }
-a#function-h2 { @include editor-button(9); }
-a#function-h3 { @include editor-button(10); }
-a#function-link { @include editor-button(11); }
-a#function-image { @include editor-button(12); }
-a#function-critic-accept { @include editor-button(13); }
-a#function-critic-reject { @include editor-button(14); }
-a#function-help { @include editor-button(15); }
-a#function-search { @include editor-button(16); }
-
 /* @section uploads */
 
 #gollum-editor-body-ace {
@@ -286,12 +125,6 @@ a#function-search { @include editor-button(16); }
 
 /* @section help */
 #gollum-editor-help {
-  clear: both;
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-  border: $border-standard;
-  border-width: 0 1px 1px 1px;
 
   @include desktop-breakpoint {
     clear: none;
@@ -300,14 +133,8 @@ a#function-search { @include editor-button(16); }
 
 #gollum-editor-help-parent,
 #gollum-editor-help-list {
-  display: block;
-  list-style-type: none;
   margin: 0;
-  float: left;
-  width: 50%;
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
+
 
   @include desktop-breakpoint {
     height: 17em;
@@ -346,7 +173,7 @@ a#function-search { @include editor-button(16); }
       }
 
       &.selected {
-        border: $border-editor-element;
+        border: $border-standard;
         border-bottom-color: #e7e7e7;
         border-width: 1px 0;
         background: #fff;
@@ -358,13 +185,11 @@ a#function-search { @include editor-button(16); }
   }
 }
 
-#gollum-editor-help-parent {
-  border-right: $border-editor-element;
-}
+
 
 #gollum-editor-help-list {
   background: #fafafa;
-  border-right: $border-editor-element;
+
 }
 
 #gollum-editor-help-wrapper {

data/lib/gollum/public/gollum/stylesheets/highlights.scss

@@ -0,0 +1,196 @@
+.highlight {
+    background: #fff;
+  
+    .c {
+      color: #998;
+      font-style: italic;
+    }
+  
+    .err {
+      color: #a61717;
+      background-color: #e3d2d2;
+    }
+  
+    .k, .o {
+      font-weight: bold;
+    }
+  
+    .cm, .c1 {
+      color: #998;
+      font-style: italic;
+    }
+  
+    .cp {
+      color: #999;
+      font-weight: bold;
+    }
+  
+    .cs {
+      color: #999;
+      font-weight: bold;
+      font-style: italic;
+    }
+  
+    .gd {
+      color: #000;
+      background-color: #fdd;
+  
+      .x {
+        color: #000;
+        background-color: #faa;
+      }
+    }
+  
+    .ge {
+      font-style: italic;
+    }
+  
+    .gr {
+      color: #a00;
+    }
+  
+    .gh {
+      color: #999;
+    }
+  
+    .gi {
+      color: #000;
+      background-color: #dfd;
+  
+      .x {
+        color: #000;
+        background-color: #afa;
+      }
+    }
+  
+    .go {
+      color: #888;
+    }
+  
+    .gp {
+      color: #555;
+    }
+  
+    .gs {
+      font-weight: bold;
+    }
+  
+    .gt {
+      color: #a00;
+    }
+  
+    .gu {
+      color: #800080;
+      font-weight: bold;
+    }
+  
+    .kc, .kd, .kn, .kp, .kr {
+      font-weight: bold;
+    }
+  
+    .kt {
+      color: #458;
+      font-weight: bold;
+    }
+  
+    .m {
+      color: #099;
+    }
+  
+    .s {
+      color: #d14;
+    }
+  
+    .na, .no, .nv, .vc, .vg, .vi {
+      color: #008080;
+    }
+  
+    .nb {
+      color: #0086B3;
+    }
+  
+    .nc {
+      color: #458;
+      font-weight: bold;
+    }
+  
+    .ni {
+      color: #800080;
+    }
+  
+    .ne, .nf {
+      color: #900;
+      font-weight: bold;
+    }
+  
+    .nn {
+      color: #555;
+    }
+  
+    .nt {
+      color: #000080;
+    }
+  
+    .ow {
+      font-weight: bold;
+    }
+  
+    .w {
+      color: #bbb;
+    }
+  
+    .mf, .mh, .mi, .mo, .il {
+      color: #099;
+    }
+  
+    .sb, .sc, .sd, .s2, .se, .sh, .si, .sx, .s1 {
+      color: #d14;
+    }
+  
+    .sr {
+      color: #009926;
+    }
+  
+    .ss {
+      color: #990073;
+    }
+  
+    .bp {
+      color: #999;
+    }
+  
+    .gc {
+      color: #999;
+      background-color: #EAF2F5;
+    }
+  
+    .gg {
+      color: #000000a0;
+    }
+  }
+  
+  .type-csharp {
+    .highlight {
+      .k, .kt {
+        color: #00F;
+      }
+  
+      .nf {
+        color: #000;
+        font-weight: normal;
+      }
+  
+      .nc {
+        color: #2B91AF;
+      }
+  
+      .nn {
+        color: #000;
+      }
+  
+      .s, .sc {
+        color: #A31515;
+      }
+    }
+  }
+  

data/lib/gollum/public/gollum/stylesheets/print.scss

@@ -4,7 +4,7 @@
 
 
 div#footer {
-    display: none;
+  display: none;
 }
 
 nav.actions{

data/lib/gollum/public/gollum/stylesheets/tables.scss

@@ -1,5 +1,3 @@
-@import "_base", "_breakpoint";
-
 /* @section history */
 
 #user-icons {
@@ -23,13 +21,11 @@
 /* @section compare */
 .compare {
 
-
   .data {
 
     table {
 
       tr td {
-        font-family: $font-console;
         line-height: 1.5em;
 
         & + td + td {