Skip to content

Commit 6a05628

Browse files
committed
Ported over css changes to git-webui.less
1 parent 401780a commit 6a05628

File tree

2 files changed

+184
-109
lines changed

2 files changed

+184
-109
lines changed

git-webui/release/share/git-webui/webui/css/git-webui.css

Lines changed: 79 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,66 @@ body {
3131
margin: 0;
3232
font: 10pt sans-serif;
3333
}
34-
35-
#confirm-branch-delete p{
36-
font-size:105%;
34+
#confirm-branch-delete p {
35+
font-size: 105%;
3736
}
38-
39-
#confirm-delete, #cancel-delete, #confirm-force-delete {
37+
#confirm-delete,
38+
#cancel-delete,
39+
#confirm-force-delete {
4040
margin-left: 1rem;
4141
margin-top: 0.5rem;
4242
}
43-
44-
.modal-title pre{
45-
display:inline;
46-
}
47-
#error-modal .modal-body {
48-
margin-bottom: 0;
43+
.modal-title pre {
44+
display: inline;
4945
}
5046
.modal-header .close {
5147
padding: 1.25rem 1.5rem;
5248
margin: -1rem -1rem -1rem auto;
5349
}
54-
.alert-dismissible .close {
55-
padding: .3rem 1.25rem;
50+
#newBranchName {
51+
background-color: inherit;
52+
max-width: 12em;
53+
color: inherit;
54+
overflow: hidden;
55+
margin: 0 3% 0 12%;
56+
}
57+
.form-control-xs {
58+
height: calc(1em + 0.375rem + 2px) !important;
59+
padding: 0.125rem 0.25rem !important;
60+
font-size: 0.75rem !important;
61+
line-height: 1.5;
62+
border-radius: 0.2rem;
63+
}
64+
.btn-refresh {
65+
color: #B39D5C;
66+
background-color: #fff3cd;
67+
border: solid 1px;
68+
border-color: #B39D5C;
69+
margin-left: 0.5%;
70+
}
71+
.btn-xxs {
72+
height: calc(1.2em + 0.175rem + 2px) !important;
73+
padding: 0.2rem 0.1rem !important;
74+
font-size: 0.7rem !important;
75+
line-height: 1;
76+
border-radius: 0.2rem;
77+
}
78+
.btn-xs {
79+
height: calc(1.5em + 0.375rem + 2px) !important;
80+
padding: 0.125rem 0.25rem !important;
81+
font-size: 0.75rem !important;
82+
line-height: 1.5;
83+
border-radius: 0.2rem;
84+
}
85+
.btn-sidebar-icon {
86+
padding: 0% 0% 2% 5%;
87+
}
88+
.btn-ok {
89+
float: right;
90+
margin-top: -3%;
91+
}
92+
#error-modal .modal-body {
93+
margin-bottom: 0;
5694
}
5795
#help-modal img {
5896
display: block;
@@ -62,6 +100,9 @@ body {
62100
#message-box .alert {
63101
margin: 0;
64102
}
103+
#message-box .alert-dismissible .close {
104+
padding: 0.3rem 1.25rem;
105+
}
65106
#global-container {
66107
display: flex;
67108
display: -webkit-flex;
@@ -77,9 +118,9 @@ body {
77118
min-width: 0;
78119
flex-direction: column;
79120
-webkit-flex-direction: column;
121+
background-color: #333333;
80122
padding: 0 0.5% 0 0.5%;
81123
width: 18em;
82-
background-color: #333333;
83124
}
84125
#sidebar #sidebar-logo {
85126
display: block;
@@ -115,33 +156,6 @@ body {
115156
cursor: pointer;
116157
padding: 10px 0;
117158
}
118-
#sidebar-switch-branches > h4 a {
119-
color: inherit;
120-
}
121-
122-
.custom-card, .card {
123-
background-color:inherit !important;
124-
color: inherit !important;
125-
padding-bottom:1%;
126-
margin: 0%;
127-
border: none;
128-
}
129-
130-
.card-header {
131-
padding: 1% 2% 0% 14%;
132-
background-color: inherit !important;
133-
color: inherit !important;
134-
border:none;
135-
}
136-
137-
.btn-branch {
138-
background-color: inherit !important;
139-
color: inherit !important;
140-
padding: 0%;
141-
margin: 0%;
142-
border: none;
143-
}
144-
145159
#sidebar #sidebar-content #sidebar-workspace h4:before {
146160
content: url(../img/computer.svg);
147161
}
@@ -174,55 +188,30 @@ body {
174188
#sidebar #sidebar-content .active {
175189
background-color: #0d6efd;
176190
}
177-
#newBranchName {
178-
background-color: inherit;
179-
max-width: 12em;
191+
#sidebar #sidebar-switch-branches > h4 a {
180192
color: inherit;
181-
overflow: hidden;
182-
margin: 0 3% 0 12%
183-
}
184-
185-
.form-control-xs {
186-
height: calc(1em + .375rem + 2px) !important;
187-
padding: .125rem .25rem !important;
188-
font-size: .75rem !important;
189-
line-height: 1.5;
190-
border-radius: .2rem;
191-
}
192-
193-
.btn-refresh {
194-
color: #B39D5C;
195-
background-color: #fff3cd;
196-
border: solid 1px;
197-
border-color: #B39D5C;
198-
margin-left: 0.5%;
199193
}
200-
201-
.btn-xxs {
202-
height: calc(1.2em + .175rem + 2px) !important;
203-
padding: .2rem .1rem !important;
204-
font-size: .7rem !important;
205-
line-height: 1;
206-
border-radius: .2rem;
207-
}
208-
209-
.btn-xs {
210-
height: calc(1.5em + .375rem + 2px) !important;
211-
padding: .125rem .25rem !important;
212-
font-size: .75rem !important;
213-
line-height: 1.5;
214-
border-radius: .2rem;
194+
#sidebar .custom-card,
195+
#sidebar .card {
196+
background-color: inherit !important;
197+
color: inherit !important;
198+
padding-bottom: 1%;
199+
margin: 0%;
200+
border: none;
215201
}
216-
217-
.btn-sidebar-icon {
218-
padding: 0% 0% 2% 5%;
202+
#sidebar .card-header {
203+
padding: 1% 2% 0% 14%;
204+
background-color: inherit !important;
205+
color: inherit !important;
206+
border: none;
219207
}
220-
221-
.btn-ok {
222-
float: right;
223-
margin-top:-3%
208+
#sidebar .btn-branch {
209+
background-color: inherit !important;
210+
color: inherit !important;
211+
padding: 0%;
212+
margin: 0%;
213+
border: none;
224214
}
225-
226215
#main-view {
227216
display: flex;
228217
display: -webkit-flex;
@@ -277,11 +266,11 @@ body {
277266
border-top-width: 0;
278267
}
279268
#log-view .log-entry:hover {
280-
background-color: rgba(244, 244, 244, 0.9);
269+
background-color: rgba(219 / 0.9, 219 / 0.9, 219 / 0.9, 0.9);
281270
}
282271
#log-view .log-entry.active {
283-
background-color: rgba(2, 82, 202, 0.9);
284-
color:#ffffff;
272+
background-color: rgba(13, 110, 253, 0.9) !important;
273+
color: #ffffff;
285274
}
286275
#log-view .log-entry.active header h6 a {
287276
color: #ffffff;
@@ -388,8 +377,6 @@ body {
388377
border-left: 0;
389378
border-right: 0;
390379
white-space: nowrap;
391-
}
392-
.list-group-item{
393380
border-radius: 0;
394381
}
395382
.diff-view-container {
@@ -404,13 +391,10 @@ body {
404391
border: 0;
405392
margin: 0;
406393
}
407-
.panel-heading {
408-
border-bottom: 1px solid #dddddd !important;
409-
}
410394
.diff-view-container .panel-heading {
411395
margin: 0;
412396
padding: 5px 16px;
413-
border-bottom: 1px solid #dddddd;
397+
border-bottom: 1px solid #dddddd !important;
414398
display: flex;
415399
display: -webkit-flex;
416400
min-height: 0;
@@ -667,8 +651,8 @@ body {
667651
padding: 5px 10px;
668652
border-left: 0;
669653
border-right: 0;
670-
border-radius: 0;
671654
white-space: nowrap;
655+
border-radius: 0;
672656
}
673657
#workspace-view #workspace-editor #working-copy-view .file-list-container .list-group .list-group-item.available,
674658
#commit-explorer-view #workspace-editor #working-copy-view .file-list-container .list-group .list-group-item.available,

0 commit comments

Comments
 (0)