Skip to content

Commit d9db188

Browse files
sapkappleboy
sapk
authored and
appleboy
committed
Fix #1418 (#1456)
1 parent e0df611 commit d9db188

File tree

5 files changed

+28
-118
lines changed

5 files changed

+28
-118
lines changed

‎public/css/index.css

Lines changed: 11 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,83 +2374,35 @@ footer .ui.language .menu {
23742374
.settings .content .segment {
23752375
box-shadow: 0 1px 2px 0 rgba(34, 36, 38, 0.15);
23762376
}
2377-
.settings .list .item .green {
2377+
.settings .list > .item .green {
23782378
color: #21BA45 !important;
23792379
}
2380-
.settings .list .item:not(:first-child) {
2380+
.settings .list > .item:not(:first-child) {
23812381
border-top: 1px solid #eaeaea;
23822382
padding: 1rem;
23832383
margin: 15px -1rem -1rem -1rem;
2384-
min-height: 60px;
23852384
}
2386-
.settings .list .item > .mega-octicon {
2385+
.settings .list > .item > .mega-octicon {
23872386
display: table-cell;
23882387
}
2389-
.settings .list .item > .mega-octicon + .content {
2388+
.settings .list > .item > .mega-octicon + .content {
23902389
display: table-cell;
23912390
padding: 0 0 0 .5em;
23922391
vertical-align: top;
23932392
}
2394-
.settings .list.key .meta {
2395-
padding-top: 5px;
2396-
color: #666;
2397-
}
2398-
.settings .hook.list > .item:not(:first-child) {
2399-
border-top: 1px solid #eaeaea;
2400-
}
2401-
.settings .hook.list .item {
2402-
padding: 10px 20px;
2403-
}
2404-
.settings .hook.list .item .octicon,
2405-
.settings .hook.list .item .fa {
2406-
width: 20px;
2407-
text-align: center;
2408-
}
2409-
.settings .hook.list .item a {
2410-
/* These are technically the same, but use both */
2411-
overflow-wrap: break-word;
2412-
word-wrap: break-word;
2413-
-ms-word-break: break-all;
2414-
/* This is the dangerous one in WebKit, as it breaks things wherever */
2415-
word-break: break-all;
2416-
/* Instead use this non-standard one: */
2417-
word-break: break-word;
2418-
/* Adds a hyphen where the word breaks, if supported (No Blink) */
2419-
-ms-hyphens: auto;
2420-
-moz-hyphens: auto;
2421-
-webkit-hyphens: auto;
2422-
hyphens: auto;
2423-
}
2424-
.settings .hook.history.list .item {
2425-
padding-left: 13px;
2426-
}
2427-
.settings .hook.history.list .item .meta .ui.right {
2428-
margin-top: 5px;
2429-
}
2430-
.settings .hook.history.list .item .meta .ui.right .time {
2431-
font-size: 12px;
2432-
}
2433-
.settings .hook.history.list .item .info {
2393+
.settings .list > .item .info {
24342394
margin-top: 10px;
24352395
}
2436-
.settings .hook.history.list .item .info .tabular.menu .item {
2437-
font-weight: 500;
2438-
}
2439-
.settings .hook.history.list .item .info .tab.segment {
2396+
.settings .list > .item .info .tab.segment {
24402397
border: none;
2441-
padding: 0;
2442-
padding-top: 10px;
2443-
box-shadow: none;
2398+
padding: 10px 0 0;
24442399
}
2445-
.settings .hook.history.list .item .info .tab.segment > * {
2400+
.settings .list.key .meta {
2401+
padding-top: 5px;
24462402
color: #666;
24472403
}
2448-
.settings .hook.history.list .item .info .tab.segment pre {
2449-
word-wrap: break-word;
2450-
}
2451-
.settings .hook.history.list .item .info .tab.segment pre .hljs {
2452-
padding: 0;
2453-
background-color: inherit;
2404+
.settings .list.email > .item:not(:first-child) {
2405+
min-height: 60px;
24542406
}
24552407
.ui.vertical.menu .header.item {
24562408
font-size: 1.1em;

‎public/less/_repository.less

Lines changed: 11 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,15 +1363,14 @@
13631363
}
13641364
}
13651365
.list {
1366-
.item {
1366+
> .item {
13671367
.green {
13681368
color: #21BA45 !important;
13691369
}
13701370
&:not(:first-child) {
13711371
border-top: 1px solid #eaeaea;
13721372
padding:1rem;
13731373
margin: 15px -1rem -1rem -1rem;
1374-
min-height: 60px;
13751374
}
13761375
> .mega-octicon {
13771376
display: table-cell;
@@ -1381,64 +1380,23 @@
13811380
padding: 0 0 0 .5em;
13821381
vertical-align: top;
13831382
}
1383+
.info {
1384+
margin-top: 10px;
1385+
.tab.segment {
1386+
border: none;
1387+
padding: 10px 0 0;
1388+
}
1389+
}
13841390
}
13851391
&.key{
13861392
.meta {
13871393
padding-top: 5px;
13881394
color: #666;
13891395
}
13901396
}
1391-
}
1392-
.hook.list {
1393-
> .item:not(:first-child) {
1394-
border-top: 1px solid #eaeaea;
1395-
}
1396-
.item {
1397-
padding: 10px 20px;
1398-
.octicon,
1399-
.fa {
1400-
width: 20px;
1401-
text-align: center;
1402-
}
1403-
a {
1404-
.dont-break-out;
1405-
}
1406-
}
1407-
}
1408-
.hook.history.list {
1409-
.item {
1410-
padding-left: 13px;
1411-
.meta {
1412-
.ui.right {
1413-
margin-top: 5px;
1414-
.time {
1415-
font-size: 12px;
1416-
}
1417-
}
1418-
}
1419-
.info {
1420-
margin-top: 10px;
1421-
.tabular.menu {
1422-
.item {
1423-
font-weight: 500;
1424-
}
1425-
}
1426-
.tab.segment {
1427-
border: none;
1428-
padding: 0;
1429-
padding-top: 10px;
1430-
box-shadow: none;
1431-
> * {
1432-
color: #666;
1433-
}
1434-
pre {
1435-
word-wrap: break-word;
1436-
.hljs {
1437-
padding: 0;
1438-
background-color: inherit;
1439-
}
1440-
}
1441-
}
1397+
&.email {
1398+
> .item:not(:first-child) {
1399+
min-height: 60px;
14421400
}
14431401
}
14441402
}

‎templates/repo/settings/githooks.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<h4 class="ui top attached header">
88
{{.i18n.Tr "repo.settings.githooks"}}
99
</h4>
10-
<div class="ui attached table segment">
11-
<div class="ui hook list">
10+
<div class="ui attached segment">
11+
<div class="ui list">
1212
<div class="item">
1313
{{.i18n.Tr "repo.settings.githooks_desc" | Str2html}}
1414
</div>

‎templates/repo/settings/hook_history.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</div>
99
{{end}}
1010
</h4>
11-
<div class="ui attached table segment">
12-
<div class="ui hook history list">
11+
<div class="ui attached segment">
12+
<div class="ui list">
1313
{{range .History}}
1414
<div class="item">
1515
<div class="meta">

‎templates/repo/settings/hook_list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</div>
1616
</div>
1717
</h4>
18-
<div class="ui attached table segment">
19-
<div class="ui hook list">
18+
<div class="ui attached segment">
19+
<div class="ui list">
2020
<div class="item">
2121
{{.Description | Str2html}}
2222
</div>

0 commit comments

Comments
 (0)