# HG changeset patch # User Liviu # Date 2019-03-25 19:35:20 # Node ID b39f2bc22078dbf7951d2c12375fac0d2eae561a # Parent 9cb54b7f0462a50a70cf57414f33c29d7f62f5d5 Multiple changes for the navigation and buttons diff --git a/rhodecode/public/css/buttons.less b/rhodecode/public/css/buttons.less --- a/rhodecode/public/css/buttons.less +++ b/rhodecode/public/css/buttons.less @@ -26,6 +26,10 @@ input[type="button"] { -moz-transition: background .3s,color .3s; -o-transition: background .3s,color .3s; transition: background .3s,color .3s; + box-shadow: @button-shadow; + -webkit-box-shadow: @button-shadow; + + a { display: block; @@ -80,12 +84,12 @@ input[type="button"] { &:hover, &.active { - color: white; - background-color: @rcdarkblue; + color: @rcblue; + background-color: @grey7; .border ( @border-thickness, @rcdarkblue ); a { - color: white; + color: @rcblue; } } &:disabled { diff --git a/rhodecode/public/css/comments.less b/rhodecode/public/css/comments.less --- a/rhodecode/public/css/comments.less +++ b/rhodecode/public/css/comments.less @@ -14,7 +14,7 @@ tr.inline-comments div { max-width: 100%; p { - white-space: normal; + white-space: normal; } code, pre, .code, dd { @@ -227,7 +227,7 @@ tr.inline-comments div { .delete-comment { display: inline-block; color: @rcblue; - + &:hover { cursor: pointer; } @@ -377,13 +377,13 @@ form.comment-form { position: relative; width: 100%; min-height: 42px; - + .status_box, .cancel-button { float: left; display: inline-block; } - + .action-buttons { float: right; display: inline-block; @@ -426,10 +426,10 @@ form.comment-form { .comment-form-login { .comment-help { - padding: 0.9em; //same as the button + padding: 0.7em; //same as the button } - div.clearfix { + div.clearfix { clear: both; width: 100%; display: block; diff --git a/rhodecode/public/css/deform.less b/rhodecode/public/css/deform.less --- a/rhodecode/public/css/deform.less +++ b/rhodecode/public/css/deform.less @@ -38,7 +38,7 @@ .form-control { width: 100%; - padding: 0.9em; + padding: 0.7em; border: 1px solid #979797; border-radius: 2px; } diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less --- a/rhodecode/public/css/navigation.less +++ b/rhodecode/public/css/navigation.less @@ -124,7 +124,6 @@ } .menulabel { - padding: 0 0 0.4em 0; line-height: 1em; // for this specifically we do not use a variable } @@ -502,7 +501,7 @@ #context-bar { display: block; - margin: 0 auto; + margin: 0 auto 20px 0; padding: 0 @header-padding; background-color: @grey7; @@ -513,7 +512,6 @@ ul#context-pages { li { - line-height: 2em; list-style-type: none; a { diff --git a/rhodecode/public/css/select2.less b/rhodecode/public/css/select2.less --- a/rhodecode/public/css/select2.less +++ b/rhodecode/public/css/select2.less @@ -17,7 +17,7 @@ .select2-search, .select2-search input {.box-sizing(border-box);} .select2-container .select2-choice{display:block; line-height:1em; -webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;user-select:none; } -.main .select2-container .select2-choice { background-color: white; } +.main .select2-container .select2-choice { background-color: white; box-shadow: @button-shadow;} .select2-container .select2-choice abbr { display: none; width: 12px; height: 12px; position: absolute; right: 24px; top: 8px; font-size: 1px; text-decoration: none; border: 0; background: url('../images/select2.png') right top no-repeat; cursor: pointer; outline: 0; } .select2-container.select2-allowclear .select2-choice abbr {display: inline-block;} .select2-container .select2-choice abbr:hover { background-position: right -11px; cursor: pointer; } @@ -120,7 +120,7 @@ select.select2{height:28px;visibility:hi a { display:block; - padding: .9em; + padding: .7em; padding-right: 2em; position: relative; @@ -129,7 +129,7 @@ select.select2{height:28px;visibility:hi content: "\00A0\25BE"; right: .1em; line-height: 1em; - top: 0.4em; + top: 0.2em; width: 1em; font-size: 20px; } @@ -176,7 +176,13 @@ select.select2{height:28px;visibility:hi &:hover, &.select2-highlighted { - background-color: @rclightblue; + background-color: @grey7; + + .select2-result-label { + &:hover { + color: @grey1!important; + } + } } &.select2-result-with-children { @@ -189,8 +195,7 @@ select.select2{height:28px;visibility:hi display:block; padding: 8px; font-family: @text-regular; - border-bottom: @border-thickness solid @rclightblue; - color: @rcblue; + color: @grey2; cursor: pointer; } &.select2-result-with-children { @@ -205,7 +210,7 @@ select.select2{height:28px;visibility:hi ul.select2-result-sub li .select2-result-label { padding-left: 16px; font-family: @text-regular; - color: @rcblue; + color: @grey2; cursor: pointer; } } diff --git a/rhodecode/public/css/type.less b/rhodecode/public/css/type.less --- a/rhodecode/public/css/type.less +++ b/rhodecode/public/css/type.less @@ -156,6 +156,19 @@ pre { // Emphasis & misc // ------------------------- +.discreet { + color: @grey4; + font-size: 85%; + font-weight: normal; + + a { + color: @grey4; + + &:hover { + color: @rcdarkblue; + } + } +} small, .small { @@ -231,7 +244,8 @@ mark, clear: both; float: left; width: 100%; - margin: @pagepadding/2 0 @pagepadding/4; + margin: @pagepadding/2 0 0; + min-height: 25px; .breadcrumbs { float: left; diff --git a/rhodecode/public/css/variables.less b/rhodecode/public/css/variables.less --- a/rhodecode/public/css/variables.less +++ b/rhodecode/public/css/variables.less @@ -130,7 +130,9 @@ @fields-input-l: 720px; // BUTTONS -@button-padding: .9em; +@button-padding: .7em; +@button-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.15); + // DEFAULT WIDTHS @wrapper-maxwidth: 1600px; diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit.mako --- a/rhodecode/templates/admin/repo_groups/repo_group_edit.mako +++ b/rhodecode/templates/admin/repo_groups/repo_group_edit.mako @@ -23,10 +23,6 @@ <%def name="main()">
-
- ${self.repo_group_page_title(c.repo_group)} -
-
##main
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako --- a/rhodecode/templates/base/base.mako +++ b/rhodecode/templates/base/base.mako @@ -77,6 +77,14 @@ <%def name="admin_menu(active=None)">
+
+
+
+ Admin Panel +
+
+
+
- <%def name="dt_info_panel(elements)">
%for dt, dd, title, show_items in elements: @@ -148,7 +155,6 @@
- <%def name="gravatar(email, size=16)"> <% if (size > 16): @@ -202,7 +208,7 @@ ## FORKED %if repo_instance.fork: -

+

${_('Fork of')} ${h.link_to_if(c.has_origin_repo_read_perm,repo_instance.fork.repo_name, h.route_path('repo_summary', repo_name=repo_instance.fork.repo_name))}

@@ -210,7 +216,7 @@ ## IMPORTED FROM REMOTE %if repo_instance.clone_uri: -

+

${_('Clone from')} ${h.hide_credentials(repo_instance.clone_uri)}

@@ -218,12 +224,12 @@ ## LOCKING STATUS %if repo_instance.locked[0]: -

+

${_('Repository locked by %(user)s') % {'user': h.person_by_id(repo_instance.locked[0])}}

%elif repo_instance.enable_locking: -

+

${_('Repository not locked. Pull repository to lock it.')}

@@ -359,6 +365,10 @@
+
+ ${self.repo_group_page_title(c.repo_group)} +
+