Skip to content

Commit a46efe2

Browse files
tboergertboerger
authored
Merge pull request #54 from joubertredrat/changes-less-css
Set default less and css to new default name
2 parents 03902bb + 747f86a commit a46efe2

File tree

6 files changed

+35
-44
lines changed

6 files changed

+35
-44
lines changed

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(shell gi
33

44
DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
55
LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)
6-
GENERATED := modules/bindata/bindata.go public/css/gogs.css
6+
GENERATED := modules/bindata/bindata.go public/css/index.css
77

88
TAGS = ""
99
BUILD_FLAGS = "-v"
@@ -15,7 +15,7 @@ GOVET = go tool vet -composites=false -methods=false -structtags=false
1515

1616
.PHONY: build pack release bindata clean
1717

18-
.IGNORE: public/css/gogs.css
18+
.IGNORE: public/css/index.css
1919

2020
all: build
2121

@@ -53,9 +53,9 @@ bindata: modules/bindata/bindata.go
5353
modules/bindata/bindata.go: $(DATA_FILES)
5454
go-bindata -o=$@ -ignore="\\.DS_Store|README.md|TRANSLATORS" -pkg=bindata conf/...
5555

56-
less: public/css/gogs.css
56+
less: public/css/index.css
5757

58-
public/css/gogs.css: $(LESS_FILES)
58+
public/css/index.css: $(LESS_FILES)
5959
lessc $< $@
6060

6161
clean:

‎public/config.codekit

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"outputPathIsOutsideProject": 0,
1212
"outputPathIsSetByUser": 0
1313
},
14-
"\/css\/gogs.css": {
14+
"\/css\/index.css": {
1515
"fileType": 16,
1616
"ignore": 1,
1717
"ignoreWasSetByUser": 0,
18-
"inputAbbreviatedPath": "\/css\/gogs.css",
18+
"inputAbbreviatedPath": "\/css\/index.css",
1919
"outputAbbreviatedPath": "No Output Path",
2020
"outputPathIsOutsideProject": 0,
2121
"outputPathIsSetByUser": 0
@@ -128,11 +128,11 @@
128128
"outputPathIsSetByUser": 0,
129129
"processed": 1
130130
},
131-
"\/js\/gogs.js": {
131+
"\/js\/index.js": {
132132
"fileType": 64,
133133
"ignore": 1,
134134
"ignoreWasSetByUser": 1,
135-
"inputAbbreviatedPath": "\/js\/gogs.js",
135+
"inputAbbreviatedPath": "\/js\/index.js",
136136
"outputAbbreviatedPath": "\/js\/min\/gogs-min.js",
137137
"outputPathIsOutsideProject": 0,
138138
"outputPathIsSetByUser": 0,
@@ -421,16 +421,16 @@
421421
"strictMath": 0,
422422
"strictUnits": 0
423423
},
424-
"\/less\/gogs.less": {
424+
"\/less\/index.less": {
425425
"allowInsecureImports": 0,
426426
"createSourceMap": 0,
427427
"disableJavascript": 0,
428428
"fileType": 1,
429429
"ieCompatibility": 1,
430430
"ignore": 0,
431431
"ignoreWasSetByUser": 1,
432-
"inputAbbreviatedPath": "\/less\/gogs.less",
433-
"outputAbbreviatedPath": "\/css\/gogs.css",
432+
"inputAbbreviatedPath": "\/less\/index.less",
433+
"outputAbbreviatedPath": "\/css\/index.css",
434434
"outputPathIsOutsideProject": 0,
435435
"outputPathIsSetByUser": 1,
436436
"outputStyle": 0,
@@ -1258,4 +1258,4 @@
12581258
"websiteRelativeRoot": ""
12591259
},
12601260
"settingsFileVersion": "2"
1261-
}
1261+
}

‎public/css/gogs.css renamed to ‎public/css/index.css

+21-30
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,18 @@ pre.wrap,
3131
code.wrap {
3232
white-space: pre-wrap;
3333
/* CSS 3 */
34-
3534
word-break: break-word;
3635
}
3736
.dont-break-out {
3837
/* These are technically the same, but use both */
39-
4038
overflow-wrap: break-word;
4139
word-wrap: break-word;
4240
-ms-word-break: break-all;
4341
/* This is the dangerous one in WebKit, as it breaks things wherever */
44-
4542
word-break: break-all;
4643
/* Instead use this non-standard one: */
47-
4844
word-break: break-word;
4945
/* Adds a hyphen where the word breaks, if supported (No Blink) */
50-
5146
-ms-hyphens: auto;
5247
-moz-hyphens: auto;
5348
-webkit-hyphens: auto;
@@ -817,7 +812,7 @@ footer .ui.language .menu {
817812
border: solid 1px #ccc;
818813
border-bottom-color: #bbb;
819814
border-radius: 3px;
820-
box-shadow: inset 0 -1px 0 #bbbbbb;
815+
box-shadow: inset 0 -1px 0 #bbb;
821816
}
822817
.markdown:not(code) input[type="checkbox"] {
823818
vertical-align: middle !important;
@@ -888,7 +883,7 @@ footer .ui.language .menu {
888883
}
889884
.install form label {
890885
text-align: right;
891-
width: 320px;
886+
width: 320px !important;
892887
}
893888
.install form input {
894889
width: 35% !important;
@@ -897,7 +892,7 @@ footer .ui.language .menu {
897892
text-align: left;
898893
}
899894
.install form .field .help {
900-
margin-left: 335px;
895+
margin-left: 335px !important;
901896
}
902897
.install form .field.optional .title {
903898
margin-left: 38%;
@@ -932,18 +927,18 @@ footer .ui.language .menu {
932927
text-align: center;
933928
}
934929
#create-page-form form .header {
935-
padding-left: 280px;
930+
padding-left: 280px !important;
936931
}
937932
#create-page-form form .inline.field > label {
938933
text-align: right;
939-
width: 250px;
934+
width: 250px !important;
940935
word-wrap: break-word;
941936
}
942937
#create-page-form form .help {
943-
margin-left: 265px;
938+
margin-left: 265px !important;
944939
}
945940
#create-page-form form .optional .title {
946-
margin-left: 250px;
941+
margin-left: 250px !important;
947942
}
948943
#create-page-form form input,
949944
#create-page-form form textarea {
@@ -969,30 +964,30 @@ footer .ui.language .menu {
969964
.user.reset.password form .header,
970965
.user.signin form .header,
971966
.user.signup form .header {
972-
padding-left: 280px;
967+
padding-left: 280px !important;
973968
}
974969
.user.activate form .inline.field > label,
975970
.user.forgot.password form .inline.field > label,
976971
.user.reset.password form .inline.field > label,
977972
.user.signin form .inline.field > label,
978973
.user.signup form .inline.field > label {
979974
text-align: right;
980-
width: 250px;
975+
width: 250px !important;
981976
word-wrap: break-word;
982977
}
983978
.user.activate form .help,
984979
.user.forgot.password form .help,
985980
.user.reset.password form .help,
986981
.user.signin form .help,
987982
.user.signup form .help {
988-
margin-left: 265px;
983+
margin-left: 265px !important;
989984
}
990985
.user.activate form .optional .title,
991986
.user.forgot.password form .optional .title,
992987
.user.reset.password form .optional .title,
993988
.user.signin form .optional .title,
994989
.user.signup form .optional .title {
995-
margin-left: 250px;
990+
margin-left: 250px !important;
996991
}
997992
.user.activate form input,
998993
.user.forgot.password form input,
@@ -1026,7 +1021,7 @@ footer .ui.language .menu {
10261021
.user.reset.password form .inline.field > label,
10271022
.user.signin form .inline.field > label,
10281023
.user.signup form .inline.field > label {
1029-
width: 200px;
1024+
width: 200px !important;
10301025
}
10311026
.repository.new.repo form,
10321027
.repository.new.migrate form,
@@ -1042,24 +1037,24 @@ footer .ui.language .menu {
10421037
.repository.new.repo form .header,
10431038
.repository.new.migrate form .header,
10441039
.repository.new.fork form .header {
1045-
padding-left: 280px;
1040+
padding-left: 280px !important;
10461041
}
10471042
.repository.new.repo form .inline.field > label,
10481043
.repository.new.migrate form .inline.field > label,
10491044
.repository.new.fork form .inline.field > label {
10501045
text-align: right;
1051-
width: 250px;
1046+
width: 250px !important;
10521047
word-wrap: break-word;
10531048
}
10541049
.repository.new.repo form .help,
10551050
.repository.new.migrate form .help,
10561051
.repository.new.fork form .help {
1057-
margin-left: 265px;
1052+
margin-left: 265px !important;
10581053
}
10591054
.repository.new.repo form .optional .title,
10601055
.repository.new.migrate form .optional .title,
10611056
.repository.new.fork form .optional .title {
1062-
margin-left: 250px;
1057+
margin-left: 250px !important;
10631058
}
10641059
.repository.new.repo form input,
10651060
.repository.new.migrate form input,
@@ -1094,7 +1089,7 @@ footer .ui.language .menu {
10941089
width: 50%!important;
10951090
}
10961091
.repository.new.repo .ui.form #auto-init {
1097-
margin-left: 265px;
1092+
margin-left: 265px !important;
10981093
}
10991094
.new.webhook form .help {
11001095
margin-left: 25px;
@@ -2340,18 +2335,14 @@ footer .ui.language .menu {
23402335
}
23412336
.settings .hook.list .item a {
23422337
/* These are technically the same, but use both */
2343-
23442338
overflow-wrap: break-word;
23452339
word-wrap: break-word;
23462340
-ms-word-break: break-all;
23472341
/* This is the dangerous one in WebKit, as it breaks things wherever */
2348-
23492342
word-break: break-all;
23502343
/* Instead use this non-standard one: */
2351-
23522344
word-break: break-word;
23532345
/* Adds a hyphen where the word breaks, if supported (No Blink) */
2354-
23552346
-ms-hyphens: auto;
23562347
-moz-hyphens: auto;
23572348
-webkit-hyphens: auto;
@@ -2550,18 +2541,18 @@ footer .ui.language .menu {
25502541
text-align: center;
25512542
}
25522543
.organization.new.org form .header {
2553-
padding-left: 280px;
2544+
padding-left: 280px !important;
25542545
}
25552546
.organization.new.org form .inline.field > label {
25562547
text-align: right;
2557-
width: 250px;
2548+
width: 250px !important;
25582549
word-wrap: break-word;
25592550
}
25602551
.organization.new.org form .help {
2561-
margin-left: 265px;
2552+
margin-left: 265px !important;
25622553
}
25632554
.organization.new.org form .optional .title {
2564-
margin-left: 250px;
2555+
margin-left: 250px !important;
25652556
}
25662557
.organization.new.org form input,
25672558
.organization.new.org form textarea {

‎public/js/gogs.js renamed to ‎public/js/index.js

File renamed without changes.

‎public/less/gogs.less renamed to ‎public/less/index.less

File renamed without changes.

‎templates/base/head.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
<!-- Stylesheet -->
3535
<link rel="stylesheet" href="{{AppSubUrl}}/css/semantic-2.2.1.min.css">
36-
<link rel="stylesheet" href="{{AppSubUrl}}/css/gogs.css?v={{MD5 AppVer}}">
36+
<link rel="stylesheet" href="{{AppSubUrl}}/css/index.css?v={{MD5 AppVer}}">
3737

3838
<!-- JavaScript -->
3939
<script src="{{AppSubUrl}}/js/semantic-2.2.1.min.js"></script>
40-
<script src="{{AppSubUrl}}/js/gogs.js?v={{MD5 AppVer}}"></script>
40+
<script src="{{AppSubUrl}}/js/index.js?v={{MD5 AppVer}}"></script>
4141

4242
<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
4343

0 commit comments

Comments
 (0)