Merge branch 'master' into dark_theme_scrollbars

Author: zeripath

.drone.yml

@@ -24,7 +24,7 @@ pipeline:
       branch: [ master ]
 
   update-translations:
-    image: alpine:3.7
+    image: alpine:3.10
     commands:
       - mv ./options/locale/locale_en-US.ini ./options/
       - sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
@@ -163,7 +163,7 @@ pipeline:
       event: [ tag ]
 
   test-mysql8:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -294,7 +294,7 @@ pipeline:
       branch: [ master ]
 
   docker-dryrun:
-    image: plugins/docker:17.12
+    image: plugins/docker:18.09
     pull: true
     repo: gitea/gitea
     cache_from: gitea/gitea
@@ -303,7 +303,7 @@ pipeline:
       event: [ pull_request ]
 
   release-docker:
-    image: plugins/docker:17.12
+    image: plugins/docker:18.09
     pull: true
     secrets: [ docker_username, docker_password ]
     repo: gitea/gitea
@@ -314,7 +314,7 @@ pipeline:
       branch: [ release/* ]
 
   docker:
-    image: plugins/docker:17.12
+    image: plugins/docker:18.09
     secrets: [ docker_username, docker_password ]
     pull: true
     repo: gitea/gitea

Dockerfile

@@ -1,7 +1,7 @@
 
 ###################################
 #Build stage
-FROM golang:1.12-alpine3.9 AS build-env
+FROM golang:1.12-alpine3.10 AS build-env
 
 ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
@@ -18,7 +18,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
 RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
  && make clean generate build
 
-FROM alpine:3.9
+FROM alpine:3.10
 LABEL maintainer="[email protected]"
 
 EXPOSE 22 3000

modules/git/commit_info.go

@@ -37,7 +37,13 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string, cache LastCom
 			entryCommit := convertCommit(rev)
 			if entry.IsSubModule() {
 				subModuleURL := ""
-				if subModule, err := commit.GetSubModule(entry.Name()); err != nil {
+				var fullPath string
+				if len(treePath) > 0 {
+					fullPath = treePath + "/" + entry.Name()
+				} else {
+					fullPath = entry.Name()
+				}
+				if subModule, err := commit.GetSubModule(fullPath); err != nil {
 					return nil, nil, err
 				} else if subModule != nil {
 					subModuleURL = subModule.URL

public/css/theme-arc-green.css

@@ -98,7 +98,13 @@ footer{background:#2e323e;border-top:1px solid #313131}
 .markdown:not(code) h2{border-bottom:1px solid #304251}
 .hljs,.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#9daccc}
 .markdown:not(code) .highlight pre,.markdown:not(code) pre{background-color:#2a2e3a;border:1px solid #404552}
-.markdown:not(code) table tr:nth-child(2n){background-color:#474d61}
+.markdown:not(code) table tr:nth-child(2n){background-color:#2a2e39}
+.markdown:not(code) table tr:nth-child(2n-1){background-color:#383b44}
+.markdown:not(code) table thead tr:nth-child(2n-1){background-color:#464c5d!important}
+.markdown:not(code) table td,.markdown:not(code) table th{border-color:#4c505c!important}
+.repository.file.editor.edit,.repository.wiki.new .CodeMirror{border-right:1px solid rgba(187,187,187,.6);border-left:1px solid rgba(187,187,187,.6);border-bottom:1px solid rgba(187,187,187,.6)}
+.repository.file.editor.edit .editor-preview,.repository.file.editor.edit .editor-preview-side,.repository.wiki.new .CodeMirror .editor-preview,.repository.wiki.new .CodeMirror .editor-preview-side{background:#353945}
+.repository.file.editor.edit .editor-preview .markdown:not(code).ui.segment,.repository.file.editor.edit .editor-preview-side .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror .editor-preview .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror .editor-preview-side .markdown:not(code).ui.segment{border-width:0}
 .ui.dropdown .menu{background:#2c303a}
 .ui.dropdown .menu>.message:not(.ui){color:#636363}
 .ui.input{color:#dbdbdb}

public/js/index.js

@@ -1144,7 +1144,7 @@ function initWikiForm() {
                             "text": plainText
                         },
                         function (data) {
-                            preview.innerHTML = '<div class="markdown">' + data + '</div>';
+                            preview.innerHTML = '<div class="markdown ui segment">' + data + '</div>';
                             emojify.run($('.editor-preview')[0]);
                         }
                     );
@@ -1224,7 +1224,7 @@ function setSimpleMDE($editArea) {
                         "text": plainText
                     },
                     function (data) {
-                        preview.innerHTML = '<div class="markdown">' + data + '</div>';
+                        preview.innerHTML = '<div class="markdown ui segment">' + data + '</div>';
                         emojify.run($('.editor-preview')[0]);
                     }
                 );

public/less/themes/arc-green.less

@@ -554,7 +554,36 @@ a.ui.basic.green.label:hover {
 }
 
 .markdown:not(code) table tr:nth-child(2n) {
-    background-color: #474d61;
+    background-color: #2a2e39;
+}
+
+.markdown:not(code) table tr:nth-child(2n-1) {
+    background-color: #383b44;
+}
+
+.markdown:not(code) table thead tr:nth-child(2n-1) {
+    background-color: #464c5d !important;
+}
+
+.markdown:not(code) table td,
+.markdown:not(code) table th {
+    border-color: #4c505c !important;
+}
+
+.repository.file.editor.edit,
+.repository.wiki.new .CodeMirror {
+    border-right: 1px solid rgba(187,187,187, 0.6);
+    border-left: 1px solid rgba(187,187,187, 0.6);
+    border-bottom: 1px solid rgba(187,187,187, 0.6);
+
+    .editor-preview,
+    .editor-preview-side {
+        background: #353945;
+
+        .markdown:not(code).ui.segment {
+            border-width: 0;
+        }
+    }
 }
 
 .ui.dropdown .menu {