diff --git a/glide.lock b/glide.lock index 25087f54b..a52572b5e 100644 --- a/glide.lock +++ b/glide.lock @@ -74,7 +74,7 @@ imports: - name: github.com/nfnt/resize version: 4d93a29130b1b6aba503e2aa8b50f516213ea80e - name: github.com/russross/blackfriday - version: 1d6b8e9301e720b08a8938b8c25c018285885438 + version: 4e6f303e8d936855981ddcdbfc092b03d2b2b68e - name: github.com/satori/go.uuid version: 879c5887cd475cd7864858769793b2ceb0d44feb - name: github.com/sergi/go-diff diff --git a/modules/template/template.go b/modules/template/template.go index 7c3544973..5702d1dd3 100644 --- a/modules/template/template.go +++ b/modules/template/template.go @@ -241,7 +241,7 @@ func ActionIcon(opType int) string { case 7: // New pull request return "git-pull-request" case 10: // Comment issue - return "comment" + return "comment-discussion" case 11: // Merge pull request return "git-merge" case 12, 14: // Close issue or pull request diff --git a/public/assets/octicons-3.5.0/octicons.css b/public/assets/octicons-3.5.0/octicons.css deleted file mode 100644 index c49658ebe..000000000 --- a/public/assets/octicons-3.5.0/octicons.css +++ /dev/null @@ -1,226 +0,0 @@ -@font-face { - font-family: 'octicons'; - src: url('octicons.eot?#iefix') format('embedded-opentype'), - url('octicons.woff') format('woff'), - url('octicons.ttf') format('truetype'), - url('octicons.svg#octicons') format('svg'); - font-weight: normal; - font-style: normal; -} - -/* - -.octicon is optimized for 16px. -.mega-octicon is optimized for 32px but can be used larger. - -*/ -.octicon, .mega-octicon { - font: normal normal normal 16px/1 octicons; - display: inline-block; - text-decoration: none; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.mega-octicon { font-size: 32px; } - -.octicon-alert:before { content: '\f02d'} /*  */ -.octicon-arrow-down:before { content: '\f03f'} /*  */ -.octicon-arrow-left:before { content: '\f040'} /*  */ -.octicon-arrow-right:before { content: '\f03e'} /*  */ -.octicon-arrow-small-down:before { content: '\f0a0'} /*  */ -.octicon-arrow-small-left:before { content: '\f0a1'} /*  */ -.octicon-arrow-small-right:before { content: '\f071'} /*  */ -.octicon-arrow-small-up:before { content: '\f09f'} /*  */ -.octicon-arrow-up:before { content: '\f03d'} /*  */ -.octicon-microscope:before, -.octicon-beaker:before { content: '\f0dd'} /*  */ -.octicon-bell:before { content: '\f0de'} /*  */ -.octicon-bold:before { content: '\f0e2'} /*  */ -.octicon-book:before { content: '\f007'} /*  */ -.octicon-bookmark:before { content: '\f07b'} /*  */ -.octicon-briefcase:before { content: '\f0d3'} /*  */ -.octicon-broadcast:before { content: '\f048'} /*  */ -.octicon-browser:before { content: '\f0c5'} /*  */ -.octicon-bug:before { content: '\f091'} /*  */ -.octicon-calendar:before { content: '\f068'} /*  */ -.octicon-check:before { content: '\f03a'} /*  */ -.octicon-checklist:before { content: '\f076'} /*  */ -.octicon-chevron-down:before { content: '\f0a3'} /*  */ -.octicon-chevron-left:before { content: '\f0a4'} /*  */ -.octicon-chevron-right:before { content: '\f078'} /*  */ -.octicon-chevron-up:before { content: '\f0a2'} /*  */ -.octicon-circle-slash:before { content: '\f084'} /*  */ -.octicon-circuit-board:before { content: '\f0d6'} /*  */ -.octicon-clippy:before { content: '\f035'} /*  */ -.octicon-clock:before { content: '\f046'} /*  */ -.octicon-cloud-download:before { content: '\f00b'} /*  */ -.octicon-cloud-upload:before { content: '\f00c'} /*  */ -.octicon-code:before { content: '\f05f'} /*  */ -.octicon-comment-add:before, -.octicon-comment:before { content: '\f02b'} /*  */ -.octicon-comment-discussion:before { content: '\f04f'} /*  */ -.octicon-credit-card:before { content: '\f045'} /*  */ -.octicon-dash:before { content: '\f0ca'} /*  */ -.octicon-dashboard:before { content: '\f07d'} /*  */ -.octicon-database:before { content: '\f096'} /*  */ -.octicon-clone:before, -.octicon-desktop-download:before { content: '\f0dc'} /*  */ -.octicon-device-camera:before { content: '\f056'} /*  */ -.octicon-device-camera-video:before { content: '\f057'} /*  */ -.octicon-device-desktop:before { content: '\f27c'} /*  */ -.octicon-device-mobile:before { content: '\f038'} /*  */ -.octicon-diff:before { content: '\f04d'} /*  */ -.octicon-diff-added:before { content: '\f06b'} /*  */ -.octicon-diff-ignored:before { content: '\f099'} /*  */ -.octicon-diff-modified:before { content: '\f06d'} /*  */ -.octicon-diff-removed:before { content: '\f06c'} /*  */ -.octicon-diff-renamed:before { content: '\f06e'} /*  */ -.octicon-ellipsis:before { content: '\f09a'} /*  */ -.octicon-eye-unwatch:before, -.octicon-eye-watch:before, -.octicon-eye:before { content: '\f04e'} /*  */ -.octicon-file-binary:before { content: '\f094'} /*  */ -.octicon-file-code:before { content: '\f010'} /*  */ -.octicon-file-directory:before { content: '\f016'} /*  */ -.octicon-file-media:before { content: '\f012'} /*  */ -.octicon-file-pdf:before { content: '\f014'} /*  */ -.octicon-file-submodule:before { content: '\f017'} /*  */ -.octicon-file-symlink-directory:before { content: '\f0b1'} /*  */ -.octicon-file-symlink-file:before { content: '\f0b0'} /*  */ -.octicon-file-text:before { content: '\f011'} /*  */ -.octicon-file-zip:before { content: '\f013'} /*  */ -.octicon-flame:before { content: '\f0d2'} /*  */ -.octicon-fold:before { content: '\f0cc'} /*  */ -.octicon-gear:before { content: '\f02f'} /*  */ -.octicon-gift:before { content: '\f042'} /*  */ -.octicon-gist:before { content: '\f00e'} /*  */ -.octicon-gist-secret:before { content: '\f08c'} /*  */ -.octicon-git-branch-create:before, -.octicon-git-branch-delete:before, -.octicon-git-branch:before { content: '\f020'} /*  */ -.octicon-git-commit:before { content: '\f01f'} /*  */ -.octicon-git-compare:before { content: '\f0ac'} /*  */ -.octicon-git-merge:before { content: '\f023'} /*  */ -.octicon-git-pull-request-abandoned:before, -.octicon-git-pull-request:before { content: '\f009'} /*  */ -.octicon-globe:before { content: '\f0b6'} /*  */ -.octicon-graph:before { content: '\f043'} /*  */ -.octicon-heart:before { content: '\2665'} /* ♥ */ -.octicon-history:before { content: '\f07e'} /*  */ -.octicon-home:before { content: '\f08d'} /*  */ -.octicon-horizontal-rule:before { content: '\f070'} /*  */ -.octicon-hubot:before { content: '\f09d'} /*  */ -.octicon-inbox:before { content: '\f0cf'} /*  */ -.octicon-info:before { content: '\f059'} /*  */ -.octicon-issue-closed:before { content: '\f028'} /*  */ -.octicon-issue-opened:before { content: '\f026'} /*  */ -.octicon-issue-reopened:before { content: '\f027'} /*  */ -.octicon-italic:before { content: '\f0e4'} /*  */ -.octicon-jersey:before { content: '\f019'} /*  */ -.octicon-key:before { content: '\f049'} /*  */ -.octicon-keyboard:before { content: '\f00d'} /*  */ -.octicon-law:before { content: '\f0d8'} /*  */ -.octicon-light-bulb:before { content: '\f000'} /*  */ -.octicon-link:before { content: '\f05c'} /*  */ -.octicon-link-external:before { content: '\f07f'} /*  */ -.octicon-list-ordered:before { content: '\f062'} /*  */ -.octicon-list-unordered:before { content: '\f061'} /*  */ -.octicon-location:before { content: '\f060'} /*  */ -.octicon-gist-private:before, -.octicon-mirror-private:before, -.octicon-git-fork-private:before, -.octicon-lock:before { content: '\f06a'} /*  */ -.octicon-logo-gist:before { content: '\f0ad'} /*  */ -.octicon-logo-github:before { content: '\f092'} /*  */ -.octicon-mail:before { content: '\f03b'} /*  */ -.octicon-mail-read:before { content: '\f03c'} /*  */ -.octicon-mail-reply:before { content: '\f051'} /*  */ -.octicon-mark-github:before { content: '\f00a'} /*  */ -.octicon-markdown:before { content: '\f0c9'} /*  */ -.octicon-megaphone:before { content: '\f077'} /*  */ -.octicon-mention:before { content: '\f0be'} /*  */ -.octicon-milestone:before { content: '\f075'} /*  */ -.octicon-mirror-public:before, -.octicon-mirror:before { content: '\f024'} /*  */ -.octicon-mortar-board:before { content: '\f0d7'} /*  */ -.octicon-mute:before { content: '\f080'} /*  */ -.octicon-no-newline:before { content: '\f09c'} /*  */ -.octicon-octoface:before { content: '\f008'} /*  */ -.octicon-organization:before { content: '\f037'} /*  */ -.octicon-package:before { content: '\f0c4'} /*  */ -.octicon-paintcan:before { content: '\f0d1'} /*  */ -.octicon-pencil:before { content: '\f058'} /*  */ -.octicon-person-add:before, -.octicon-person-follow:before, -.octicon-person:before { content: '\f018'} /*  */ -.octicon-pin:before { content: '\f041'} /*  */ -.octicon-plug:before { content: '\f0d4'} /*  */ -.octicon-repo-create:before, -.octicon-gist-new:before, -.octicon-file-directory-create:before, -.octicon-file-add:before, -.octicon-plus:before { content: '\f05d'} /*  */ -.octicon-primitive-dot:before { content: '\f052'} /*  */ -.octicon-primitive-square:before { content: '\f053'} /*  */ -.octicon-pulse:before { content: '\f085'} /*  */ -.octicon-question:before { content: '\f02c'} /*  */ -.octicon-quote:before { content: '\f063'} /*  */ -.octicon-radio-tower:before { content: '\f030'} /*  */ -.octicon-repo-delete:before, -.octicon-repo:before { content: '\f001'} /*  */ -.octicon-repo-clone:before { content: '\f04c'} /*  */ -.octicon-repo-force-push:before { content: '\f04a'} /*  */ -.octicon-gist-fork:before, -.octicon-repo-forked:before { content: '\f002'} /*  */ -.octicon-repo-pull:before { content: '\f006'} /*  */ -.octicon-repo-push:before { content: '\f005'} /*  */ -.octicon-rocket:before { content: '\f033'} /*  */ -.octicon-rss:before { content: '\f034'} /*  */ -.octicon-ruby:before { content: '\f047'} /*  */ -.octicon-search-save:before, -.octicon-search:before { content: '\f02e'} /*  */ -.octicon-server:before { content: '\f097'} /*  */ -.octicon-settings:before { content: '\f07c'} /*  */ -.octicon-shield:before { content: '\f0e1'} /*  */ -.octicon-log-in:before, -.octicon-sign-in:before { content: '\f036'} /*  */ -.octicon-log-out:before, -.octicon-sign-out:before { content: '\f032'} /*  */ -.octicon-smiley:before { content: '\f0e7'} /*  */ -.octicon-squirrel:before { content: '\f0b2'} /*  */ -.octicon-star-add:before, -.octicon-star-delete:before, -.octicon-star:before { content: '\f02a'} /*  */ -.octicon-stop:before { content: '\f08f'} /*  */ -.octicon-repo-sync:before, -.octicon-sync:before { content: '\f087'} /*  */ -.octicon-tag-remove:before, -.octicon-tag-add:before, -.octicon-tag:before { content: '\f015'} /*  */ -.octicon-tasklist:before { content: '\f0e5'} /*  */ -.octicon-telescope:before { content: '\f088'} /*  */ -.octicon-terminal:before { content: '\f0c8'} /*  */ -.octicon-text-size:before { content: '\f0e3'} /*  */ -.octicon-three-bars:before { content: '\f05e'} /*  */ -.octicon-thumbsdown:before { content: '\f0db'} /*  */ -.octicon-thumbsup:before { content: '\f0da'} /*  */ -.octicon-tools:before { content: '\f031'} /*  */ -.octicon-trashcan:before { content: '\f0d0'} /*  */ -.octicon-triangle-down:before { content: '\f05b'} /*  */ -.octicon-triangle-left:before { content: '\f044'} /*  */ -.octicon-triangle-right:before { content: '\f05a'} /*  */ -.octicon-triangle-up:before { content: '\f0aa'} /*  */ -.octicon-unfold:before { content: '\f039'} /*  */ -.octicon-unmute:before { content: '\f0ba'} /*  */ -.octicon-unverified:before { content: '\f0e8'} /*  */ -.octicon-verified:before { content: '\f0e6'} /*  */ -.octicon-versions:before { content: '\f064'} /*  */ -.octicon-watch:before { content: '\f0e0'} /*  */ -.octicon-remove-close:before, -.octicon-x:before { content: '\f081'} /*  */ -.octicon-zap:before { content: '\26A1'} /* ⚡ */ diff --git a/public/assets/octicons-3.5.0/octicons.eot b/public/assets/octicons-3.5.0/octicons.eot deleted file mode 100644 index c1d2f2927..000000000 Binary files a/public/assets/octicons-3.5.0/octicons.eot and /dev/null differ diff --git a/public/assets/octicons-3.5.0/octicons.svg b/public/assets/octicons-3.5.0/octicons.svg deleted file mode 100644 index 090870663..000000000 --- a/public/assets/octicons-3.5.0/octicons.svg +++ /dev/null @@ -1,188 +0,0 @@ - - - - -(c) 2012-2016 GitHub - -When using the GitHub logos, be sure to follow the GitHub logo guidelines (https://github.com/logos) - -Font License: SIL OFL 1.1 (http://scripts.sil.org/OFL) -Applies to all font files - -Code License: MIT (http://choosealicense.com/licenses/mit/) -Applies to all other files - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/octicons-3.5.0/octicons.ttf b/public/assets/octicons-3.5.0/octicons.ttf deleted file mode 100644 index 3dab5b669..000000000 Binary files a/public/assets/octicons-3.5.0/octicons.ttf and /dev/null differ diff --git a/public/assets/octicons-3.5.0/octicons.woff b/public/assets/octicons-3.5.0/octicons.woff deleted file mode 100644 index 0cd624c86..000000000 Binary files a/public/assets/octicons-3.5.0/octicons.woff and /dev/null differ diff --git a/public/assets/octicons-4.3.0/octicons.eot b/public/assets/octicons-4.3.0/octicons.eot new file mode 100755 index 000000000..b4c7a989a Binary files /dev/null and b/public/assets/octicons-4.3.0/octicons.eot differ diff --git a/public/assets/octicons-4.3.0/octicons.min.css b/public/assets/octicons-4.3.0/octicons.min.css new file mode 100755 index 000000000..a000669c9 --- /dev/null +++ b/public/assets/octicons-4.3.0/octicons.min.css @@ -0,0 +1 @@ +@font-face{font-family:Octicons;src:url(octicons.eot?ef21c39f0ca9b1b5116e5eb7ac5eabe6);src:url(octicons.eot?#iefix) format("embedded-opentype"),url(octicons.woff2?ef21c39f0ca9b1b5116e5eb7ac5eabe6) format("woff2"),url(octicons.woff?ef21c39f0ca9b1b5116e5eb7ac5eabe6) format("woff"),url(octicons.ttf?ef21c39f0ca9b1b5116e5eb7ac5eabe6) format("truetype"),url(octicons.svg?ef21c39f0ca9b1b5116e5eb7ac5eabe6#octicons) format("svg");font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 Octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-ms-user-select:none;user-select:none;speak:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:"\f02d"}.octicon-arrow-down:before{content:"\f03f"}.octicon-arrow-left:before{content:"\f040"}.octicon-arrow-right:before{content:"\f03e"}.octicon-arrow-small-down:before{content:"\f0a0"}.octicon-arrow-small-left:before{content:"\f0a1"}.octicon-arrow-small-right:before{content:"\f071"}.octicon-arrow-small-up:before{content:"\f09f"}.octicon-arrow-up:before{content:"\f03d"}.octicon-beaker:before{content:"\f0dd"}.octicon-bell:before{content:"\f0de"}.octicon-bold:before{content:"\f0e2"}.octicon-book:before{content:"\f007"}.octicon-bookmark:before{content:"\f07b"}.octicon-briefcase:before{content:"\f0d3"}.octicon-broadcast:before{content:"\f048"}.octicon-browser:before{content:"\f0c5"}.octicon-bug:before{content:"\f091"}.octicon-calendar:before{content:"\f068"}.octicon-check:before{content:"\f03a"}.octicon-checklist:before{content:"\f076"}.octicon-chevron-down:before{content:"\f0a3"}.octicon-chevron-left:before{content:"\f0a4"}.octicon-chevron-right:before{content:"\f078"}.octicon-chevron-up:before{content:"\f0a2"}.octicon-circle-slash:before{content:"\f084"}.octicon-circuit-board:before{content:"\f0d6"}.octicon-clippy:before{content:"\f035"}.octicon-clock:before{content:"\f046"}.octicon-cloud-download:before{content:"\f00b"}.octicon-cloud-upload:before{content:"\f00c"}.octicon-code:before{content:"\f05f"}.octicon-comment-discussion:before{content:"\f04f"}.octicon-comment:before{content:"\f02b"}.octicon-credit-card:before{content:"\f045"}.octicon-dash:before{content:"\f0ca"}.octicon-dashboard:before{content:"\f07d"}.octicon-database:before{content:"\f096"}.octicon-desktop-download:before{content:"\f0dc"}.octicon-device-camera-video:before{content:"\f057"}.octicon-device-camera:before{content:"\f056"}.octicon-device-desktop:before{content:"\f27c"}.octicon-device-mobile:before{content:"\f038"}.octicon-diff-added:before{content:"\f06b"}.octicon-diff-ignored:before{content:"\f099"}.octicon-diff-modified:before{content:"\f06d"}.octicon-diff-removed:before{content:"\f06c"}.octicon-diff-renamed:before{content:"\f06e"}.octicon-diff:before{content:"\f04d"}.octicon-ellipses:before{content:"\f101"}.octicon-ellipsis:before{content:"\f09a"}.octicon-eye:before{content:"\f04e"}.octicon-file-binary:before{content:"\f094"}.octicon-file-code:before{content:"\f010"}.octicon-file-directory:before{content:"\f016"}.octicon-file-media:before{content:"\f012"}.octicon-file-pdf:before{content:"\f014"}.octicon-file-submodule:before{content:"\f017"}.octicon-file-symlink-directory:before{content:"\f0b1"}.octicon-file-symlink-file:before{content:"\f0b0"}.octicon-file-text:before{content:"\f011"}.octicon-file-zip:before{content:"\f013"}.octicon-file:before{content:"\f102"}.octicon-flame:before{content:"\f0d2"}.octicon-fold:before{content:"\f0cc"}.octicon-gear:before{content:"\f02f"}.octicon-gift:before{content:"\f042"}.octicon-gist-secret:before{content:"\f08c"}.octicon-gist:before{content:"\f00e"}.octicon-git-branch:before{content:"\f020"}.octicon-git-commit:before{content:"\f01f"}.octicon-git-compare:before{content:"\f0ac"}.octicon-git-merge:before{content:"\f023"}.octicon-git-pull-request:before{content:"\f009"}.octicon-globe:before{content:"\f0b6"}.octicon-grabber:before{content:"\f103"}.octicon-graph:before{content:"\f043"}.octicon-heart:before{content:"\2665"}.octicon-history:before{content:"\f07e"}.octicon-home:before{content:"\f08d"}.octicon-horizontal-rule:before{content:"\f070"}.octicon-hubot:before{content:"\f09d"}.octicon-inbox:before{content:"\f0cf"}.octicon-info:before{content:"\f059"}.octicon-issue-closed:before{content:"\f028"}.octicon-issue-opened:before{content:"\f026"}.octicon-issue-reopened:before{content:"\f027"}.octicon-italic:before{content:"\f0e4"}.octicon-jersey:before{content:"\f019"}.octicon-key:before{content:"\f049"}.octicon-keyboard:before{content:"\f00d"}.octicon-law:before{content:"\f0d8"}.octicon-light-bulb:before{content:"\f000"}.octicon-link-external:before{content:"\f07f"}.octicon-link:before{content:"\f05c"}.octicon-list-ordered:before{content:"\f062"}.octicon-list-unordered:before{content:"\f061"}.octicon-location:before{content:"\f060"}.octicon-lock:before{content:"\f06a"}.octicon-logo-gist:before{content:"\f0ad"}.octicon-logo-github:before{content:"\f092"}.octicon-mail-read:before{content:"\f03c"}.octicon-mail-reply:before{content:"\f051"}.octicon-mail:before{content:"\f03b"}.octicon-mark-github:before{content:"\f00a"}.octicon-markdown:before{content:"\f0c9"}.octicon-megaphone:before{content:"\f077"}.octicon-mention:before{content:"\f0be"}.octicon-milestone:before{content:"\f075"}.octicon-mirror:before{content:"\f024"}.octicon-mortar-board:before{content:"\f0d7"}.octicon-mute:before{content:"\f080"}.octicon-no-newline:before{content:"\f09c"}.octicon-octoface:before{content:"\f008"}.octicon-organization:before{content:"\f037"}.octicon-package:before{content:"\f0c4"}.octicon-paintcan:before{content:"\f0d1"}.octicon-pencil:before{content:"\f058"}.octicon-person:before{content:"\f018"}.octicon-pin:before{content:"\f041"}.octicon-plug:before{content:"\f0d4"}.octicon-plus-small:before{content:"\f104"}.octicon-plus:before{content:"\f05d"}.octicon-primitive-dot:before{content:"\f052"}.octicon-primitive-square:before{content:"\f053"}.octicon-pulse:before{content:"\f085"}.octicon-question:before{content:"\f02c"}.octicon-quote:before{content:"\f063"}.octicon-radio-tower:before{content:"\f030"}.octicon-reply:before{content:"\f105"}.octicon-repo-clone:before{content:"\f04c"}.octicon-repo-force-push:before{content:"\f04a"}.octicon-repo-forked:before{content:"\f002"}.octicon-repo-pull:before{content:"\f006"}.octicon-repo-push:before{content:"\f005"}.octicon-repo:before{content:"\f001"}.octicon-rocket:before{content:"\f033"}.octicon-rss:before{content:"\f034"}.octicon-ruby:before{content:"\f047"}.octicon-search:before{content:"\f02e"}.octicon-server:before{content:"\f097"}.octicon-settings:before{content:"\f07c"}.octicon-shield:before{content:"\f0e1"}.octicon-sign-in:before{content:"\f036"}.octicon-sign-out:before{content:"\f032"}.octicon-smiley:before{content:"\f0e7"}.octicon-squirrel:before{content:"\f0b2"}.octicon-star:before{content:"\f02a"}.octicon-stop:before{content:"\f08f"}.octicon-sync:before{content:"\f087"}.octicon-tag:before{content:"\f015"}.octicon-tasklist:before{content:"\f0e5"}.octicon-telescope:before{content:"\f088"}.octicon-terminal:before{content:"\f0c8"}.octicon-text-size:before{content:"\f0e3"}.octicon-three-bars:before{content:"\f05e"}.octicon-thumbsdown:before{content:"\f0db"}.octicon-thumbsup:before{content:"\f0da"}.octicon-tools:before{content:"\f031"}.octicon-trashcan:before{content:"\f0d0"}.octicon-triangle-down:before{content:"\f05b"}.octicon-triangle-left:before{content:"\f044"}.octicon-triangle-right:before{content:"\f05a"}.octicon-triangle-up:before{content:"\f0aa"}.octicon-unfold:before{content:"\f039"}.octicon-unmute:before{content:"\f0ba"}.octicon-unverified:before{content:"\f0e8"}.octicon-verified:before{content:"\f0e6"}.octicon-versions:before{content:"\f064"}.octicon-watch:before{content:"\f0e0"}.octicon-x:before{content:"\f081"}.octicon-zap:before{content:"\26a1"} \ No newline at end of file diff --git a/public/assets/octicons-4.3.0/octicons.svg b/public/assets/octicons-4.3.0/octicons.svg new file mode 100755 index 000000000..41cbd3f1f --- /dev/null +++ b/public/assets/octicons-4.3.0/octicons.svg @@ -0,0 +1,429 @@ + + + + +Created by FontForge 20150913 at Mon Jul 11 12:02:11 2016 + By Aaron Shekey + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/octicons-4.3.0/octicons.ttf b/public/assets/octicons-4.3.0/octicons.ttf new file mode 100755 index 000000000..ff0dda184 Binary files /dev/null and b/public/assets/octicons-4.3.0/octicons.ttf differ diff --git a/public/assets/octicons-4.3.0/octicons.woff b/public/assets/octicons-4.3.0/octicons.woff new file mode 100755 index 000000000..01aa43d77 Binary files /dev/null and b/public/assets/octicons-4.3.0/octicons.woff differ diff --git a/public/assets/octicons-4.3.0/octicons.woff2 b/public/assets/octicons-4.3.0/octicons.woff2 new file mode 100755 index 000000000..69e7b2a40 Binary files /dev/null and b/public/assets/octicons-4.3.0/octicons.woff2 differ diff --git a/public/css/gogs.css b/public/css/gogs.css index 93a17628d..1a513b684 100644 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -94,13 +94,13 @@ code.wrap { .following.bar .top.menu .menu { z-index: 900; } +.following.bar .icon, +.following.bar .octicon { + margin-right: 5px !important; +} .following.bar .head.link.item { padding-right: 0 !important; } -.following.bar .head.link.item .dropdown.icon, -.following.bar .head.link.item .menu .octicon { - margin-right: 5px; -} .following.bar .avatar > .ui.image { margin-right: 0; } @@ -398,12 +398,6 @@ footer .ui.language .menu { width: 32px !important; height: 32px !important; } -.octicon.icon, -.mega-octicon.icon { - font-family: octicons; - font-size: 16px; - opacity: 1 !important; -} .sr-only { position: absolute; width: 1px; @@ -1109,8 +1103,8 @@ footer .ui.language .menu { padding-bottom: 80px; } .repository .head .column { - padding-top: 5px!important; - padding-bottom: 5px!important; + padding-top: 5px !important; + padding-bottom: 5px !important; } .repository .head .ui.compact.menu { margin-left: 1rem; @@ -1133,6 +1127,10 @@ footer .ui.language .menu { font-size: 12px; white-space: nowrap; } +.repository .head .octicon.octicon-repo-forked { + margin-top: -1px; + font-size: 15px; +} .repository .navbar .ui.label { margin-top: -2px; margin-left: 7px; @@ -1172,6 +1170,9 @@ footer .ui.language .menu { .repository .header-wrapper .ui.tabs.divider { border-bottom: none; } +.repository .header-wrapper .ui.tabular .octicon { + margin-right: 5px; +} .repository .filter.menu .label.color { border-radius: 3px; margin-left: 15px; @@ -1244,10 +1245,13 @@ footer .ui.language .menu { .repository.file.list #repo-files-table thead .ui.avatar { margin-bottom: 5px; } -.repository.file.list #repo-files-table tbody .icon { +.repository.file.list #repo-files-table tbody .octicon { margin-left: 3px; margin-right: 5px; } +.repository.file.list #repo-files-table tbody .octicon.octicon-mail-reply { + margin-right: 10px; +} .repository.file.list #repo-files-table td { padding-top: 8px; padding-bottom: 8px; @@ -2521,10 +2525,6 @@ footer .ui.language .menu { .dashboard.issues .ui.right .head.menu .item.active { color: #d9453d; } -.dashboard.feeds .head.menu .octicon, -.dashboard.issues .head.menu .octicon { - margin-right: 5px; -} .feeds .news .ui.avatar { margin-top: 13px; } @@ -2566,7 +2566,6 @@ footer .ui.language .menu { } .feeds .list .header .plus.icon { margin-top: 5px; - margin-right: 0; } .feeds .list ul { list-style: none; @@ -2584,9 +2583,14 @@ footer .ui.language .menu { display: block; } .feeds .list ul li a .octicon { - margin-right: 6px; color: #888; } +.feeds .list ul li a .octicon.rear { + font-size: 15px; +} +.feeds .list ul li a .star-num { + font-size: 12px; +} .feeds .list .repo-owner-name-list .item-name { max-width: 70%; margin-bottom: -4px; @@ -2671,7 +2675,7 @@ footer .ui.language .menu { } .ui.repository.list .item .ui.header .metas { color: #888; - font-size: 13px; + font-size: 14px; font-weight: normal; } .ui.repository.list .item .ui.header .metas span:not(:last-child) { diff --git a/public/less/_base.less b/public/less/_base.less index 545984051..ee7e8a525 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -82,12 +82,12 @@ pre, code { .top.menu .menu { z-index: 900; } + .icon, + .octicon { + margin-right: 5px !important; + } .head.link.item { padding-right: 0 !important; - .dropdown.icon, - .menu .octicon { - margin-right: 5px; - } } .avatar > .ui.image { margin-right: 0; @@ -378,14 +378,6 @@ footer { .generate-img(@n, (@i + 1)); } -// ensure Semantic UI .icon font family and 14px size does not apply to .icon.octicon -.octicon.icon, -.mega-octicon.icon { - font-family: octicons; - font-size: 16px; - opacity: 1 !important; -} - // Accessibility .sr-only { position: absolute; diff --git a/public/less/_dashboard.less b/public/less/_dashboard.less index b5dff32d5..5f1910b39 100644 --- a/public/less/_dashboard.less +++ b/public/less/_dashboard.less @@ -47,11 +47,6 @@ color: #d9453d; } } - .head.menu { - .octicon { - margin-right: 5px; - } - } } } @@ -102,7 +97,6 @@ .plus.icon { margin-top: 5px; - margin-right: 0; } } ul { @@ -124,8 +118,14 @@ display: block; .octicon { - margin-right: 6px; color: #888; + + &.rear { + font-size: 15px; + } + } + .star-num { + font-size: 12px; } } } diff --git a/public/less/_explore.less b/public/less/_explore.less index 479e7e355..41426e45b 100644 --- a/public/less/_explore.less +++ b/public/less/_explore.less @@ -29,7 +29,7 @@ .metas { color: #888; - font-size: 13px; + font-size: 14px; font-weight: normal; span:not(:last-child) { margin-right: 5px; diff --git a/public/less/_repository.less b/public/less/_repository.less index 5d4d73702..da28528d3 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -6,8 +6,8 @@ .head { .column { - padding-top: 5px!important; - padding-bottom: 5px!important; + padding-top: 5px !important; + padding-bottom: 5px !important; } .ui.compact.menu { margin-left: 1rem; @@ -30,6 +30,10 @@ font-size: 12px; white-space: nowrap; } + .octicon.octicon-repo-forked { + margin-top: -1px; + font-size: 15px; + } } .navbar { @@ -79,6 +83,9 @@ .ui.tabs.divider { border-bottom: none; } + .ui.tabular .octicon { + margin-right: 5px; + } } .filter.menu { .label.color { @@ -170,9 +177,12 @@ } } tbody { - .icon { + .octicon { margin-left: 3px; margin-right: 5px; + &.octicon-mail-reply { + margin-right: 10px; + } } } td { diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 46c128db5..1fb91e9aa 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -19,7 +19,7 @@ - + {{if .RequireSimpleMDE}} @@ -77,13 +77,13 @@
- {{.i18n.Tr "new_repo"}} + {{.i18n.Tr "new_repo"}} - {{.i18n.Tr "new_migrate"}} + {{.i18n.Tr "new_migrate"}} - {{.i18n.Tr "new_org"}} + {{.i18n.Tr "new_org"}}
@@ -101,15 +101,15 @@
- + {{.i18n.Tr "your_profile"}} - + {{.i18n.Tr "your_settings"}} - + {{.i18n.Tr "help"}} {{if .IsAdmin}} @@ -123,7 +123,7 @@
- + {{.i18n.Tr "sign_out"}} @@ -136,11 +136,11 @@
{{if .ShowRegistrationButton}} - {{.i18n.Tr "register"}} + {{.i18n.Tr "register"}} {{end}} - {{.i18n.Tr "sign_in"}} + {{.i18n.Tr "sign_in"}}
diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 304a637e8..a4beb2014 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -4,11 +4,11 @@
{{if $.PageIsExplore}}{{.Owner.Name}} / {{end}}{{.Name}} {{if .IsPrivate}} - + {{else if .IsFork}} - + {{else if .IsMirror}} - + {{end}}
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index acf4b71e1..900e606cb 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -7,12 +7,12 @@
{{.Org.FullName}} - {{if .IsOrganizationOwner}}{{end}} + {{if .IsOrganizationOwner}}{{end}}
{{if .Org.Description}}

{{.Org.Description}}

{{end}}
- {{if .Org.Location}}
{{.Org.Location}}
{{end}} - {{if .Org.Website}}
{{.Org.Website}}
{{end}} + {{if .Org.Location}}
{{.Org.Location}}
{{end}} + {{if .Org.Website}}
{{.Org.Website}}
{{end}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 1f8d1a08f..b8110081a 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -17,7 +17,7 @@ {{$.i18n.Tr "org.teams.remove_repo"}} {{end}} - + {{$.Org.Name}}/{{.Name}}
diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index b97e504c8..5eb123241 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -18,7 +18,7 @@
- {{.i18n.Tr "repo.branches"}} + {{.i18n.Tr "repo.branches"}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 1293fa431..d9ac29fbf 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -10,7 +10,7 @@
/
{{.Name}} {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} - {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RepoRelLink 1 -1}}
{{end}} + {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RelLink 1 -1}}
{{end}}
@@ -33,7 +33,7 @@ {{if .CanBeForked}}
- {{$.i18n.Tr "repo.fork"}} + {{$.i18n.Tr "repo.fork"}} {{.NumForks}} @@ -50,33 +50,33 @@
- {{.i18n.Tr "repo.code"}} + {{.i18n.Tr "repo.code"}} {{if .Repository.EnableIssues}} - {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} + {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} {{end}} {{if .Repository.AllowsPulls}} - {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} + {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} {{end}} - {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} + {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} - {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} + {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} {{if .Repository.EnableWiki}} - {{.i18n.Tr "repo.wiki"}} + {{.i18n.Tr "repo.wiki"}} {{end}} {{if .IsRepositoryAdmin}}
- {{.i18n.Tr "repo.settings"}} + {{.i18n.Tr "repo.settings"}}
{{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index fe7b9c33b..03052263c 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -49,8 +49,8 @@
- ZIP - TAR.GZ + ZIP + TAR.GZ
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index cc12f18e0..f2cdfc1ca 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -54,10 +54,10 @@

{{$.i18n.Tr "repo.release.downloads"}}

diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index 98b811d50..6abbe5a18 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -12,11 +12,11 @@
{{if .Website}} - {{.Website}} + {{.Website}} {{else if .Location}} - {{.Location}} + {{.Location}} {{else}} - {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} + {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} {{end}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 4db9e3905..82fd5c92d 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -20,7 +20,7 @@ {{if .HasParentPath}} - .. + .. {{end}} {{range $item := .Files}} @@ -29,7 +29,7 @@ {{if $entry.IsSubModule}} - + {{$refURL := $commit.RefURL AppUrl $.BranchLink}} {{if $refURL}} {{$entry.Name}} @ {{ShortSha $commit.RefID}} @@ -39,7 +39,7 @@ {{else}} - + {{$entry.Name}} {{end}} diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 602a49cb7..1cfbddce5 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -13,7 +13,7 @@ {{range .Pages}} - + {{.Name}} {{$timeSince := TimeSince .Updated $.Lang}} diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index eb4d7542c..f04cd6af3 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -29,10 +29,10 @@ {{range .Repos}}
  • - + {{.Name}} - {{.NumStars}} + {{.NumStars}}
    • @@ -49,12 +49,12 @@ {{range .CollaborativeRepos}}
  • - + {{.Owner.Name}} / {{.Name}} - {{.NumStars}} + {{.NumStars}}
    • @@ -80,10 +80,10 @@ {{range .ContextUser.Orgs}}
  • - + {{.Name}} - {{.NumRepos}} + {{.NumRepos}}
    • @@ -108,10 +108,10 @@ {{range .Mirrors}}
  • - + {{.Name}} - {{.Interval}}H + {{.Interval}}H
    • diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 094bca524..ff05b1515 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -22,7 +22,7 @@ {{end}}
    -    {{.i18n.Tr "new_org"}} +    {{.i18n.Tr "new_org"}}
    diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index b2e681404..8f68e932c 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -20,23 +20,23 @@