##// END OF EJS Templates
ui: bulk changes
Liviu -
r3560:92732458 new-ui
parent child Browse files
Show More
@@ -237,7 +237,7 b' input.inline[type="file"] {'
237 237 position: relative;
238 238 vertical-align: bottom;
239 239 padding: 0 @header-padding;
240 background-color: @grey2;
240 background-color: @grey1;
241 241 color: @grey5;
242 242
243 243 .title {
@@ -2,10 +2,21 b''
2 2 // For use in RhodeCode applications;
3 3 // see style guide documentation for guidelines.
4 4
5 // TOP MAIN DARK NAVIGATION
6
7 .header .main_nav.horizontal-list {
8 float: right;
9 color: @grey4;
10 > li {
11 a {
12 color: @grey4;
13 }
14 }
15 }
16
5 17 // HEADER NAVIGATION
6 18
7 19 .horizontal-list {
8 float: right;
9 20 display: block;
10 21 margin: 0;
11 22 padding: 0;
@@ -18,6 +29,7 b''
18 29 li {
19 30 line-height: 1em;
20 31 list-style-type: none;
32 margin: 0 20px 0 0;
21 33
22 34 a {
23 35 padding: 0 .5em;
@@ -80,10 +92,6 b''
80 92 }
81 93 }
82 94
83 &.active {
84 border-bottom: 5px solid @rcblue;
85 }
86
87 95 &.open {
88 96
89 97 a {
@@ -118,14 +126,13 b''
118 126 > a,
119 127 &.has_select2 a {
120 128 display: block;
121 padding: 10px 0 2px;
129 padding: 10px 0;
122 130 }
123 131
124 132 .menulabel {
125 padding: 0 .5em;
133 padding: 0 0 0.4em 0;
126 134 line-height: 1em;
127 135 // for this specifically we do not use a variable
128 border-right: 1px solid @grey4;
129 136 }
130 137
131 138 .pr_notifications {
@@ -141,7 +148,7 b''
141 148 &.open,
142 149 &.active {
143 150 a {
144 color: @grey1;
151 color: @rcblue;
145 152 }
146 153 }
147 154 }
@@ -503,8 +510,7 b''
503 510 display: block;
504 511 margin: 0 auto;
505 512 padding: 0 @header-padding;
506 background-color: @grey6;
507 border-bottom: @border-thickness solid @grey5;
513 background-color: @grey7;
508 514
509 515 .clear {
510 516 clear: both;
@@ -513,19 +519,23 b''
513 519
514 520 ul#context-pages {
515 521 li {
516 line-height: 1em;
522 line-height: 2em;
517 523 list-style-type: none;
518 524
519 525 a {
520 526 color: @grey3;
527
528 &:hover {
529 color: @grey2;
530 }
521 531 }
522 532
523 533 &.active {
524 534 // special case, non-variable color
525 border-bottom: 4px solid @nav-grey;
535 border-bottom: 2px solid @rcblue;
526 536
527 537 a {
528 color: @grey1;
538 color: @rcblue;
529 539 }
530 540 }
531 541 }
@@ -631,14 +641,11 b' ul#context-pages {'
631 641
632 642 .main_filter_help_box {
633 643 padding: 7px 7px;
634 border-top: 1px solid @grey4;
635 border-right: 1px solid @grey4;
636 border-bottom: 1px solid @grey4;
637 644 display: inline-block;
638 645 vertical-align: top;
639 646 background: inherit;
640 647 position: absolute;
641 right: 8px;
648 right: 0;
642 649 top: 9px;
643 650 }
644 651
@@ -661,21 +668,24 b' ul#context-pages {'
661 668 padding: 0 10px;
662 669 }
663 670
664 .main_filter_input {
665 padding: 5px;
666 min-width: 260px;
667 color: @nav-grey;
668 background: @grey3;
669 min-height: 18px;
670
671 input {
671 672
672 &:active {
673 color: @grey2 !important;
674 background: white !important;
675 }
676 &:focus {
677 color: @grey2 !important;
678 background: white !important;
673 &.main_filter_input {
674 padding: 5px 10px;
675 min-width: 260px;
676 color: @grey7;
677 background: @black;
678 min-height: 18px;
679 border: 0;
680
681 &:active {
682 color: @grey2 !important;
683 background: white !important;
684 }
685 &:focus {
686 color: @grey2 !important;
687 background: white !important;
688 }
679 689 }
680 690 }
681 691
@@ -231,7 +231,7 b' mark,'
231 231 clear: both;
232 232 float: left;
233 233 width: 100%;
234 margin: @pagepadding/2 0 @pagepadding;
234 margin: @pagepadding/2 0 @pagepadding/4;
235 235
236 236 .breadcrumbs {
237 237 float: left;
@@ -8,13 +8,15 b''
8 8 @rchighlightblue: lighten(@rcblue, 35%);
9 9
10 10 // Secondary Colors (greyscale)
11 @grey1: #202020; //midnight
12 @grey2: #323232; //charcoal
13 @grey3: #666666; //tungsten
14 @grey4: #979797; //light grey
11 @black: #000;
12 @white: #fff;
13 @grey1: #2B2B2D; //midnight
14 @grey2: #5C5C5C; //charcoal
15 @grey3: #7E7F7F; //tungsten
16 @grey4: #949494; //light grey
15 17 @grey5: #dbd9da; //greyish
16 18 @grey6: #eeeeee; //silver
17 @grey7: #f9f9f9; //light silver
19 @grey7: #F5F5F5; //light silver
18 20
19 21 // special for navigation
20 22 @nav-grey: #CDCCCD;
@@ -131,7 +133,7 b''
131 133 @button-padding: .9em;
132 134
133 135 // DEFAULT WIDTHS
134 @wrapper-maxwidth: 1200px;
136 @wrapper-maxwidth: 1600px;
135 137 @sidebar-width: 145px;
136 138 @sidebar-all-width: @sidebar-width + 2 * @sidebarpadding;
137 139 @sidebar-small-width: 100px;
@@ -30,7 +30,6 b''
30 30
31 31 <div class="box">
32 32 <div class="title">
33 ${self.repo_page_title(c.rhodecode_db_repo)}
34 33 <ul class="links">
35 34 <li>
36 35 <a href="#" class="btn btn-small" id="rev_range_container" style="display:none;"></a>
@@ -32,10 +32,6 b''
32 32 </script>
33 33
34 34 <div class="box">
35 <div class="title">
36 ${self.repo_page_title(c.rhodecode_db_repo)}
37 </div>
38
39 35 <div class="summary changeset">
40 36 <div class="summary-detail">
41 37 <div class="summary-detail-header">
@@ -27,10 +27,6 b''
27 27 </%def>
28 28
29 29 <%def name="main()">
30 <div class="title">
31 ${self.repo_page_title(c.rhodecode_db_repo)}
32 </div>
33
34 30 <div id="pjax-container" class="summary">
35 31 <div id="files_data">
36 32 <%include file='files_pjax.mako'/>
@@ -20,10 +20,6 b''
20 20
21 21 <%def name="main()">
22 22 <div class="box">
23 <div class="title">
24 ${self.repo_page_title(c.rhodecode_db_repo)}
25 </div>
26
27 23 ${h.secure_form(h.route_path('repo_fork_create',repo_name=c.rhodecode_db_repo.repo_name), request=request)}
28 24 <div class="form">
29 25 <!-- fields -->
@@ -19,10 +19,6 b''
19 19
20 20 <%def name="main()">
21 21 <div class="box">
22 <div class="title">
23 ${self.repo_page_title(c.rhodecode_db_repo)}
24 </div>
25
26 22 ${h.secure_form(h.route_path('pullrequest_create', repo_name=c.repo_name, _query=request.GET.mixed()), id='pull_request_form', request=request)}
27 23
28 24 ${self.breadcrumbs()}
@@ -24,8 +24,6 b''
24 24 <%def name="main()">
25 25 <div class="box">
26 26 <div class="title">
27 ${self.repo_page_title(c.rhodecode_db_repo)}
28
29 27 <ul class="links">
30 28 <li>
31 29 %if c.rhodecode_user.username != h.DEFAULT_USER:
@@ -63,15 +63,15 b''
63 63 <div class="box">
64 64 %if c.repo_name:
65 65 <!-- box / title -->
66 <div class="title">
66 <!--div class="title">
67 67 ${self.repo_page_title(c.rhodecode_db_repo)}
68 </div>
68 </div-->
69 69 ${h.form(h.route_path('search_repo',repo_name=c.repo_name),method='get')}
70 70 %elif c.repo_group_name:
71 71 <!-- box / title -->
72 <div class="title">
72 <!--div class="title">
73 73 ${self.repo_group_page_title(c.repo_group)}
74 </div>
74 </div-->
75 75 ${h.form(h.route_path('search_repo_group',repo_group_name=c.repo_group_name),method='get')}
76 76 %else:
77 77 <!-- box / title -->
@@ -10,7 +10,6 b''
10 10 <%def name="main()">
11 11
12 12 <div class="title">
13 ${self.repo_page_title(c.rhodecode_db_repo)}
14 13 ## Context Action
15 14 <div>
16 15 <ul class="links icon-only-links block-right">
General Comments 0
You need to be logged in to leave comments. Login now