##// END OF EJS Templates
branch-permission: css/ui changes.
marcink -
r2989:daff214b default
parent child Browse files
Show More
@@ -1,409 +1,409 b''
1
1
2 // Contains the style definitions used for .main-content
2 // Contains the style definitions used for .main-content
3 // elements which are mainly around the admin settings.
3 // elements which are mainly around the admin settings.
4
4
5
5
6 // TODO: johbo: Integrate in a better way, this is for "main content" which
6 // TODO: johbo: Integrate in a better way, this is for "main content" which
7 // should not have a limit on the width.
7 // should not have a limit on the width.
8 .main-content-full {
8 .main-content-full {
9 clear: both;
9 clear: both;
10 }
10 }
11
11
12
12
13 .main-content {
13 .main-content {
14 max-width: @maincontent-maxwidth;
14 max-width: @maincontent-maxwidth;
15
15
16 h3,
16 h3,
17 // TODO: johbo: Change templates to use h3 instead of h4 here
17 // TODO: johbo: Change templates to use h3 instead of h4 here
18 h4 {
18 h4 {
19 line-height: 1em;
19 line-height: 1em;
20 }
20 }
21
21
22 // TODO: johbo: Check if we can do that on a global level
22 // TODO: johbo: Check if we can do that on a global level
23 table {
23 table {
24 th {
24 th {
25 padding: 0;
25 padding: 0;
26 }
26 }
27 td.field{
27 td.field{
28 .help-block{
28 .help-block{
29 margin-left: 0;
29 margin-left: 0;
30 }
30 }
31 }
31 }
32 }
32 }
33
33
34 // TODO: johbo: Tweak this into the general styling, for a full width
34 // TODO: johbo: Tweak this into the general styling, for a full width
35 // textarea
35 // textarea
36 .textarea-full {
36 .textarea-full {
37 // 2x 10px padding and 2x 1px border
37 // 2x 10px padding and 2x 1px border
38 margin-right: 22px;
38 margin-right: 22px;
39 }
39 }
40
40
41 }
41 }
42
42
43
43
44 // TODO: johbo: duplicated, think about a mixins.less
44 // TODO: johbo: duplicated, think about a mixins.less
45 .block-left{
45 .block-left{
46 float: left;
46 float: left;
47 }
47 }
48
48
49 .form {
49 .form {
50 .checkboxes {
50 .checkboxes {
51 // TODO: johbo: Should be changed in .checkboxes already
51 // TODO: johbo: Should be changed in .checkboxes already
52 width: auto;
52 width: auto;
53 }
53 }
54
54
55 // TODO: johbo: some settings pages are broken and don't have the .buttons
55 // TODO: johbo: some settings pages are broken and don't have the .buttons
56 // inside the .fields, tweak those templates and remove this.
56 // inside the .fields, tweak those templates and remove this.
57 .buttons {
57 .buttons {
58 margin-top: @textmargin;
58 margin-top: @textmargin;
59 }
59 }
60
60
61 .help-block {
61 .help-block {
62 display: block;
62 display: block;
63 margin-left: @label-width;
63 margin-left: @label-width;
64 &.pre-formatting {
64 &.pre-formatting {
65 white-space: pre;
65 white-space: pre;
66 }
66 }
67 }
67 }
68
68
69 .action_button {
69 .action_button {
70 color: @grey4;
70 color: @grey4;
71 }
71 }
72 }
72 }
73
73
74 .main-content-full-width {
74 .main-content-full-width {
75 .main-content;
75 .main-content;
76 width: 100%;
76 width: 100%;
77 min-width: 100%;
77 min-width: 100%;
78 }
78 }
79
79
80 .main-content-auto-width {
80 .main-content-auto-width {
81 .main-content;
81 .main-content;
82 width: auto;
82 width: auto;
83 min-width: 100%;
83 min-width: 100%;
84 max-width: inherit;
84 max-width: inherit;
85 }
85 }
86
86
87 .field {
87 .field {
88 clear: left;
88 clear: left;
89 margin-bottom: @padding;
89 margin-bottom: @padding;
90
90
91 }
91 }
92
92
93 .input-monospace {
93 .input-monospace {
94 font-family: @font-family-monospace;
94 font-family: @font-family-monospace;
95 }
95 }
96
96
97 .fields {
97 .fields {
98 label {
98 label {
99 color: @grey2;
99 color: @grey2;
100 }
100 }
101
101
102 .field {
102 .field {
103 clear: right;
103 clear: right;
104 margin-bottom: @textmargin;
104 margin-bottom: @textmargin;
105 width: 100%;
105 width: 100%;
106
106
107 .label {
107 .label {
108 float: left;
108 float: left;
109 margin-right: @form-vertical-margin;
109 margin-right: @form-vertical-margin;
110 margin-top: 0;
110 margin-top: 0;
111 padding-top: @input-padding-px + @border-thickness-inputs;
111 padding-top: @input-padding-px + @border-thickness-inputs;
112 width: @label-width - @form-vertical-margin;
112 width: @label-width - @form-vertical-margin;
113 }
113 }
114 // used in forms for fields that show just text
114 // used in forms for fields that show just text
115 .label-text {
115 .label-text {
116 .label;
116 .label;
117 padding-top: 5px;
117 padding-top: 5px;
118 }
118 }
119 .label-branch-perm {
119 .label-branch-perm {
120 .label;
120 .label;
121 width: 20px;
121 width: 115px;
122 }
122 }
123
123
124 // Used to position content on the right side of a .label
124 // Used to position content on the right side of a .label
125 .content,
125 .content,
126 .side-by-side-selector {
126 .side-by-side-selector {
127 padding-top: @input-padding-px + @input-border-thickness;
127 padding-top: @input-padding-px + @input-border-thickness;
128 }
128 }
129
129
130 .checkboxes,
130 .checkboxes,
131 .input,
131 .input,
132 .select,
132 .select,
133 .textarea,
133 .textarea,
134 .content {
134 .content {
135 float: none;
135 float: none;
136 margin-left: @label-width;
136 margin-left: @label-width;
137
137
138 .help-block {
138 .help-block {
139 margin-left: 0;
139 margin-left: 0;
140 }
140 }
141 }
141 }
142
142
143 .input-branch-perm {
143 .input-branch-perm {
144 .input;
144 .input;
145 margin-left: 90px;
145 margin-left: 140px;
146 }
146 }
147
147
148 .input-branch-perm-order {
148 .input-branch-perm-order {
149 width: 40px;
149 width: 40px;
150 }
150 }
151
151
152 .checkboxes,
152 .checkboxes,
153 .input,
153 .input,
154 .select {
154 .select {
155 .help-block {
155 .help-block {
156 display: block;
156 display: block;
157 }
157 }
158 }
158 }
159
159
160 .checkboxes,
160 .checkboxes,
161 .radios {
161 .radios {
162 // TODO: johbo: We get a 4px margin from the from-bootstrap,
162 // TODO: johbo: We get a 4px margin from the from-bootstrap,
163 // compensating here to align well with labels on the left.
163 // compensating here to align well with labels on the left.
164 padding-top: @input-padding-px + @input-border-thickness - 3px;
164 padding-top: @input-padding-px + @input-border-thickness - 3px;
165 }
165 }
166
166
167 .checkbox,
167 .checkbox,
168 .radio {
168 .radio {
169 display: block;
169 display: block;
170 width: auto;
170 width: auto;
171 }
171 }
172
172
173 .checkbox + .checkbox {
173 .checkbox + .checkbox {
174 display: block;
174 display: block;
175 }
175 }
176
176
177 .input,
177 .input,
178 .select {
178 .select {
179 .help-block,
179 .help-block,
180 .info-block {
180 .info-block {
181 margin-top: @form-vertical-margin / 2;
181 margin-top: @form-vertical-margin / 2;
182 }
182 }
183 }
183 }
184
184
185 .input {
185 .input {
186 .branch-perm {
186 .branch-perm {
187 width: 80px;
187 width: 80px;
188 }
188 }
189 .medium {
189 .medium {
190 width: @fields-input-m;
190 width: @fields-input-m;
191 }
191 }
192 .large {
192 .large {
193 width: @fields-input-l;
193 width: @fields-input-l;
194 }
194 }
195
195
196 .text-as-placeholder {
196 .text-as-placeholder {
197 padding-top: @input-padding-px + @border-thickness-inputs;
197 padding-top: @input-padding-px + @border-thickness-inputs;
198 }
198 }
199 }
199 }
200
200
201 // TODO: johbo: Try to find a better integration of this bit.
201 // TODO: johbo: Try to find a better integration of this bit.
202 // When using a select2 inside of a field, it should not have the
202 // When using a select2 inside of a field, it should not have the
203 // top margin.
203 // top margin.
204 .select .drop-menu {
204 .select .drop-menu {
205 margin-top: 0;
205 margin-top: 0;
206 }
206 }
207
207
208 .textarea {
208 .textarea {
209 float: none;
209 float: none;
210
210
211 textarea {
211 textarea {
212 // TODO: johbo: From somewhere we get a clear which does
212 // TODO: johbo: From somewhere we get a clear which does
213 // more harm than good here.
213 // more harm than good here.
214 clear: none;
214 clear: none;
215 }
215 }
216
216
217 .CodeMirror {
217 .CodeMirror {
218 // TODO: johbo: Tweak to position the .help-block nicer,
218 // TODO: johbo: Tweak to position the .help-block nicer,
219 // figure out how to apply for .text-block instead.
219 // figure out how to apply for .text-block instead.
220 margin-bottom: 10px;
220 margin-bottom: 10px;
221 }
221 }
222
222
223 // TODO: johbo: Check if we can remove the grey background on
223 // TODO: johbo: Check if we can remove the grey background on
224 // the global level and remove this if possible.
224 // the global level and remove this if possible.
225 .help-block {
225 .help-block {
226 background: transparent;
226 background: transparent;
227 padding: 0;
227 padding: 0;
228 }
228 }
229 }
229 }
230
230
231 &.tag_patterns,
231 &.tag_patterns,
232 &.branch_patterns {
232 &.branch_patterns {
233
233
234 input {
234 input {
235 max-width: 430px;
235 max-width: 430px;
236 }
236 }
237 }
237 }
238 }
238 }
239
239
240 .field-sm {
240 .field-sm {
241 .label {
241 .label {
242 padding-top: @input-padding-px / 2 + @input-border-thickness;
242 padding-top: @input-padding-px / 2 + @input-border-thickness;
243 }
243 }
244 .checkboxes,
244 .checkboxes,
245 .radios {
245 .radios {
246 // TODO: johbo: We get a 4px margin from the from-bootstrap,
246 // TODO: johbo: We get a 4px margin from the from-bootstrap,
247 // compensating here to align well with labels on the left.
247 // compensating here to align well with labels on the left.
248 padding-top: @input-padding-px / 2 + @input-border-thickness - 3px;
248 padding-top: @input-padding-px / 2 + @input-border-thickness - 3px;
249 }
249 }
250 }
250 }
251
251
252 .field.customhooks {
252 .field.customhooks {
253 .label {
253 .label {
254 padding-top: 0;
254 padding-top: 0;
255 }
255 }
256 .input-wrapper {
256 .input-wrapper {
257 padding-right: 25px;
257 padding-right: 25px;
258
258
259 input {
259 input {
260 width: 100%;
260 width: 100%;
261 }
261 }
262 }
262 }
263 .input {
263 .input {
264 padding-right: 25px;
264 padding-right: 25px;
265 }
265 }
266 }
266 }
267
267
268 .buttons {
268 .buttons {
269 // TODO: johbo: define variable for this value.
269 // TODO: johbo: define variable for this value.
270 // Note that this should be 40px but since most elements add some
270 // Note that this should be 40px but since most elements add some
271 // space in the bottom, we are with 20 closer to 40.
271 // space in the bottom, we are with 20 closer to 40.
272 margin-top: 20px;
272 margin-top: 20px;
273 clear: both;
273 clear: both;
274 margin-bottom: @padding;
274 margin-bottom: @padding;
275 }
275 }
276
276
277 .desc{
277 .desc{
278 margin-right: @textmargin;
278 margin-right: @textmargin;
279 }
279 }
280
280
281 input,
281 input,
282 .drop-menu {
282 .drop-menu {
283 margin-right: @padding/3;
283 margin-right: @padding/3;
284 }
284 }
285
285
286 }
286 }
287
287
288 .form-vertical .fields .field {
288 .form-vertical .fields .field {
289
289
290 .label {
290 .label {
291 float: none;
291 float: none;
292 width: auto;
292 width: auto;
293 }
293 }
294
294
295 .checkboxes,
295 .checkboxes,
296 .input,
296 .input,
297 .select,
297 .select,
298 .textarea {
298 .textarea {
299 margin-left: 0;
299 margin-left: 0;
300 }
300 }
301
301
302 // TODO: johbo: had to tweak the width here to make it big enough for
302 // TODO: johbo: had to tweak the width here to make it big enough for
303 // the license.
303 // the license.
304 .textarea.editor {
304 .textarea.editor {
305 max-width: none;
305 max-width: none;
306 }
306 }
307
307
308 .textarea.large textarea {
308 .textarea.large textarea {
309 min-height: 200px;
309 min-height: 200px;
310 }
310 }
311
311
312 .help-block {
312 .help-block {
313 margin-left: 0;
313 margin-left: 0;
314 }
314 }
315 }
315 }
316
316
317
317
318
318
319
319
320 .main-content {
320 .main-content {
321 .block-left;
321 .block-left;
322
322
323 .section {
323 .section {
324 margin-bottom: @space;
324 margin-bottom: @space;
325 }
325 }
326
326
327
327
328 // Table aligning same way as forms in admin section, e.g.
328 // Table aligning same way as forms in admin section, e.g.
329 // python packages table
329 // python packages table
330 table.formalign {
330 table.formalign {
331 float: left;
331 float: left;
332 width: auto;
332 width: auto;
333
333
334 .label {
334 .label {
335 width: @label-width;
335 width: @label-width;
336 }
336 }
337
337
338 }
338 }
339
339
340
340
341 table.issuetracker {
341 table.issuetracker {
342
342
343 color: @text-color;
343 color: @text-color;
344
344
345 .issue-tracker-example {
345 .issue-tracker-example {
346 color: @grey4;
346 color: @grey4;
347 }
347 }
348 }
348 }
349
349
350 .side-by-side-selector{
350 .side-by-side-selector{
351 .left-group,
351 .left-group,
352 .middle-group,
352 .middle-group,
353 .right-group{
353 .right-group{
354 float: left;
354 float: left;
355 }
355 }
356
356
357 .left-group,
357 .left-group,
358 .right-group{
358 .right-group{
359 width: 45%;
359 width: 45%;
360 text-align: center;
360 text-align: center;
361
361
362 label{
362 label{
363 width: 100%;
363 width: 100%;
364 text-align: left;
364 text-align: left;
365 }
365 }
366
366
367 select{
367 select{
368 width: 100%;
368 width: 100%;
369 background: none;
369 background: none;
370 border-color: @border-highlight-color;
370 border-color: @border-highlight-color;
371 color: @text-color;
371 color: @text-color;
372 font-family: @text-light;
372 font-family: @text-light;
373 font-size: @basefontsize;
373 font-size: @basefontsize;
374 color: @grey1;
374 color: @grey1;
375 padding: @textmargin/2;
375 padding: @textmargin/2;
376 }
376 }
377
377
378 select:after{
378 select:after{
379 content: "";
379 content: "";
380 }
380 }
381
381
382 }
382 }
383
383
384 .middle-group{
384 .middle-group{
385 width: 10%;
385 width: 10%;
386 text-align: center;
386 text-align: center;
387 padding-top: 4em;
387 padding-top: 4em;
388 i {
388 i {
389 font-size: 18px;
389 font-size: 18px;
390 cursor: pointer;
390 cursor: pointer;
391 line-height: 2em;
391 line-height: 2em;
392 }
392 }
393 }
393 }
394
394
395 }
395 }
396
396
397 .permissions_boxes{
397 .permissions_boxes{
398 label, .label{
398 label, .label{
399 margin-right: @textmargin/2;
399 margin-right: @textmargin/2;
400 }
400 }
401 }
401 }
402
402
403 .radios{
403 .radios{
404 label{
404 label{
405 margin-right: @textmargin;
405 margin-right: @textmargin;
406 }
406 }
407 }
407 }
408 }
408 }
409
409
General Comments 0
You need to be logged in to leave comments. Login now