diff --git a/.fswatch.json b/.fswatch.json deleted file mode 100644 index 7b12022c12..0000000000 --- a/.fswatch.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "paths": ["."], - "depth": 2, - "exclude": [], - "include": ["\\.go$", "\\.ini$"], - "command": [ - "bash", "-c", "go build && ./gogs web" - ], - "env": { - "POWERED_BY": "github.com/shxsun/fswatch" - } -} diff --git a/.gopmfile b/.gopmfile index 6edec77690..3ba514afc8 100644 --- a/.gopmfile +++ b/.gopmfile @@ -8,7 +8,7 @@ github.com/Unknwon/cae = commit:2e70a1351b github.com/Unknwon/com = commit:2cbcbc6916 github.com/Unknwon/goconfig = commit:0f8d8dc1c0 github.com/Unknwon/i18n = commit:47baeff8d0 -github.com/Unknwon/macaron = commit:f22f45d79a +github.com/Unknwon/macaron = github.com/codegangsta/cli = commit:7381bc4e62 github.com/go-sql-driver/mysql = commit:8111ee3ec3 github.com/go-xorm/core = commit:750aae0fa5 @@ -17,10 +17,10 @@ github.com/gogits/gfm = commit:40f747a9c0 github.com/gogits/oauth2 = commit:99cbec870a github.com/lib/pq = commit:b021d0ef20 github.com/macaron-contrib/cache = commit:204d8e5137 -github.com/macaron-contrib/captcha = commit:8f3f1ac0e3 -github.com/macaron-contrib/csrf = commit:cd84c01723 -github.com/macaron-contrib/i18n = commit:489cc194b5 -github.com/macaron-contrib/session = commit:80a88a1bba +github.com/macaron-contrib/captcha = +github.com/macaron-contrib/csrf = +github.com/macaron-contrib/i18n = +github.com/macaron-contrib/session = github.com/macaron-contrib/toolbox = commit:57127bcc89 github.com/mattn/go-sqlite3 = commit:a80c27ba33 github.com/nfnt/resize = commit:581d15cb53 diff --git a/gogs.go b/gogs.go index 645e4e3398..b1b9fe60d5 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.3.0921 Beta" +const APP_VER = "0.5.3.0922 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index db4aad2283..5429d01264 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -294,6 +294,12 @@ img.avatar-100 { .markdown li:first-child { margin-top: 0; } +.markdown code { + padding: 0.2em 0.5em; + margin: 0; + background-color: rgba(0, 0, 0, 0.04); + border-radius: 3px; +} .markdown > pre { font-size: 14px; line-height: 1.6; @@ -304,6 +310,10 @@ img.avatar-100 { padding: 10px; background-color: #f8f8f8; } +.markdown > pre code { + padding: 0; + background-color: inherit; +} .markdown img { padding: 10px 0; max-width: 100%; diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css index 7c385c1349..f3f6eded79 100644 --- a/public/ng/css/ui.css +++ b/public/ng/css/ui.css @@ -151,8 +151,7 @@ code, kbd, pre, samp { - font-family: monospace, monospace; - font-size: 1em; + font: 14px Consolas, "Liberation Mono", Menlo, Courier, monospace; } .text-left { text-align: left; @@ -277,9 +276,6 @@ hr { border-bottom: 1px solid #dddddd; margin-bottom: .75em; } -p code { - color: #b63b2c; -} .radius { border-radius: .25em; } diff --git a/public/ng/less/gogs/markdown.less b/public/ng/less/gogs/markdown.less index ee69fab8b4..72cd610aae 100644 --- a/public/ng/less/gogs/markdown.less +++ b/public/ng/less/gogs/markdown.less @@ -26,7 +26,13 @@ margin-top: 0; } } - > pre { + code { + padding: 0.2em 0.5em; + margin: 0; + background-color: rgba(0,0,0,0.04); + border-radius: 3px; + } + >pre { font-size: 14px; line-height: 1.6; overflow: auto; @@ -35,6 +41,10 @@ margin: 5px 0; padding: 10px; background-color: #f8f8f8; + code { + padding: 0; + background-color: inherit; + } } img { padding: 10px 0; diff --git a/public/ng/less/ui/reset.less b/public/ng/less/ui/reset.less index 36906ce5a7..8ff45d694d 100644 --- a/public/ng/less/ui/reset.less +++ b/public/ng/less/ui/reset.less @@ -193,8 +193,7 @@ code, kbd, pre, samp { - font-family: monospace, monospace; - font-size: 1em; + font: 14px Consolas, "Liberation Mono", Menlo, Courier, monospace; } .text-left { @@ -342,15 +341,6 @@ hr { border-bottom: 1px solid @hrColor; margin-bottom: .75em; } - -// code element - -p { - code { - color: @inlineCodeColor; - } -} - // radius element .radius { diff --git a/templates/.VERSION b/templates/.VERSION index 4e0c5d6102..19d8171e8f 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.3.0921 Beta \ No newline at end of file +0.5.3.0922 Beta \ No newline at end of file