# HG changeset patch # User Liviu # Date 2019-04-18 21:09:19 # Node ID 5c632f5f3494cf1bb038d71237ff25857ae8e32e # Parent a027b596b567a7654c870cb2555107aa71ac3620 Repo summary box changes diff --git a/rhodecode/public/css/readme-box.less b/rhodecode/public/css/readme-box.less --- a/rhodecode/public/css/readme-box.less +++ b/rhodecode/public/css/readme-box.less @@ -88,7 +88,6 @@ div.readme_box pre { font-size: 13px !important; overflow: visible !important; line-height: 140% !important; - background-color: @grey7; } div.readme_box img { @@ -156,10 +155,10 @@ div.readme_box code { } div.readme_box pre { - border: @border-thickness solid @grey5; + border: @border-thickness solid #CBDBEB; overflow: auto; padding: .5em; - background-color: @grey7; + background-color: #FCFEFF; } div.readme_box pre > code { diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less --- a/rhodecode/public/css/summary.less +++ b/rhodecode/public/css/summary.less @@ -3,11 +3,16 @@ // Used for headers and file detail summary screens. .summary { - float: left; + clear: both; + float: none; position: relative; width: 100%; margin: 0; padding: 0; + background: #FCFCFC; + border: 1px solid #EAEAEA; + border-radius: @border-radius; + margin-bottom: 20px; .summary-detail-header { float: left; @@ -42,10 +47,10 @@ } .summary-detail { - float: left; + float: none; position: relative; - width: 73%; - margin: 0 3% @space 0; + width: 100%; + margin: 0; padding: 0; .file_diff_buttons { @@ -62,19 +67,37 @@ height: 30px; margin: 0; padding: 0; - width: 150px; + width: 100px; font-weight: @text-semibold-weight; font-family: @text-semibold; } + .left-clone select { + width: 100px; + margin-right: 0; + background-color: @grey7; + border-color: @grey4; + color: #5C5C5C; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } .right-clone { - float: right; + float: left; width: ~"calc(100% - 150px)"; + + .clipboard-action { + margin-left: -30px; + } } .clone_url_input { - width: ~"calc(100% - 35px)"; - padding: 6px 5px; + width: ~"calc(100% - 70px)"; + padding: 6px 30px 6px 10px; + height: 14px; + box-shadow: 0 1px 1px 0 rgba(0,0,0,0.07); + border-top-left-radius: 0; + border-bottom-left-radius: 0; + margin-left: -1px; } &.directory { @@ -124,18 +147,32 @@ border: @border-thickness solid @border-default-color; .border-radius(@border-radius); } + + .btn-collapse { + clear: both; + float: none; + background: #F7F7F7; + text-align: center; + color: #949494; + font-size: 11px; + + &:hover { + background: #f1f1f1; + color: #2B2B2D; + } + } } // this is used outside of just the summary .fieldset, // similar to form fieldset .summary .sidebar-right-content { // these have to match clear: both; - float: left; + float: none; position: relative; display:block; width: 100%; min-height: 1em; - margin-bottom: @textmargin; + margin-bottom: 10px; padding: 0; line-height: 1.2em; @@ -158,9 +195,7 @@ .fieldset { .left-label { // similar to form legend - float: left; display: block; - width: 25%; margin: 0; padding: 0; font-weight: @text-semibold-weight; @@ -168,16 +203,27 @@ } .left-label-summary { - .left-label; - width: 150px; + padding-left: 20px; + margin-bottom: 5px; + + p { + margin-bottom: 5px; + color: @grey1; + } + } + + .left-content { + width: ~"calc(50% - 20px)"; + float: left; + margin: 15px 0 15px 20px; } .right-content { // similar to form fields float: left; display: block; - width: 75%; - margin: 0 0 0 -15%; - padding: 0 0 0 15%; + width: ~"calc(50% - 20px)"; + text-align: right; + margin: 15px 20px 15px 0; .truncate-wrap, .truncate { @@ -188,6 +234,22 @@ .commit-long { overflow-x: auto; } + + .commit-info { + margin-top: 7px; + } + + .tag, .tagtag, .branchtag, .booktag, .metatag, .perm_tag { + background:transparent; + border: none; + box-shadow: none; + margin-left: 10px; + font-size: 13px; + } + + .tag span, .tag i { + color: @grey1; + } } .commit.truncate-wrap { overflow:hidden; @@ -223,11 +285,38 @@ } // Quick Start section + +.empty-repo { + border: 1px solid #EAEAEA; + border-bottom: 0; + border-radius: @border-radius; + padding: 0 20px; +} + +.empty-repo h3, .quick_start p { + margin-bottom: 10px; +} + +.quick_start pre { + background: #FCFEFF; + border: 1px solid #CBDBEB; + box-shadow: @button-shadow; + padding: 10px 15px; + border-radius: 4px; + color: @grey2; +} + +.clearfix { + clear: both; +} + .quick_start { - float: left; display: block; position: relative; - width: 100%; + border: 1px solid #EAEAEA; + border-top: 0; + border-radius: @border-radius; + padding: 0 20px; // adds some space to make copy and paste easier .left-label, @@ -236,6 +325,7 @@ } } + .submodule { .summary-detail { width: 100%; @@ -290,3 +380,26 @@ } +.rctable.repo_summary { + border: 1px solid #eaeaea; + border-radius: 2px; + border-collapse: inherit; + border-bottom: 0; + + th { + background: @grey7; + border-bottom: 0; + } + + td { + border-color: #eaeaea; + } + + td.td-status { + padding-left: 10px; + } +} + + + + diff --git a/rhodecode/templates/summary/components.mako b/rhodecode/templates/summary/components.mako --- a/rhodecode/templates/summary/components.mako +++ b/rhodecode/templates/summary/components.mako @@ -1,29 +1,49 @@ <%def name="refs_counters(branches, closed_branches, tags, bookmarks)"> - ${_ungettext( - '%(num)s Branch','%(num)s Branches', len(branches)) % {'num': len(branches)}} + + % if len(branches) == 1: + ${len(branches)} ${_('Branch')} + % else: + ${len(branches)} ${_('Branches')} + % endif + %if closed_branches: - ${_ungettext( - '%(num)s Closed Branch', '%(num)s Closed Branches', len(closed_branches)) % {'num': len(closed_branches)}} + + % if len(closed_branches) == 1: + ${len(closed_branches)} ${_('Closed Branch')} + % else: + ${len(closed_branches)} ${_('Closed Branches')} + % endif + %endif - ${_ungettext( - '%(num)s Tag', '%(num)s Tags', len(tags)) % {'num': len(tags)}} + + % if len(tags) == 1: + ${len(tags)} ${_('Tag')} + % else: + ${len(tags)} ${_('Tags')} + % endif + %if bookmarks: - ${_ungettext( - '%(num)s Bookmark', '%(num)s Bookmarks', len(bookmarks)) % {'num': len(bookmarks)}} + + % if len(bookmarks) == 1: + ${len(bookmarks)} ${_('Bookmark')} + % else: + ${len(bookmarks)} ${_('Bookmarks')} + % endif + %endif @@ -32,19 +52,8 @@ <% summary = lambda n:{False:'summary-short'}.get(n) %>
-
- -
- ${_('Show More')} -
-
-
- +
+
<% maybe_disabled = '' @@ -79,14 +89,9 @@ % if maybe_disabled:

${_('SVN Protocol is disabled. To enable it, see the')} ${_('documentation here')}.

% endif -
-
+
-
-
-   -
@@ -105,29 +110,39 @@ ## commits % if commit_rev == -1: - ${_ungettext('%(num)s Commit', '%(num)s Commits', 0) % {'num': 0}} + + % if commit_rev == -1: + 0 ${_('Commit')} + % else: + 0 ${_('Commits')} + % endif % else: - ${_ungettext('%(num)s Commit', '%(num)s Commits', commit_rev) % {'num': commit_rev}} + + % if commit_rev == 1: + ${commit_rev} ${_('Commit')} + % else: + ${commit_rev} ${_('Commits')} + % endif + % endif ## forks - ${c.repository_forks} ${_ungettext('Fork', 'Forks', c.repository_forks)} + + ${c.repository_forks} ${_ungettext('Fork', 'Forks', c.repository_forks)} -
-
+