diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | public/config.codekit | 16 | ||||
| -rw-r--r-- | public/css/index.css (renamed from public/css/gogs.css) | 51 | ||||
| -rw-r--r-- | public/js/index.js (renamed from public/js/gogs.js) | 0 | ||||
| -rw-r--r-- | public/less/index.less (renamed from public/less/gogs.less) | 0 | ||||
| -rw-r--r-- | templates/base/head.tmpl | 4 |
6 files changed, 35 insertions, 44 deletions
@@ -3,7 +3,7 @@ LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(shell gi DATA_FILES := $(shell find conf | sed 's/ /\\ /g') LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less) -GENERATED := modules/bindata/bindata.go public/css/gogs.css +GENERATED := modules/bindata/bindata.go public/css/index.css TAGS = "" BUILD_FLAGS = "-v" @@ -15,7 +15,7 @@ GOVET = go tool vet -composites=false -methods=false -structtags=false .PHONY: build pack release bindata clean -.IGNORE: public/css/gogs.css +.IGNORE: public/css/index.css all: build @@ -53,9 +53,9 @@ bindata: modules/bindata/bindata.go modules/bindata/bindata.go: $(DATA_FILES) go-bindata -o=$@ -ignore="\\.DS_Store|README.md|TRANSLATORS" -pkg=bindata conf/... -less: public/css/gogs.css +less: public/css/index.css -public/css/gogs.css: $(LESS_FILES) +public/css/index.css: $(LESS_FILES) lessc $< $@ clean: diff --git a/public/config.codekit b/public/config.codekit index fa0fae58a7..697e245e8d 100644 --- a/public/config.codekit +++ b/public/config.codekit @@ -11,11 +11,11 @@ "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0 }, - "\/css\/gogs.css": { + "\/css\/index.css": { "fileType": 16, "ignore": 1, "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/css\/gogs.css", + "inputAbbreviatedPath": "\/css\/index.css", "outputAbbreviatedPath": "No Output Path", "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0 @@ -128,11 +128,11 @@ "outputPathIsSetByUser": 0, "processed": 1 }, - "\/js\/gogs.js": { + "\/js\/index.js": { "fileType": 64, "ignore": 1, "ignoreWasSetByUser": 1, - "inputAbbreviatedPath": "\/js\/gogs.js", + "inputAbbreviatedPath": "\/js\/index.js", "outputAbbreviatedPath": "\/js\/min\/gogs-min.js", "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0, @@ -421,7 +421,7 @@ "strictMath": 0, "strictUnits": 0 }, - "\/less\/gogs.less": { + "\/less\/index.less": { "allowInsecureImports": 0, "createSourceMap": 0, "disableJavascript": 0, @@ -429,8 +429,8 @@ "ieCompatibility": 1, "ignore": 0, "ignoreWasSetByUser": 1, - "inputAbbreviatedPath": "\/less\/gogs.less", - "outputAbbreviatedPath": "\/css\/gogs.css", + "inputAbbreviatedPath": "\/less\/index.less", + "outputAbbreviatedPath": "\/css\/index.css", "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 1, "outputStyle": 0, @@ -1258,4 +1258,4 @@ "websiteRelativeRoot": "" }, "settingsFileVersion": "2" -}
\ No newline at end of file +} diff --git a/public/css/gogs.css b/public/css/index.css index e4638bb069..99a57c78e0 100644 --- a/public/css/gogs.css +++ b/public/css/index.css @@ -31,23 +31,18 @@ pre.wrap, code.wrap { white-space: pre-wrap; /* CSS 3 */ - word-break: break-word; } .dont-break-out { /* These are technically the same, but use both */ - overflow-wrap: break-word; word-wrap: break-word; -ms-word-break: break-all; /* This is the dangerous one in WebKit, as it breaks things wherever */ - word-break: break-all; /* Instead use this non-standard one: */ - word-break: break-word; /* Adds a hyphen where the word breaks, if supported (No Blink) */ - -ms-hyphens: auto; -moz-hyphens: auto; -webkit-hyphens: auto; @@ -817,7 +812,7 @@ footer .ui.language .menu { border: solid 1px #ccc; border-bottom-color: #bbb; border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbbbbb; + box-shadow: inset 0 -1px 0 #bbb; } .markdown:not(code) input[type="checkbox"] { vertical-align: middle !important; @@ -888,7 +883,7 @@ footer .ui.language .menu { } .install form label { text-align: right; - width: 320px; + width: 320px !important; } .install form input { width: 35% !important; @@ -897,7 +892,7 @@ footer .ui.language .menu { text-align: left; } .install form .field .help { - margin-left: 335px; + margin-left: 335px !important; } .install form .field.optional .title { margin-left: 38%; @@ -932,18 +927,18 @@ footer .ui.language .menu { text-align: center; } #create-page-form form .header { - padding-left: 280px; + padding-left: 280px !important; } #create-page-form form .inline.field > label { text-align: right; - width: 250px; + width: 250px !important; word-wrap: break-word; } #create-page-form form .help { - margin-left: 265px; + margin-left: 265px !important; } #create-page-form form .optional .title { - margin-left: 250px; + margin-left: 250px !important; } #create-page-form form input, #create-page-form form textarea { @@ -969,7 +964,7 @@ footer .ui.language .menu { .user.reset.password form .header, .user.signin form .header, .user.signup form .header { - padding-left: 280px; + padding-left: 280px !important; } .user.activate form .inline.field > label, .user.forgot.password form .inline.field > label, @@ -977,7 +972,7 @@ footer .ui.language .menu { .user.signin form .inline.field > label, .user.signup form .inline.field > label { text-align: right; - width: 250px; + width: 250px !important; word-wrap: break-word; } .user.activate form .help, @@ -985,14 +980,14 @@ footer .ui.language .menu { .user.reset.password form .help, .user.signin form .help, .user.signup form .help { - margin-left: 265px; + margin-left: 265px !important; } .user.activate form .optional .title, .user.forgot.password form .optional .title, .user.reset.password form .optional .title, .user.signin form .optional .title, .user.signup form .optional .title { - margin-left: 250px; + margin-left: 250px !important; } .user.activate form input, .user.forgot.password form input, @@ -1026,7 +1021,7 @@ footer .ui.language .menu { .user.reset.password form .inline.field > label, .user.signin form .inline.field > label, .user.signup form .inline.field > label { - width: 200px; + width: 200px !important; } .repository.new.repo form, .repository.new.migrate form, @@ -1042,24 +1037,24 @@ footer .ui.language .menu { .repository.new.repo form .header, .repository.new.migrate form .header, .repository.new.fork form .header { - padding-left: 280px; + padding-left: 280px !important; } .repository.new.repo form .inline.field > label, .repository.new.migrate form .inline.field > label, .repository.new.fork form .inline.field > label { text-align: right; - width: 250px; + width: 250px !important; word-wrap: break-word; } .repository.new.repo form .help, .repository.new.migrate form .help, .repository.new.fork form .help { - margin-left: 265px; + margin-left: 265px !important; } .repository.new.repo form .optional .title, .repository.new.migrate form .optional .title, .repository.new.fork form .optional .title { - margin-left: 250px; + margin-left: 250px !important; } .repository.new.repo form input, .repository.new.migrate form input, @@ -1094,7 +1089,7 @@ footer .ui.language .menu { width: 50%!important; } .repository.new.repo .ui.form #auto-init { - margin-left: 265px; + margin-left: 265px !important; } .new.webhook form .help { margin-left: 25px; @@ -2340,18 +2335,14 @@ footer .ui.language .menu { } .settings .hook.list .item a { /* These are technically the same, but use both */ - overflow-wrap: break-word; word-wrap: break-word; -ms-word-break: break-all; /* This is the dangerous one in WebKit, as it breaks things wherever */ - word-break: break-all; /* Instead use this non-standard one: */ - word-break: break-word; /* Adds a hyphen where the word breaks, if supported (No Blink) */ - -ms-hyphens: auto; -moz-hyphens: auto; -webkit-hyphens: auto; @@ -2550,18 +2541,18 @@ footer .ui.language .menu { text-align: center; } .organization.new.org form .header { - padding-left: 280px; + padding-left: 280px !important; } .organization.new.org form .inline.field > label { text-align: right; - width: 250px; + width: 250px !important; word-wrap: break-word; } .organization.new.org form .help { - margin-left: 265px; + margin-left: 265px !important; } .organization.new.org form .optional .title { - margin-left: 250px; + margin-left: 250px !important; } .organization.new.org form input, .organization.new.org form textarea { diff --git a/public/js/gogs.js b/public/js/index.js index d7fca17423..d7fca17423 100644 --- a/public/js/gogs.js +++ b/public/js/index.js diff --git a/public/less/gogs.less b/public/less/index.less index d885195f5f..d885195f5f 100644 --- a/public/less/gogs.less +++ b/public/less/index.less diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 0c19b19cf9..6eae8f31bb 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -33,11 +33,11 @@ <!-- Stylesheet --> <link rel="stylesheet" href="{{AppSubUrl}}/css/semantic-2.2.1.min.css"> - <link rel="stylesheet" href="{{AppSubUrl}}/css/gogs.css?v={{MD5 AppVer}}"> + <link rel="stylesheet" href="{{AppSubUrl}}/css/index.css?v={{MD5 AppVer}}"> <!-- JavaScript --> <script src="{{AppSubUrl}}/js/semantic-2.2.1.min.js"></script> - <script src="{{AppSubUrl}}/js/gogs.js?v={{MD5 AppVer}}"></script> + <script src="{{AppSubUrl}}/js/index.js?v={{MD5 AppVer}}"></script> <title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title> |